More wxMicroWindows fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 32f5922bd764f0aed6e88fd048392f29fb5facdf..abc63c4cec2e58455eb96ef1635df495f7f5e0e3 100644 (file)
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -2,7 +2,7 @@
 #define _WX_IMAGLIST_H_BASE_
 
 #if defined(__WXMSW__)
 #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"
 #include "wx/generic/imaglist.h"
 #else
 #include "wx/msw/imaglist.h"

diff --git a/src/common/file.cpp b/src/common/file.cpp
index f0209434b2f854d80eebf7d0f210f133e2fabf45..b662a72b34428070b4c1539b6d3a4f4572f236b6 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -28,7 +28,7 @@
 #if wxUSE_FILE
 
 // standard
 #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__
   #include  <io.h>
 
 #ifndef __SALFORDC__

diff --git a/src/msw/makefile.mic b/src/msw/makefile.mic
index e263277d8ca3d527b659c25c78f6069790fa3559..7f93fb35ebab4d1f0fde023ed1a811249abdde9f 100644 (file)
--- a/src/msw/makefile.mic
+++ b/src/msw/makefile.mic
@@ -31,8 +31,8 @@ JPEGLIB = $(WXDIR)/lib/libjpeg.a
 TIFFLIB = $(WXDIR)/lib/libtiff.a
 
 GENERICOBJS = \
 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) \
                $(GENDIR)/calctrl.$(OBJSUFF) \
                $(GENDIR)/choicdgg.$(OBJSUFF) \
                $(GENDIR)/colrdlgg.$(OBJSUFF) \


@@ -42,6 +42,7 @@ GENERICOBJS = \
                $(GENDIR)/grid.$(OBJSUFF) \
                $(GENDIR)/gridctrl.$(OBJSUFF) \
                $(GENDIR)/gridsel.$(OBJSUFF) \
                $(GENDIR)/grid.$(OBJSUFF) \
                $(GENDIR)/gridctrl.$(OBJSUFF) \
                $(GENDIR)/gridsel.$(OBJSUFF) \

+               $(GENDIR)/imaglist.$(OBJSUFF) \

                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/listctrl.$(OBJSUFF) \
                $(GENDIR)/logg.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/listctrl.$(OBJSUFF) \
                $(GENDIR)/logg.$(OBJSUFF) \

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index a93c05a3be1d07e5e4b10cc731bfb360de67318b..ad8a078fabd6c6d96e2bf1a4e514748e168e4634 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -608,7 +608,7 @@ long wxExecute(wxChar **argv,
             close(pipeErr[1]); // close writing side
         }
 
             close(pipeErr[1]); // close writing side
         }
 

-#if wxUSE_GUI
+#if wxUSE_GUI && !defined(__WXMICROWIN__)

         wxEndProcessData *data = new wxEndProcessData;
 
         if ( sync )
         wxEndProcessData *data = new wxEndProcessData;
 
         if ( sync )