From fac3b4232c5a2fa84f11897f4851d0a0e8a17755 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 2 Jul 2001 14:20:32 +0000
Subject: [PATCH] More wxMicroWindows fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/imaglist.h | 2 +-
 src/common/file.cpp   | 2 +-
 src/msw/makefile.mic  | 5 +++--
 src/unix/utilsunx.cpp | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 32f5922bd7..abc63c4cec 100644
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -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"
diff --git a/src/common/file.cpp b/src/common/file.cpp
index f0209434b2..b662a72b34 100644
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -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__
diff --git a/src/msw/makefile.mic b/src/msw/makefile.mic
index e263277d8c..7f93fb35eb 100644
--- 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 = \
-        $(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) \
diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index a93c05a3be..ad8a078fab 100644
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -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 )
-- 
2.45.2