From: Julian Smart <julian@anthemion.co.uk>
Date: Fri, 21 Dec 2001 14:58:00 +0000 (+0000)
Subject: MicroWindows mods
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d2913c40ab17bb8e7f7d209183f79e5d32045bf5?hp=d0166913d81bcf0b3e47ea2406dfbc9da672e566

MicroWindows mods


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

diff --git a/docs/microwin/readme.txt b/docs/microwin/readme.txt
index 8cd81015a8..48df79ebf4 100644
--- a/docs/microwin/readme.txt
+++ b/docs/microwin/readme.txt
@@ -59,14 +59,22 @@ wxMicroWindows:
 - Copy include/wx/msw/setup_microwin.h to include/wx/setup.h if
   include/wx/setup.h doesn't exist
 
-- change the TOP variable at the top of src/msw/makefile.mic
-  to reflect where MicroWindows is installed
+- EITHER:
+
+  o set the MICROWINDOWS environment variable, e.g.:
+
+    % export MICROWINDOWS=/home/julians/local/microwindows/microwindows-0.89pre8/src
+
+  OR:
+
+  o change the TOP variable at the top of src/msw/makefile.mic
+    to reflect where MicroWindows is installed
 
 - type 'make -f makefile.mic all' from src/msw. To clean, use
   cleanwx and NOT clean since that will clean MicroWindows itself
 
-- to make the sample, cd into samples/minimal, edit the TOP variable,
-  and type 'make -f makefile.mic all'
+- to make the sample, cd into samples/minimal, edit the TOP variable
+  (or set MICROWINDOWS) as before, and type 'make -f makefile.mic all'
 
 Running 'minimal' runs the virtual MicroWindows desktop
 and the minimal sample, since in a MicroWindows WIN32 application
diff --git a/samples/minimal/makefile.mic b/samples/minimal/makefile.mic
index e6e8fa3750..49715461ef 100644
--- a/samples/minimal/makefile.mic
+++ b/samples/minimal/makefile.mic
@@ -3,7 +3,11 @@
 # Copyright (c) 2000 Martin Jolicoeur, Greg Haerr
 ##############################################################################
 
-TOP=/home/julians/microwindows/microwindows-0.89pre8/src
+TOP=$(MICROWINDOWS)
+ifeq "$(MICROWINDOWS)" ""
+TOP=/home/julians/local/microwindows/microwindows-0.89pre8/src
+endif
+
 CONFIG = $(TOP)/config
 WXDIR = ../..
 OBJSUFF = o
diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 756308ebd2..d84d6c2aa4 100644
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -315,10 +315,11 @@ wxCursor::wxCursor(int cursor_type)
       refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW);
       break;
   }
-#endif
 
   // no need to destroy the stock cursors
-  refData->m_destroyCursor = FALSE;
+  // TODO: check this
+  //m_refData->m_destroyCursor = FALSE;
+#endif
 }
 
 wxCursor::~wxCursor()
diff --git a/src/msw/makefile.mic b/src/msw/makefile.mic
index 5467c5068a..a761c1f2f7 100644
--- a/src/msw/makefile.mic
+++ b/src/msw/makefile.mic
@@ -3,7 +3,10 @@
 # Copyright (c) 2000 Martin Jolicoeur, Greg Haerr
 ##############################################################################
 
-TOP=/home/julians/microwindows/microwindows-0.89pre8/src
+TOP=$(MICROWINDOWS)
+ifeq "$(MICROWINDOWS)" ""
+TOP=/home/julians/local/microwindows/microwindows-0.89pre8/src
+endif
 
 CONFIG = $(TOP)/config
 WXDIR = ../..
@@ -131,7 +134,6 @@ COMMONOBJS  = \
 		$(COMMDIR)/mstream.$(OBJSUFF) \
 		$(COMMDIR)/nbkbase.$(OBJSUFF) \
 		$(COMMDIR)/object.$(OBJSUFF) \
-		$(COMMDIR)/objstrm.$(OBJSUFF) \
 		$(COMMDIR)/paper.$(OBJSUFF) \
 		$(COMMDIR)/popupcmn.$(OBJSUFF) \
 		$(COMMDIR)/prntbase.$(OBJSUFF) \