AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More wxMicroWindows fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2001-07-02 14:20:32 +00:00
parent d1c8069261
commit fac3b4232c
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/imaglist.h
View File

@ -2,7 +2,7 @@
#define _WX_IMAGLIST_H_BASE_
#if defined(__WXMSW__)
#ifdef __WIN16__
#if defined(__WIN16__) || defined(__WXMICROWIN__)
#include "wx/generic/imaglist.h"
#else
#include "wx/msw/imaglist.h"

2
src/common/file.cpp
View File

@ -28,7 +28,7 @@
#if wxUSE_FILE
// standard
#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__)
#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__)
#include <io.h>
#ifndef __SALFORDC__

5
src/msw/makefile.mic
View File

@ -31,8 +31,8 @@ JPEGLIB = $(WXDIR)/lib/libjpeg.a
TIFFLIB = $(WXDIR)/lib/libtiff.a
GENERICOBJS = \
$(GENDIR)/accel.$(OBJSUFF) \
$(GENDIR)/busyinfo.$(OBJSUFF) \
$(GENDIR)/accel.$(OBJSUFF) \
$(GENDIR)/busyinfo.$(OBJSUFF) \
$(GENDIR)/calctrl.$(OBJSUFF) \
$(GENDIR)/choicdgg.$(OBJSUFF) \
$(GENDIR)/colrdlgg.$(OBJSUFF) \
@ -42,6 +42,7 @@ GENERICOBJS = \
$(GENDIR)/grid.$(OBJSUFF) \
$(GENDIR)/gridctrl.$(OBJSUFF) \
$(GENDIR)/gridsel.$(OBJSUFF) \
$(GENDIR)/imaglist.$(OBJSUFF) \
$(GENDIR)/laywin.$(OBJSUFF) \
$(GENDIR)/listctrl.$(OBJSUFF) \
$(GENDIR)/logg.$(OBJSUFF) \

2
src/unix/utilsunx.cpp
View File

@ -608,7 +608,7 @@ long wxExecute(wxChar **argv,
close(pipeErr[1]); // close writing side
}
#if wxUSE_GUI
#if wxUSE_GUI && !defined(__WXMICROWIN__)
wxEndProcessData *data = new wxEndProcessData;
if ( sync )