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

Use the same console event loop in wxBase and wxCore in wxMSW.

Browse Source 
Refactor the console event loop code into separate files to untangle it from
the GUI version and ensure that it doesn't depend on the GUI at all. It can
now be defined in the base library and simply reused by the core one.

This also makes the console event loop usable for other ports under Windows,
e.g. wxGTK.

Closes #14426.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-07-10 23:52:00 +00:00
parent 14b682f7c3
commit e27f554012
76 changed files with 1691 additions and 1522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
build/msw/makefile.bcc
View File

@@ -39,7 +39,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
-DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
-DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
WX_RELEASE_NODOT = 29
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
COMPILER_PREFIX = bcc
OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
@@ -417,6 +417,7 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_dde.obj \
$(OBJS)\monodll_dir.obj \
$(OBJS)\monodll_dlmsw.obj \
$(OBJS)\monodll_evtloopconsole.obj \
$(OBJS)\monodll_mimetype.obj \
$(OBJS)\monodll_power.obj \
$(OBJS)\monodll_regconf.obj \
@@ -433,7 +434,6 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_fs_mem.obj \
$(OBJS)\monodll_msgout.obj \
$(OBJS)\monodll_utilscmn.obj \
$(OBJS)\monodll_evtloop.obj \
$(OBJS)\monodll_main.obj \
$(OBJS)\monodll_mslu.obj \
$(OBJS)\monodll_volume.obj \
@@ -566,6 +566,7 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_dde.obj \
$(OBJS)\monolib_dir.obj \
$(OBJS)\monolib_dlmsw.obj \
$(OBJS)\monolib_evtloopconsole.obj \
$(OBJS)\monolib_mimetype.obj \
$(OBJS)\monolib_power.obj \
$(OBJS)\monolib_regconf.obj \
@@ -582,7 +583,6 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_fs_mem.obj \
$(OBJS)\monolib_msgout.obj \
$(OBJS)\monolib_utilscmn.obj \
$(OBJS)\monolib_evtloop.obj \
$(OBJS)\monolib_main.obj \
$(OBJS)\monolib_mslu.obj \
$(OBJS)\monolib_volume.obj \
@@ -713,6 +713,7 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_dde.obj \
$(OBJS)\basedll_dir.obj \
$(OBJS)\basedll_dlmsw.obj \
$(OBJS)\basedll_evtloopconsole.obj \
$(OBJS)\basedll_mimetype.obj \
$(OBJS)\basedll_power.obj \
$(OBJS)\basedll_regconf.obj \
@@ -729,7 +730,6 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_fs_mem.obj \
$(OBJS)\basedll_msgout.obj \
$(OBJS)\basedll_utilscmn.obj \
$(OBJS)\basedll_evtloop.obj \
$(OBJS)\basedll_main.obj \
$(OBJS)\basedll_mslu.obj \
$(OBJS)\basedll_volume.obj
@@ -844,6 +844,7 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_dde.obj \
$(OBJS)\baselib_dir.obj \
$(OBJS)\baselib_dlmsw.obj \
$(OBJS)\baselib_evtloopconsole.obj \
$(OBJS)\baselib_mimetype.obj \
$(OBJS)\baselib_power.obj \
$(OBJS)\baselib_regconf.obj \
@@ -860,7 +861,6 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_fs_mem.obj \
$(OBJS)\baselib_msgout.obj \
$(OBJS)\baselib_utilscmn.obj \
$(OBJS)\baselib_evtloop.obj \
$(OBJS)\baselib_main.obj \
$(OBJS)\baselib_mslu.obj \
$(OBJS)\baselib_volume.obj
@@ -925,7 +925,6 @@ COREDLL_OBJECTS = \
$(OBJS)\coredll_fs_mem.obj \
$(OBJS)\coredll_msgout.obj \
$(OBJS)\coredll_utilscmn.obj \
$(OBJS)\coredll_evtloop.obj \
$(OBJS)\coredll_main.obj \
$(OBJS)\coredll_mslu.obj \
$(OBJS)\coredll_volume.obj \
@@ -945,7 +944,6 @@ CORELIB_OBJECTS = \
$(OBJS)\corelib_fs_mem.obj \
$(OBJS)\corelib_msgout.obj \
$(OBJS)\corelib_utilscmn.obj \
$(OBJS)\corelib_evtloop.obj \
$(OBJS)\corelib_main.obj \
$(OBJS)\corelib_mslu.obj \
$(OBJS)\corelib_volume.obj \
@@ -1806,6 +1804,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_msw_dialog.obj \
$(OBJS)\monodll_dirdlg.obj \
$(OBJS)\monodll_dragimag.obj \
$(OBJS)\monodll_evtloop.obj \
$(OBJS)\monodll_filedlg.obj \
$(OBJS)\monodll_frame.obj \
$(OBJS)\monodll_msw_gauge.obj \
@@ -2590,6 +2589,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_msw_dialog.obj \
$(OBJS)\monolib_dirdlg.obj \
$(OBJS)\monolib_dragimag.obj \
$(OBJS)\monolib_evtloop.obj \
$(OBJS)\monolib_filedlg.obj \
$(OBJS)\monolib_frame.obj \
$(OBJS)\monolib_msw_gauge.obj \
@@ -3256,6 +3256,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_msw_dialog.obj \
$(OBJS)\coredll_dirdlg.obj \
$(OBJS)\coredll_dragimag.obj \
$(OBJS)\coredll_evtloop.obj \
$(OBJS)\coredll_filedlg.obj \
$(OBJS)\coredll_frame.obj \
$(OBJS)\coredll_msw_gauge.obj \
@@ -3798,6 +3799,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_msw_dialog.obj \
$(OBJS)\corelib_dirdlg.obj \
$(OBJS)\corelib_dragimag.obj \
$(OBJS)\corelib_evtloop.obj \
$(OBJS)\corelib_filedlg.obj \
$(OBJS)\corelib_frame.obj \
$(OBJS)\corelib_msw_gauge.obj \
@@ -5371,7 +5373,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
build_cfg_file: $(SETUPHDIR)
@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=5 >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=5 >>$(BUILD_CFG_FILE)
@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@@ -6343,6 +6345,9 @@ $(OBJS)\monodll_dir.obj: ..\..\src\msw\dir.cpp
$(OBJS)\monodll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dlmsw.cpp
$(OBJS)\monodll_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp
$(OBJS)\monodll_mimetype.obj: ..\..\src\msw\mimetype.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mimetype.cpp
@@ -6391,9 +6396,6 @@ $(OBJS)\monodll_msgout.obj: ..\..\src\common\msgout.cpp
$(OBJS)\monodll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp
$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
$(OBJS)\monodll_main.obj: ..\..\src\msw\main.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\main.cpp
@@ -6484,6 +6486,9 @@ $(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
$(OBJS)\monodll_dragimag.obj: ..\..\src\msw\dragimag.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dragimag.cpp
$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
$(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\filedlg.cpp
@@ -8751,6 +8756,9 @@ $(OBJS)\monolib_dir.obj: ..\..\src\msw\dir.cpp
$(OBJS)\monolib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dlmsw.cpp
$(OBJS)\monolib_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp
$(OBJS)\monolib_mimetype.obj: ..\..\src\msw\mimetype.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mimetype.cpp
@@ -8799,9 +8807,6 @@ $(OBJS)\monolib_msgout.obj: ..\..\src\common\msgout.cpp
$(OBJS)\monolib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp
$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
$(OBJS)\monolib_main.obj: ..\..\src\msw\main.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\main.cpp
@@ -8892,6 +8897,9 @@ $(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
$(OBJS)\monolib_dragimag.obj: ..\..\src\msw\dragimag.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dragimag.cpp
$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
$(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\filedlg.cpp
@@ -11159,6 +11167,9 @@ $(OBJS)\basedll_dir.obj: ..\..\src\msw\dir.cpp
$(OBJS)\basedll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\dlmsw.cpp
$(OBJS)\basedll_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp
$(OBJS)\basedll_mimetype.obj: ..\..\src\msw\mimetype.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\mimetype.cpp
@@ -11207,9 +11218,6 @@ $(OBJS)\basedll_msgout.obj: ..\..\src\common\msgout.cpp
$(OBJS)\basedll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp
$(OBJS)\basedll_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
$(OBJS)\basedll_main.obj: ..\..\src\msw\main.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\main.cpp
@@ -11498,6 +11506,9 @@ $(OBJS)\baselib_dir.obj: ..\..\src\msw\dir.cpp
$(OBJS)\baselib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\dlmsw.cpp
$(OBJS)\baselib_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp
$(OBJS)\baselib_mimetype.obj: ..\..\src\msw\mimetype.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\mimetype.cpp
@@ -11546,9 +11557,6 @@ $(OBJS)\baselib_msgout.obj: ..\..\src\common\msgout.cpp
$(OBJS)\baselib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp
$(OBJS)\baselib_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
$(OBJS)\baselib_main.obj: ..\..\src\msw\main.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\main.cpp
@@ -11657,9 +11665,6 @@ $(OBJS)\coredll_msgout.obj: ..\..\src\common\msgout.cpp
$(OBJS)\coredll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp
$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
$(OBJS)\coredll_main.obj: ..\..\src\msw\main.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\main.cpp
@@ -11714,6 +11719,9 @@ $(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
$(OBJS)\coredll_dragimag.obj: ..\..\src\msw\dragimag.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dragimag.cpp
$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
$(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\filedlg.cpp
@@ -13065,9 +13073,6 @@ $(OBJS)\corelib_msgout.obj: ..\..\src\common\msgout.cpp
$(OBJS)\corelib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp
$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
$(OBJS)\corelib_main.obj: ..\..\src\msw\main.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\main.cpp
@@ -13122,6 +13127,9 @@ $(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
$(OBJS)\corelib_dragimag.obj: ..\..\src\msw\dragimag.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dragimag.cpp
$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
$(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\filedlg.cpp