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

undid unnecessary renaming of src/msw/evtloop.cpp to evtloopmsw.cpp

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-05-18 14:58:11 +00:00
parent cc91438c0f
commit 81df6af392
9 changed files with 180 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/bakefiles/files.bkl
View File

@@ -108,7 +108,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/utilsexc.cpp src/msw/utilsexc.cpp
</set> </set>
<set var="BASE_AND_GUI_WIN32_SRC" hints="files"> <set var="BASE_AND_GUI_WIN32_SRC" hints="files">
src/msw/evtloopmsw.cpp src/msw/evtloop.cpp
src/msw/main.cpp src/msw/main.cpp
src/msw/mslu.cpp src/msw/mslu.cpp
src/msw/volume.cpp src/msw/volume.cpp

29
build/msw/makefile.bcc
View File

@@ -39,9 +39,10 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
-DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = ..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG) LIBDIRNAME = ..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
WXREGEX_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ WXREGEX_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
@@ -388,7 +389,7 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_fs_mem.obj \ $(OBJS)\monodll_fs_mem.obj \
$(OBJS)\monodll_msgout.obj \ $(OBJS)\monodll_msgout.obj \
$(OBJS)\monodll_utilscmn.obj \ $(OBJS)\monodll_utilscmn.obj \
$(OBJS)\monodll_evtloopmsw.obj \ $(OBJS)\monodll_evtloop.obj \
$(OBJS)\monodll_main.obj \ $(OBJS)\monodll_main.obj \
$(OBJS)\monodll_mslu.obj \ $(OBJS)\monodll_mslu.obj \
$(OBJS)\monodll_volume.obj \ $(OBJS)\monodll_volume.obj \
@@ -522,7 +523,7 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_fs_mem.obj \ $(OBJS)\monolib_fs_mem.obj \
$(OBJS)\monolib_msgout.obj \ $(OBJS)\monolib_msgout.obj \
$(OBJS)\monolib_utilscmn.obj \ $(OBJS)\monolib_utilscmn.obj \
$(OBJS)\monolib_evtloopmsw.obj \ $(OBJS)\monolib_evtloop.obj \
$(OBJS)\monolib_main.obj \ $(OBJS)\monolib_main.obj \
$(OBJS)\monolib_mslu.obj \ $(OBJS)\monolib_mslu.obj \
$(OBJS)\monolib_volume.obj \ $(OBJS)\monolib_volume.obj \
@@ -654,7 +655,7 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_fs_mem.obj \ $(OBJS)\basedll_fs_mem.obj \
$(OBJS)\basedll_msgout.obj \ $(OBJS)\basedll_msgout.obj \
$(OBJS)\basedll_utilscmn.obj \ $(OBJS)\basedll_utilscmn.obj \
$(OBJS)\basedll_evtloopmsw.obj \ $(OBJS)\basedll_evtloop.obj \
$(OBJS)\basedll_main.obj \ $(OBJS)\basedll_main.obj \
$(OBJS)\basedll_mslu.obj \ $(OBJS)\basedll_mslu.obj \
$(OBJS)\basedll_volume.obj $(OBJS)\basedll_volume.obj
@@ -770,7 +771,7 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_fs_mem.obj \ $(OBJS)\baselib_fs_mem.obj \
$(OBJS)\baselib_msgout.obj \ $(OBJS)\baselib_msgout.obj \
$(OBJS)\baselib_utilscmn.obj \ $(OBJS)\baselib_utilscmn.obj \
$(OBJS)\baselib_evtloopmsw.obj \ $(OBJS)\baselib_evtloop.obj \
$(OBJS)\baselib_main.obj \ $(OBJS)\baselib_main.obj \
$(OBJS)\baselib_mslu.obj \ $(OBJS)\baselib_mslu.obj \
$(OBJS)\baselib_volume.obj $(OBJS)\baselib_volume.obj
@@ -832,7 +833,7 @@ COREDLL_OBJECTS = \
$(OBJS)\coredll_fs_mem.obj \ $(OBJS)\coredll_fs_mem.obj \
$(OBJS)\coredll_msgout.obj \ $(OBJS)\coredll_msgout.obj \
$(OBJS)\coredll_utilscmn.obj \ $(OBJS)\coredll_utilscmn.obj \
$(OBJS)\coredll_evtloopmsw.obj \ $(OBJS)\coredll_evtloop.obj \
$(OBJS)\coredll_main.obj \ $(OBJS)\coredll_main.obj \
$(OBJS)\coredll_mslu.obj \ $(OBJS)\coredll_mslu.obj \
$(OBJS)\coredll_volume.obj \ $(OBJS)\coredll_volume.obj \
@@ -851,7 +852,7 @@ CORELIB_OBJECTS = \
$(OBJS)\corelib_fs_mem.obj \ $(OBJS)\corelib_fs_mem.obj \
$(OBJS)\corelib_msgout.obj \ $(OBJS)\corelib_msgout.obj \
$(OBJS)\corelib_utilscmn.obj \ $(OBJS)\corelib_utilscmn.obj \
$(OBJS)\corelib_evtloopmsw.obj \ $(OBJS)\corelib_evtloop.obj \
$(OBJS)\corelib_main.obj \ $(OBJS)\corelib_main.obj \
$(OBJS)\corelib_mslu.obj \ $(OBJS)\corelib_mslu.obj \
$(OBJS)\corelib_volume.obj \ $(OBJS)\corelib_volume.obj \
@@ -5457,7 +5458,7 @@ $(OBJS)\monodll_msgout.obj: ..\..\src\common\msgout.cpp
$(OBJS)\monodll_utilscmn.obj: ..\..\src\common\utilscmn.cpp $(OBJS)\monodll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_evtloopmsw.obj: ..\..\src\msw\evtloopmsw.cpp $(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_main.obj: ..\..\src\msw\main.cpp $(OBJS)\monodll_main.obj: ..\..\src\msw\main.cpp
@@ -7519,7 +7520,7 @@ $(OBJS)\monolib_msgout.obj: ..\..\src\common\msgout.cpp
$(OBJS)\monolib_utilscmn.obj: ..\..\src\common\utilscmn.cpp $(OBJS)\monolib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_evtloopmsw.obj: ..\..\src\msw\evtloopmsw.cpp $(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_main.obj: ..\..\src\msw\main.cpp $(OBJS)\monolib_main.obj: ..\..\src\msw\main.cpp
@@ -9581,7 +9582,7 @@ $(OBJS)\basedll_msgout.obj: ..\..\src\common\msgout.cpp
$(OBJS)\basedll_utilscmn.obj: ..\..\src\common\utilscmn.cpp $(OBJS)\basedll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_evtloopmsw.obj: ..\..\src\msw\evtloopmsw.cpp $(OBJS)\basedll_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_main.obj: ..\..\src\msw\main.cpp $(OBJS)\basedll_main.obj: ..\..\src\msw\main.cpp
@@ -9881,7 +9882,7 @@ $(OBJS)\baselib_msgout.obj: ..\..\src\common\msgout.cpp
$(OBJS)\baselib_utilscmn.obj: ..\..\src\common\utilscmn.cpp $(OBJS)\baselib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_evtloopmsw.obj: ..\..\src\msw\evtloopmsw.cpp $(OBJS)\baselib_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_main.obj: ..\..\src\msw\main.cpp $(OBJS)\baselib_main.obj: ..\..\src\msw\main.cpp
@@ -9992,7 +9993,7 @@ $(OBJS)\coredll_msgout.obj: ..\..\src\common\msgout.cpp
$(OBJS)\coredll_utilscmn.obj: ..\..\src\common\utilscmn.cpp $(OBJS)\coredll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_evtloopmsw.obj: ..\..\src\msw\evtloopmsw.cpp $(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_main.obj: ..\..\src\msw\main.cpp $(OBJS)\coredll_main.obj: ..\..\src\msw\main.cpp
@@ -11280,7 +11281,7 @@ $(OBJS)\corelib_msgout.obj: ..\..\src\common\msgout.cpp
$(OBJS)\corelib_utilscmn.obj: ..\..\src\common\utilscmn.cpp $(OBJS)\corelib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_evtloopmsw.obj: ..\..\src\msw\evtloopmsw.cpp $(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_main.obj: ..\..\src\msw\main.cpp $(OBJS)\corelib_main.obj: ..\..\src\msw\main.cpp

29
build/msw/makefile.gcc
View File

@@ -29,9 +29,10 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
CPPDEPS = -MT$@ -MF$@.d -MD CPPDEPS = -MT$@ -MF$@.d -MD
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = ..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG) LIBDIRNAME = ..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
@@ -372,7 +373,7 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_fs_mem.o \ $(OBJS)\monodll_fs_mem.o \
$(OBJS)\monodll_msgout.o \ $(OBJS)\monodll_msgout.o \
$(OBJS)\monodll_utilscmn.o \ $(OBJS)\monodll_utilscmn.o \
$(OBJS)\monodll_evtloopmsw.o \ $(OBJS)\monodll_evtloop.o \
$(OBJS)\monodll_main.o \ $(OBJS)\monodll_main.o \
$(OBJS)\monodll_mslu.o \ $(OBJS)\monodll_mslu.o \
$(OBJS)\monodll_volume.o \ $(OBJS)\monodll_volume.o \
@@ -508,7 +509,7 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_fs_mem.o \ $(OBJS)\monolib_fs_mem.o \
$(OBJS)\monolib_msgout.o \ $(OBJS)\monolib_msgout.o \
$(OBJS)\monolib_utilscmn.o \ $(OBJS)\monolib_utilscmn.o \
$(OBJS)\monolib_evtloopmsw.o \ $(OBJS)\monolib_evtloop.o \
$(OBJS)\monolib_main.o \ $(OBJS)\monolib_main.o \
$(OBJS)\monolib_mslu.o \ $(OBJS)\monolib_mslu.o \
$(OBJS)\monolib_volume.o \ $(OBJS)\monolib_volume.o \
@@ -641,7 +642,7 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_fs_mem.o \ $(OBJS)\basedll_fs_mem.o \
$(OBJS)\basedll_msgout.o \ $(OBJS)\basedll_msgout.o \
$(OBJS)\basedll_utilscmn.o \ $(OBJS)\basedll_utilscmn.o \
$(OBJS)\basedll_evtloopmsw.o \ $(OBJS)\basedll_evtloop.o \
$(OBJS)\basedll_main.o \ $(OBJS)\basedll_main.o \
$(OBJS)\basedll_mslu.o \ $(OBJS)\basedll_mslu.o \
$(OBJS)\basedll_volume.o $(OBJS)\basedll_volume.o
@@ -757,7 +758,7 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_fs_mem.o \ $(OBJS)\baselib_fs_mem.o \
$(OBJS)\baselib_msgout.o \ $(OBJS)\baselib_msgout.o \
$(OBJS)\baselib_utilscmn.o \ $(OBJS)\baselib_utilscmn.o \
$(OBJS)\baselib_evtloopmsw.o \ $(OBJS)\baselib_evtloop.o \
$(OBJS)\baselib_main.o \ $(OBJS)\baselib_main.o \
$(OBJS)\baselib_mslu.o \ $(OBJS)\baselib_mslu.o \
$(OBJS)\baselib_volume.o $(OBJS)\baselib_volume.o
@@ -822,7 +823,7 @@ COREDLL_OBJECTS = \
$(OBJS)\coredll_fs_mem.o \ $(OBJS)\coredll_fs_mem.o \
$(OBJS)\coredll_msgout.o \ $(OBJS)\coredll_msgout.o \
$(OBJS)\coredll_utilscmn.o \ $(OBJS)\coredll_utilscmn.o \
$(OBJS)\coredll_evtloopmsw.o \ $(OBJS)\coredll_evtloop.o \
$(OBJS)\coredll_main.o \ $(OBJS)\coredll_main.o \
$(OBJS)\coredll_mslu.o \ $(OBJS)\coredll_mslu.o \
$(OBJS)\coredll_volume.o \ $(OBJS)\coredll_volume.o \
@@ -841,7 +842,7 @@ CORELIB_OBJECTS = \
$(OBJS)\corelib_fs_mem.o \ $(OBJS)\corelib_fs_mem.o \
$(OBJS)\corelib_msgout.o \ $(OBJS)\corelib_msgout.o \
$(OBJS)\corelib_utilscmn.o \ $(OBJS)\corelib_utilscmn.o \
$(OBJS)\corelib_evtloopmsw.o \ $(OBJS)\corelib_evtloop.o \
$(OBJS)\corelib_main.o \ $(OBJS)\corelib_main.o \
$(OBJS)\corelib_mslu.o \ $(OBJS)\corelib_mslu.o \
$(OBJS)\corelib_volume.o \ $(OBJS)\corelib_volume.o \
@@ -5618,7 +5619,7 @@ $(OBJS)\monodll_msgout.o: ../../src/common/msgout.cpp
$(OBJS)\monodll_utilscmn.o: ../../src/common/utilscmn.cpp $(OBJS)\monodll_utilscmn.o: ../../src/common/utilscmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_evtloopmsw.o: ../../src/msw/evtloopmsw.cpp $(OBJS)\monodll_evtloop.o: ../../src/msw/evtloop.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_main.o: ../../src/msw/main.cpp $(OBJS)\monodll_main.o: ../../src/msw/main.cpp
@@ -7780,7 +7781,7 @@ $(OBJS)\monolib_msgout.o: ../../src/common/msgout.cpp
$(OBJS)\monolib_utilscmn.o: ../../src/common/utilscmn.cpp $(OBJS)\monolib_utilscmn.o: ../../src/common/utilscmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_evtloopmsw.o: ../../src/msw/evtloopmsw.cpp $(OBJS)\monolib_evtloop.o: ../../src/msw/evtloop.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_main.o: ../../src/msw/main.cpp $(OBJS)\monolib_main.o: ../../src/msw/main.cpp
@@ -9942,7 +9943,7 @@ $(OBJS)\basedll_msgout.o: ../../src/common/msgout.cpp
$(OBJS)\basedll_utilscmn.o: ../../src/common/utilscmn.cpp $(OBJS)\basedll_utilscmn.o: ../../src/common/utilscmn.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\basedll_evtloopmsw.o: ../../src/msw/evtloopmsw.cpp $(OBJS)\basedll_evtloop.o: ../../src/msw/evtloop.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\basedll_main.o: ../../src/msw/main.cpp $(OBJS)\basedll_main.o: ../../src/msw/main.cpp
@@ -10242,7 +10243,7 @@ $(OBJS)\baselib_msgout.o: ../../src/common/msgout.cpp
$(OBJS)\baselib_utilscmn.o: ../../src/common/utilscmn.cpp $(OBJS)\baselib_utilscmn.o: ../../src/common/utilscmn.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\baselib_evtloopmsw.o: ../../src/msw/evtloopmsw.cpp $(OBJS)\baselib_evtloop.o: ../../src/msw/evtloop.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\baselib_main.o: ../../src/msw/main.cpp $(OBJS)\baselib_main.o: ../../src/msw/main.cpp
@@ -10353,7 +10354,7 @@ $(OBJS)\coredll_msgout.o: ../../src/common/msgout.cpp
$(OBJS)\coredll_utilscmn.o: ../../src/common/utilscmn.cpp $(OBJS)\coredll_utilscmn.o: ../../src/common/utilscmn.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_evtloopmsw.o: ../../src/msw/evtloopmsw.cpp $(OBJS)\coredll_evtloop.o: ../../src/msw/evtloop.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_main.o: ../../src/msw/main.cpp $(OBJS)\coredll_main.o: ../../src/msw/main.cpp
@@ -11741,7 +11742,7 @@ $(OBJS)\corelib_msgout.o: ../../src/common/msgout.cpp
$(OBJS)\corelib_utilscmn.o: ../../src/common/utilscmn.cpp $(OBJS)\corelib_utilscmn.o: ../../src/common/utilscmn.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\corelib_evtloopmsw.o: ../../src/msw/evtloopmsw.cpp $(OBJS)\corelib_evtloop.o: ../../src/msw/evtloop.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\corelib_main.o: ../../src/msw/main.cpp $(OBJS)\corelib_main.o: ../../src/msw/main.cpp

30
build/msw/makefile.vc
View File

@@ -29,9 +29,11 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
RUNTIME_LIBS="$(RUNTIME_LIBS)" RUNTIME_LIBS="$(RUNTIME_LIBS)"
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
COMPILER_PREFIX = vc
OBJS = \ OBJS = \
vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
LIBDIRNAME = ..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) LIBDIRNAME = \
..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
@@ -387,7 +389,7 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_fs_mem.obj \ $(OBJS)\monodll_fs_mem.obj \
$(OBJS)\monodll_msgout.obj \ $(OBJS)\monodll_msgout.obj \
$(OBJS)\monodll_utilscmn.obj \ $(OBJS)\monodll_utilscmn.obj \
$(OBJS)\monodll_evtloopmsw.obj \ $(OBJS)\monodll_evtloop.obj \
$(OBJS)\monodll_main.obj \ $(OBJS)\monodll_main.obj \
$(OBJS)\monodll_mslu.obj \ $(OBJS)\monodll_mslu.obj \
$(OBJS)\monodll_volume.obj \ $(OBJS)\monodll_volume.obj \
@@ -527,7 +529,7 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_fs_mem.obj \ $(OBJS)\monolib_fs_mem.obj \
$(OBJS)\monolib_msgout.obj \ $(OBJS)\monolib_msgout.obj \
$(OBJS)\monolib_utilscmn.obj \ $(OBJS)\monolib_utilscmn.obj \
$(OBJS)\monolib_evtloopmsw.obj \ $(OBJS)\monolib_evtloop.obj \
$(OBJS)\monolib_main.obj \ $(OBJS)\monolib_main.obj \
$(OBJS)\monolib_mslu.obj \ $(OBJS)\monolib_mslu.obj \
$(OBJS)\monolib_volume.obj \ $(OBJS)\monolib_volume.obj \
@@ -665,7 +667,7 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_fs_mem.obj \ $(OBJS)\basedll_fs_mem.obj \
$(OBJS)\basedll_msgout.obj \ $(OBJS)\basedll_msgout.obj \
$(OBJS)\basedll_utilscmn.obj \ $(OBJS)\basedll_utilscmn.obj \
$(OBJS)\basedll_evtloopmsw.obj \ $(OBJS)\basedll_evtloop.obj \
$(OBJS)\basedll_main.obj \ $(OBJS)\basedll_main.obj \
$(OBJS)\basedll_mslu.obj \ $(OBJS)\basedll_mslu.obj \
$(OBJS)\basedll_volume.obj $(OBJS)\basedll_volume.obj
@@ -787,7 +789,7 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_fs_mem.obj \ $(OBJS)\baselib_fs_mem.obj \
$(OBJS)\baselib_msgout.obj \ $(OBJS)\baselib_msgout.obj \
$(OBJS)\baselib_utilscmn.obj \ $(OBJS)\baselib_utilscmn.obj \
$(OBJS)\baselib_evtloopmsw.obj \ $(OBJS)\baselib_evtloop.obj \
$(OBJS)\baselib_main.obj \ $(OBJS)\baselib_main.obj \
$(OBJS)\baselib_mslu.obj \ $(OBJS)\baselib_mslu.obj \
$(OBJS)\baselib_volume.obj $(OBJS)\baselib_volume.obj
@@ -860,7 +862,7 @@ COREDLL_OBJECTS = \
$(OBJS)\coredll_fs_mem.obj \ $(OBJS)\coredll_fs_mem.obj \
$(OBJS)\coredll_msgout.obj \ $(OBJS)\coredll_msgout.obj \
$(OBJS)\coredll_utilscmn.obj \ $(OBJS)\coredll_utilscmn.obj \
$(OBJS)\coredll_evtloopmsw.obj \ $(OBJS)\coredll_evtloop.obj \
$(OBJS)\coredll_main.obj \ $(OBJS)\coredll_main.obj \
$(OBJS)\coredll_mslu.obj \ $(OBJS)\coredll_mslu.obj \
$(OBJS)\coredll_volume.obj \ $(OBJS)\coredll_volume.obj \
@@ -882,7 +884,7 @@ CORELIB_OBJECTS = \
$(OBJS)\corelib_fs_mem.obj \ $(OBJS)\corelib_fs_mem.obj \
$(OBJS)\corelib_msgout.obj \ $(OBJS)\corelib_msgout.obj \
$(OBJS)\corelib_utilscmn.obj \ $(OBJS)\corelib_utilscmn.obj \
$(OBJS)\corelib_evtloopmsw.obj \ $(OBJS)\corelib_evtloop.obj \
$(OBJS)\corelib_main.obj \ $(OBJS)\corelib_main.obj \
$(OBJS)\corelib_mslu.obj \ $(OBJS)\corelib_mslu.obj \
$(OBJS)\corelib_volume.obj \ $(OBJS)\corelib_volume.obj \
@@ -5809,7 +5811,7 @@ $(OBJS)\monodll_msgout.obj: ..\..\src\common\msgout.cpp
$(OBJS)\monodll_utilscmn.obj: ..\..\src\common\utilscmn.cpp $(OBJS)\monodll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_evtloopmsw.obj: ..\..\src\msw\evtloopmsw.cpp $(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_main.obj: ..\..\src\msw\main.cpp $(OBJS)\monodll_main.obj: ..\..\src\msw\main.cpp
@@ -7871,7 +7873,7 @@ $(OBJS)\monolib_msgout.obj: ..\..\src\common\msgout.cpp
$(OBJS)\monolib_utilscmn.obj: ..\..\src\common\utilscmn.cpp $(OBJS)\monolib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_evtloopmsw.obj: ..\..\src\msw\evtloopmsw.cpp $(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_main.obj: ..\..\src\msw\main.cpp $(OBJS)\monolib_main.obj: ..\..\src\msw\main.cpp
@@ -9933,7 +9935,7 @@ $(OBJS)\basedll_msgout.obj: ..\..\src\common\msgout.cpp
$(OBJS)\basedll_utilscmn.obj: ..\..\src\common\utilscmn.cpp $(OBJS)\basedll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_evtloopmsw.obj: ..\..\src\msw\evtloopmsw.cpp $(OBJS)\basedll_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_main.obj: ..\..\src\msw\main.cpp $(OBJS)\basedll_main.obj: ..\..\src\msw\main.cpp
@@ -10233,7 +10235,7 @@ $(OBJS)\baselib_msgout.obj: ..\..\src\common\msgout.cpp
$(OBJS)\baselib_utilscmn.obj: ..\..\src\common\utilscmn.cpp $(OBJS)\baselib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_evtloopmsw.obj: ..\..\src\msw\evtloopmsw.cpp $(OBJS)\baselib_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_main.obj: ..\..\src\msw\main.cpp $(OBJS)\baselib_main.obj: ..\..\src\msw\main.cpp
@@ -10344,7 +10346,7 @@ $(OBJS)\coredll_msgout.obj: ..\..\src\common\msgout.cpp
$(OBJS)\coredll_utilscmn.obj: ..\..\src\common\utilscmn.cpp $(OBJS)\coredll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_evtloopmsw.obj: ..\..\src\msw\evtloopmsw.cpp $(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_main.obj: ..\..\src\msw\main.cpp $(OBJS)\coredll_main.obj: ..\..\src\msw\main.cpp
@@ -11632,7 +11634,7 @@ $(OBJS)\corelib_msgout.obj: ..\..\src\common\msgout.cpp
$(OBJS)\corelib_utilscmn.obj: ..\..\src\common\utilscmn.cpp $(OBJS)\corelib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_evtloopmsw.obj: ..\..\src\msw\evtloopmsw.cpp $(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_main.obj: ..\..\src\msw\main.cpp $(OBJS)\corelib_main.obj: ..\..\src\msw\main.cpp

29
build/msw/makefile.wat
View File

@@ -2972,9 +2972,10 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
RUNTIME_LIBS="$(RUNTIME_LIBS)" RUNTIME_LIBS="$(RUNTIME_LIBS)"
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
COMPILER_PREFIX = wat
OBJS = & OBJS = &
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = ..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) LIBDIRNAME = ..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
@@ -3316,7 +3317,7 @@ MONODLL_OBJECTS = &
$(OBJS)\monodll_fs_mem.obj & $(OBJS)\monodll_fs_mem.obj &
$(OBJS)\monodll_msgout.obj & $(OBJS)\monodll_msgout.obj &
$(OBJS)\monodll_utilscmn.obj & $(OBJS)\monodll_utilscmn.obj &
$(OBJS)\monodll_evtloopmsw.obj & $(OBJS)\monodll_evtloop.obj &
$(OBJS)\monodll_main.obj & $(OBJS)\monodll_main.obj &
$(OBJS)\monodll_mslu.obj & $(OBJS)\monodll_mslu.obj &
$(OBJS)\monodll_volume.obj & $(OBJS)\monodll_volume.obj &
@@ -3451,7 +3452,7 @@ MONOLIB_OBJECTS = &
$(OBJS)\monolib_fs_mem.obj & $(OBJS)\monolib_fs_mem.obj &
$(OBJS)\monolib_msgout.obj & $(OBJS)\monolib_msgout.obj &
$(OBJS)\monolib_utilscmn.obj & $(OBJS)\monolib_utilscmn.obj &
$(OBJS)\monolib_evtloopmsw.obj & $(OBJS)\monolib_evtloop.obj &
$(OBJS)\monolib_main.obj & $(OBJS)\monolib_main.obj &
$(OBJS)\monolib_mslu.obj & $(OBJS)\monolib_mslu.obj &
$(OBJS)\monolib_volume.obj & $(OBJS)\monolib_volume.obj &
@@ -3584,7 +3585,7 @@ BASEDLL_OBJECTS = &
$(OBJS)\basedll_fs_mem.obj & $(OBJS)\basedll_fs_mem.obj &
$(OBJS)\basedll_msgout.obj & $(OBJS)\basedll_msgout.obj &
$(OBJS)\basedll_utilscmn.obj & $(OBJS)\basedll_utilscmn.obj &
$(OBJS)\basedll_evtloopmsw.obj & $(OBJS)\basedll_evtloop.obj &
$(OBJS)\basedll_main.obj & $(OBJS)\basedll_main.obj &
$(OBJS)\basedll_mslu.obj & $(OBJS)\basedll_mslu.obj &
$(OBJS)\basedll_volume.obj $(OBJS)\basedll_volume.obj
@@ -3701,7 +3702,7 @@ BASELIB_OBJECTS = &
$(OBJS)\baselib_fs_mem.obj & $(OBJS)\baselib_fs_mem.obj &
$(OBJS)\baselib_msgout.obj & $(OBJS)\baselib_msgout.obj &
$(OBJS)\baselib_utilscmn.obj & $(OBJS)\baselib_utilscmn.obj &
$(OBJS)\baselib_evtloopmsw.obj & $(OBJS)\baselib_evtloop.obj &
$(OBJS)\baselib_main.obj & $(OBJS)\baselib_main.obj &
$(OBJS)\baselib_mslu.obj & $(OBJS)\baselib_mslu.obj &
$(OBJS)\baselib_volume.obj $(OBJS)\baselib_volume.obj
@@ -3765,7 +3766,7 @@ COREDLL_OBJECTS = &
$(OBJS)\coredll_fs_mem.obj & $(OBJS)\coredll_fs_mem.obj &
$(OBJS)\coredll_msgout.obj & $(OBJS)\coredll_msgout.obj &
$(OBJS)\coredll_utilscmn.obj & $(OBJS)\coredll_utilscmn.obj &
$(OBJS)\coredll_evtloopmsw.obj & $(OBJS)\coredll_evtloop.obj &
$(OBJS)\coredll_main.obj & $(OBJS)\coredll_main.obj &
$(OBJS)\coredll_mslu.obj & $(OBJS)\coredll_mslu.obj &
$(OBJS)\coredll_volume.obj & $(OBJS)\coredll_volume.obj &
@@ -3784,7 +3785,7 @@ CORELIB_OBJECTS = &
$(OBJS)\corelib_fs_mem.obj & $(OBJS)\corelib_fs_mem.obj &
$(OBJS)\corelib_msgout.obj & $(OBJS)\corelib_msgout.obj &
$(OBJS)\corelib_utilscmn.obj & $(OBJS)\corelib_utilscmn.obj &
$(OBJS)\corelib_evtloopmsw.obj & $(OBJS)\corelib_evtloop.obj &
$(OBJS)\corelib_main.obj & $(OBJS)\corelib_main.obj &
$(OBJS)\corelib_mslu.obj & $(OBJS)\corelib_mslu.obj &
$(OBJS)\corelib_volume.obj & $(OBJS)\corelib_volume.obj &
@@ -5890,7 +5891,7 @@ $(OBJS)\monodll_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp
$(OBJS)\monodll_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp $(OBJS)\monodll_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_evtloopmsw.obj : .AUTODEPEND ..\..\src\msw\evtloopmsw.cpp $(OBJS)\monodll_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp $(OBJS)\monodll_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp
@@ -8052,7 +8053,7 @@ $(OBJS)\monolib_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp
$(OBJS)\monolib_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp $(OBJS)\monolib_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_evtloopmsw.obj : .AUTODEPEND ..\..\src\msw\evtloopmsw.cpp $(OBJS)\monolib_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp $(OBJS)\monolib_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp
@@ -10214,7 +10215,7 @@ $(OBJS)\basedll_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp
$(OBJS)\basedll_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp $(OBJS)\basedll_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\basedll_evtloopmsw.obj : .AUTODEPEND ..\..\src\msw\evtloopmsw.cpp $(OBJS)\basedll_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\basedll_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp $(OBJS)\basedll_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp
@@ -10514,7 +10515,7 @@ $(OBJS)\baselib_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp
$(OBJS)\baselib_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp $(OBJS)\baselib_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\baselib_evtloopmsw.obj : .AUTODEPEND ..\..\src\msw\evtloopmsw.cpp $(OBJS)\baselib_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\baselib_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp $(OBJS)\baselib_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp
@@ -10625,7 +10626,7 @@ $(OBJS)\coredll_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp
$(OBJS)\coredll_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp $(OBJS)\coredll_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_evtloopmsw.obj : .AUTODEPEND ..\..\src\msw\evtloopmsw.cpp $(OBJS)\coredll_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp $(OBJS)\coredll_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp
@@ -12013,7 +12014,7 @@ $(OBJS)\corelib_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp
$(OBJS)\corelib_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp $(OBJS)\corelib_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_evtloopmsw.obj : .AUTODEPEND ..\..\src\msw\evtloopmsw.cpp $(OBJS)\corelib_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp $(OBJS)\corelib_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp

2
build/msw/wx_base.dsp
View File

@@ -799,7 +799,7 @@ SOURCE=..\..\src\msw\dlmsw.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\msw\evtloopmsw.cpp SOURCE=..\..\src\msw\evtloop.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File

2
build/msw/wx_core.dsp
View File

@@ -1816,7 +1816,7 @@ SOURCE=..\..\src\msw\enhmeta.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\msw\evtloopmsw.cpp SOURCE=..\..\src\msw\evtloop.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File

169
src/msw/evtloop.cpp
View File

@@ -25,18 +25,22 @@
#endif #endif
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#if wxUSE_GUI
#include "wx/window.h" #include "wx/window.h"
#endif
#include "wx/app.h" #include "wx/app.h"
#endif //WX_PRECOMP #endif //WX_PRECOMP
#include "wx/evtloop.h" #include "wx/evtloop.h"
#include "wx/tooltip.h"
#include "wx/except.h" #include "wx/except.h"
#include "wx/ptr_scpd.h" #include "wx/ptr_scpd.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
#if wxUSE_GUI
#include "wx/tooltip.h"
#if wxUSE_THREADS #if wxUSE_THREADS
#include "wx/thread.h" #include "wx/thread.h"
@@ -47,39 +51,69 @@
WX_DEFINE_LIST(wxMsgList) WX_DEFINE_LIST(wxMsgList)
#endif // wxUSE_THREADS #endif // wxUSE_THREADS
#endif //wxUSE_GUI
#if wxUSE_BASE
// ============================================================================ // ============================================================================
// wxEventLoop implementation // wxMSWEventLoopBase implementation
// ============================================================================ // ============================================================================
wxWindowMSW *wxEventLoop::ms_winCritical = NULL;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// ctor/dtor // ctor/dtor
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxEventLoop::wxEventLoop() wxMSWEventLoopBase::wxMSWEventLoopBase()
{ {
m_shouldExit = false; m_shouldExit = false;
m_exitcode = 0; m_exitcode = 0;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxEventLoop message processing // wxEventLoop message processing dispatching
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void wxEventLoop::ProcessMessage(WXMSG *msg) bool wxMSWEventLoopBase::Pending() const
{ {
// give us the chance to preprocess the message first MSG msg;
if ( !PreProcessMessage(msg) ) return ::PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE) != 0;
{
// if it wasn't done, dispatch it to the corresponding window
::TranslateMessage(msg);
::DispatchMessage(msg);
}
} }
bool wxEventLoop::IsChildOfCriticalWindow(wxWindowMSW *win) bool wxMSWEventLoopBase::GetNextMessage(WXMSG* msg)
{
wxCHECK_MSG( IsRunning(), false, _T("can't get messages if not running") );
const BOOL rc = ::GetMessage(msg, NULL, 0, 0);
if ( rc == 0 )
{
// got WM_QUIT
return false;
}
if ( rc == -1 )
{
// should never happen, but let's test for it nevertheless
wxLogLastError(wxT("GetMessage"));
// still break from the loop
return false;
}
return true;
}
#endif // wxUSE_BASE
#if wxUSE_GUI
// ============================================================================
// GUI wxEventLoop implementation
// ============================================================================
wxWindowMSW *wxGUIEventLoop::ms_winCritical = NULL;
bool wxGUIEventLoop::IsChildOfCriticalWindow(wxWindowMSW *win)
{ {
while ( win ) while ( win )
{ {
@@ -92,7 +126,7 @@ bool wxEventLoop::IsChildOfCriticalWindow(wxWindowMSW *win)
return false; return false;
} }
bool wxEventLoop::PreProcessMessage(WXMSG *msg) bool wxGUIEventLoop::PreProcessMessage(WXMSG *msg)
{ {
HWND hwnd = msg->hwnd; HWND hwnd = msg->hwnd;
wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd); wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
@@ -187,57 +221,22 @@ bool wxEventLoop::PreProcessMessage(WXMSG *msg)
return false; return false;
} }
// ---------------------------------------------------------------------------- void wxGUIEventLoop::ProcessMessage(WXMSG *msg)
// wxEventLoop running and exiting
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxEventLoopManual customization
// ----------------------------------------------------------------------------
void wxEventLoop::OnNextIteration()
{ {
#if wxUSE_THREADS // give us the chance to preprocess the message first
wxMutexGuiLeaveOrEnter(); if ( !PreProcessMessage(msg) )
#endif // wxUSE_THREADS {
// if it wasn't done, dispatch it to the corresponding window
::TranslateMessage(msg);
::DispatchMessage(msg);
}
} }
void wxEventLoop::WakeUp() bool wxGUIEventLoop::Dispatch()
{
::PostMessage(NULL, WM_NULL, 0, 0);
}
// ----------------------------------------------------------------------------
// wxEventLoop message processing dispatching
// ----------------------------------------------------------------------------
bool wxEventLoop::Pending() const
{ {
MSG msg; MSG msg;
return ::PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE) != 0; if ( !GetNextMessage(&msg) )
}
bool wxEventLoop::Dispatch()
{
wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") );
MSG msg;
BOOL rc = ::GetMessage(&msg, (HWND) NULL, 0, 0);
if ( rc == 0 )
{
// got WM_QUIT
return false; return false;
}
if ( rc == -1 )
{
// should never happen, but let's test for it nevertheless
wxLogLastError(wxT("GetMessage"));
// still break from the loop
return false;
}
#if wxUSE_THREADS #if wxUSE_THREADS
wxASSERT_MSG( wxThread::IsMain(), wxASSERT_MSG( wxThread::IsMain(),
@@ -294,3 +293,51 @@ bool wxEventLoop::Dispatch()
return true; return true;
} }
void wxGUIEventLoop::OnNextIteration()
{
#if wxUSE_THREADS
wxMutexGuiLeaveOrEnter();
#endif // wxUSE_THREADS
}
void wxGUIEventLoop::WakeUp()
{
::PostMessage(NULL, WM_NULL, 0, 0);
}
#else // !wxUSE_GUI
void wxConsoleEventLoop::OnNextIteration()
{
if ( wxTheApp )
wxTheApp->ProcessPendingEvents();
}
void wxConsoleEventLoop::WakeUp()
{
#if wxUSE_THREADS
wxWakeUpMainThread();
#endif
}
bool wxConsoleEventLoop::Dispatch()
{
MSG msg;
if ( !GetNextMessage(&msg) )
return false;
if ( msg.message == WM_TIMER )
{
TIMERPROC proc = (TIMERPROC)msg.lParam;
if ( proc )
(*proc)(NULL, 0, msg.wParam, 0);
}
else
{
wxLogDebug(_T("Ignoring unexpected message %d"), msg.message);
}
return !m_shouldExit;
}
#endif //wxUSE_GUI

343
src/msw/evtloopmsw.cpp
View File

@@ -1,343 +0,0 @@
///////////////////////////////////////////////////////////////////////////////
// Name: msw/evtloop.cpp
// Purpose: implements wxEventLoop for MSW
// Author: Vadim Zeitlin
// Modified by:
// Created: 01.06.01
// RCS-ID: $Id$
// Copyright: (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// License: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
// declarations
// ============================================================================
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#if wxUSE_GUI
#include "wx/window.h"
#endif
#include "wx/app.h"
#endif //WX_PRECOMP
#include "wx/evtloop.h"
#include "wx/except.h"
#include "wx/ptr_scpd.h"
#include "wx/msw/private.h"
#if wxUSE_GUI
#include "wx/tooltip.h"
#if wxUSE_THREADS
#include "wx/thread.h"
// define the list of MSG strutures
WX_DECLARE_LIST(MSG, wxMsgList);
#include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxMsgList)
#endif // wxUSE_THREADS
#endif //wxUSE_GUI
#if wxUSE_BASE
// ============================================================================
// wxMSWEventLoopBase implementation
// ============================================================================
// ----------------------------------------------------------------------------
// ctor/dtor
// ----------------------------------------------------------------------------
wxMSWEventLoopBase::wxMSWEventLoopBase()
{
m_shouldExit = false;
m_exitcode = 0;
}
// ----------------------------------------------------------------------------
// wxEventLoop message processing dispatching
// ----------------------------------------------------------------------------
bool wxMSWEventLoopBase::Pending() const
{
MSG msg;
return ::PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE) != 0;
}
bool wxMSWEventLoopBase::GetNextMessage(WXMSG* msg)
{
wxCHECK_MSG( IsRunning(), false, _T("can't get messages if not running") );
const BOOL rc = ::GetMessage(msg, NULL, 0, 0);
if ( rc == 0 )
{
// got WM_QUIT
return false;
}
if ( rc == -1 )
{
// should never happen, but let's test for it nevertheless
wxLogLastError(wxT("GetMessage"));
// still break from the loop
return false;
}
return true;
}
#endif // wxUSE_BASE
#if wxUSE_GUI
// ============================================================================
// GUI wxEventLoop implementation
// ============================================================================
wxWindowMSW *wxGUIEventLoop::ms_winCritical = NULL;
bool wxGUIEventLoop::IsChildOfCriticalWindow(wxWindowMSW *win)
{
while ( win )
{
if ( win == ms_winCritical )
return true;
win = win->GetParent();
}
return false;
}
bool wxGUIEventLoop::PreProcessMessage(WXMSG *msg)
{
HWND hwnd = msg->hwnd;
wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
wxWindow *wnd;
// this might happen if we're in a modeless dialog, or if a wx control has
// children which themselves were not created by wx (i.e. wxActiveX control children)
if ( !wndThis )
{
while ( hwnd && (::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD ))
{
hwnd = ::GetParent(hwnd);
// If the control has a wx parent, break and give the parent a chance
// to process the window message
wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
if (wndThis != NULL)
break;
}
if ( !wndThis )
{
// this may happen if the event occurred in a standard modeless dialog (the
// only example of which I know of is the find/replace dialog) - then call
// IsDialogMessage() to make TAB navigation in it work
// NOTE: IsDialogMessage() just eats all the messages (i.e. returns true for
// them) if we call it for the control itself
return hwnd && ::IsDialogMessage(hwnd, msg) != 0;
}
}
if ( !AllowProcessing(wndThis) )
{
// not a child of critical window, so we eat the event but take care to
// stop an endless stream of WM_PAINTs which would have resulted if we
// didn't validate the invalidated part of the window
if ( msg->message == WM_PAINT )
::ValidateRect(hwnd, NULL);
return true;
}
#if wxUSE_TOOLTIPS
// we must relay WM_MOUSEMOVE events to the tooltip ctrl if we want it to
// popup the tooltip bubbles
if ( msg->message == WM_MOUSEMOVE )
{
// we should do it if one of window children has an associated tooltip
// (and not just if the window has a tooltip itself)
if ( wndThis->HasToolTips() )
wxToolTip::RelayEvent((WXMSG *)msg);
}
#endif // wxUSE_TOOLTIPS
// allow the window to prevent certain messages from being
// translated/processed (this is currently used by wxTextCtrl to always
// grab Ctrl-C/V/X, even if they are also accelerators in some parent)
if ( !wndThis->MSWShouldPreProcessMessage((WXMSG *)msg) )
{
return false;
}
// try translations first: the accelerators override everything
for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
{
if ( wnd->MSWTranslateMessage((WXMSG *)msg))
return true;
// stop at first top level window, i.e. don't try to process the key
// strokes originating in a dialog using the accelerators of the parent
// frame - this doesn't make much sense
if ( wnd->IsTopLevel() )
break;
}
// now try the other hooks (kbd navigation is handled here)
for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
{
if ( wnd->MSWProcessMessage((WXMSG *)msg) )
return true;
// also stop at first top level window here, just as above because
// if we don't do this, pressing ESC on a modal dialog shown as child
// of a modal dialog with wxID_CANCEL will cause the parent dialog to
// be closed, for example
if ( wnd->IsTopLevel() )
break;
}
// no special preprocessing for this message, dispatch it normally
return false;
}
void wxGUIEventLoop::ProcessMessage(WXMSG *msg)
{
// give us the chance to preprocess the message first
if ( !PreProcessMessage(msg) )
{
// if it wasn't done, dispatch it to the corresponding window
::TranslateMessage(msg);
::DispatchMessage(msg);
}
}
bool wxGUIEventLoop::Dispatch()
{
MSG msg;
if ( !GetNextMessage(&msg) )
return false;
#if wxUSE_THREADS
wxASSERT_MSG( wxThread::IsMain(),
wxT("only the main thread can process Windows messages") );
static bool s_hadGuiLock = true;
static wxMsgList s_aSavedMessages;
// if a secondary thread owning the mutex is doing GUI calls, save all
// messages for later processing - we can't process them right now because
// it will lead to recursive library calls (and we're not reentrant)
if ( !wxGuiOwnedByMainThread() )
{
s_hadGuiLock = false;
// leave out WM_COMMAND messages: too dangerous, sometimes
// the message will be processed twice
if ( !wxIsWaitingForThread() || msg.message != WM_COMMAND )
{
MSG* pMsg = new MSG(msg);
s_aSavedMessages.Append(pMsg);
}
return true;
}
else
{
// have we just regained the GUI lock? if so, post all of the saved
// messages
//
// FIXME of course, it's not _exactly_ the same as processing the
// messages normally - expect some things to break...
if ( !s_hadGuiLock )
{
s_hadGuiLock = true;
wxMsgList::compatibility_iterator node = s_aSavedMessages.GetFirst();
while (node)
{
MSG* pMsg = node->GetData();
s_aSavedMessages.Erase(node);
ProcessMessage(pMsg);
delete pMsg;
node = s_aSavedMessages.GetFirst();
}
}
}
#endif // wxUSE_THREADS
ProcessMessage(&msg);
return true;
}
void wxGUIEventLoop::OnNextIteration()
{
#if wxUSE_THREADS
wxMutexGuiLeaveOrEnter();
#endif // wxUSE_THREADS
}
void wxGUIEventLoop::WakeUp()
{
::PostMessage(NULL, WM_NULL, 0, 0);
}
#else // !wxUSE_GUI
void wxConsoleEventLoop::OnNextIteration()
{
if ( wxTheApp )
wxTheApp->ProcessPendingEvents();
}
void wxConsoleEventLoop::WakeUp()
{
#if wxUSE_THREADS
wxWakeUpMainThread();
#endif
}
bool wxConsoleEventLoop::Dispatch()
{
MSG msg;
if ( !GetNextMessage(&msg) )
return false;
if ( msg.message == WM_TIMER )
{
TIMERPROC proc = (TIMERPROC)msg.lParam;
if ( proc )
(*proc)(NULL, 0, msg.wParam, 0);
}
else
{
wxLogDebug(_T("Ignoring unexpected message %d"), msg.message);
}
return !m_shouldExit;
}
#endif //wxUSE_GUI