Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MicroWindows mods

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-12-21 14:58:00 +00:00
parent d0166913d8
commit d2913c40ab
4 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
docs/microwin/readme.txt
View File

@@ -59,14 +59,22 @@ wxMicroWindows:
- Copy include/wx/msw/setup_microwin.h to include/wx/setup.h if - Copy include/wx/msw/setup_microwin.h to include/wx/setup.h if
include/wx/setup.h doesn't exist include/wx/setup.h doesn't exist
- change the TOP variable at the top of src/msw/makefile.mic - EITHER:
to reflect where MicroWindows is installed
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 - type 'make -f makefile.mic all' from src/msw. To clean, use
cleanwx and NOT clean since that will clean MicroWindows itself cleanwx and NOT clean since that will clean MicroWindows itself
- to make the sample, cd into samples/minimal, edit the TOP variable, - to make the sample, cd into samples/minimal, edit the TOP variable
and type 'make -f makefile.mic all' (or set MICROWINDOWS) as before, and type 'make -f makefile.mic all'
Running 'minimal' runs the virtual MicroWindows desktop Running 'minimal' runs the virtual MicroWindows desktop
and the minimal sample, since in a MicroWindows WIN32 application and the minimal sample, since in a MicroWindows WIN32 application

6
samples/minimal/makefile.mic
View File

@@ -3,7 +3,11 @@
# Copyright (c) 2000 Martin Jolicoeur, Greg Haerr # 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 CONFIG = $(TOP)/config
WXDIR = ../.. WXDIR = ../..
OBJSUFF = o OBJSUFF = o

5
src/msw/cursor.cpp
View File

@@ -315,10 +315,11 @@ wxCursor::wxCursor(int cursor_type)
refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW); refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW);
break; break;
} }
#endif
// no need to destroy the stock cursors // no need to destroy the stock cursors
refData->m_destroyCursor = FALSE; // TODO: check this
//m_refData->m_destroyCursor = FALSE;
#endif
} }
wxCursor::~wxCursor() wxCursor::~wxCursor()

6
src/msw/makefile.mic
View File

@@ -3,7 +3,10 @@
# Copyright (c) 2000 Martin Jolicoeur, Greg Haerr # 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 CONFIG = $(TOP)/config
WXDIR = ../.. WXDIR = ../..
@@ -131,7 +134,6 @@ COMMONOBJS = \
$(COMMDIR)/mstream.$(OBJSUFF) \ $(COMMDIR)/mstream.$(OBJSUFF) \
$(COMMDIR)/nbkbase.$(OBJSUFF) \ $(COMMDIR)/nbkbase.$(OBJSUFF) \
$(COMMDIR)/object.$(OBJSUFF) \ $(COMMDIR)/object.$(OBJSUFF) \
$(COMMDIR)/objstrm.$(OBJSUFF) \
$(COMMDIR)/paper.$(OBJSUFF) \ $(COMMDIR)/paper.$(OBJSUFF) \
$(COMMDIR)/popupcmn.$(OBJSUFF) \ $(COMMDIR)/popupcmn.$(OBJSUFF) \
$(COMMDIR)/prntbase.$(OBJSUFF) \ $(COMMDIR)/prntbase.$(OBJSUFF) \