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

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
2012-07-10 23:52:00 +00:00
parent 14b682f7c3
commit e27f554012
76 changed files with 1691 additions and 1522 deletions
--- a/Makefile.in
+++ b/Makefile.in
@@ -683,6 +683,7 @@ ALL_PORTS_BASE_HEADERS =  \
 	wx/msw/crashrpt.h \
 	wx/msw/dde.h \
 	wx/msw/debughlp.h \
+	wx/msw/evtloopconsole.h \
 	wx/msw/gccpriv.h \
 	wx/msw/libraries.h \
 	wx/msw/mimetype.h \
@@ -824,6 +825,7 @@ ALL_BASE_SOURCES =  \
 	src/msw/dde.cpp \
 	src/msw/dir.cpp \
 	src/msw/dlmsw.cpp \
+	src/msw/evtloopconsole.cpp \
 	src/msw/mimetype.cpp \
 	src/msw/power.cpp \
 	src/msw/regconf.cpp \
@@ -860,7 +862,6 @@ ALL_BASE_SOURCES =  \
 	src/osx/carbon/utils.cpp \
 	src/osx/carbon/uma.cpp \
 	src/osx/cocoa/utils.mm \
-	src/msw/evtloop.cpp \
 	src/msw/main.cpp \
 	src/msw/mslu.cpp \
 	src/msw/volume.cpp \
@@ -2529,6 +2530,7 @@ COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR =  \
 	wx/msw/crashrpt.h \
 	wx/msw/dde.h \
 	wx/msw/debughlp.h \
+	wx/msw/evtloopconsole.h \
 	wx/msw/gccpriv.h \
 	wx/msw/libraries.h \
 	wx/msw/mimetype.h \
@@ -4470,6 +4472,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS =  \
 	monodll_dde.o \
 	monodll_msw_dir.o \
 	monodll_dlmsw.o \
+	monodll_evtloopconsole.o \
 	monodll_msw_mimetype.o \
 	monodll_power.o \
 	monodll_regconf.o \
@@ -4487,8 +4490,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS =  \
@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS = monodll_wince_time.o
@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS = 
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
-@COND_PLATFORM_WIN32_1@	= monodll_msw_evtloop.o monodll_msw_main.o \
-@COND_PLATFORM_WIN32_1@	monodll_mslu.o monodll_volume.o
+@COND_PLATFORM_WIN32_1@	= monodll_msw_main.o monodll_mslu.o monodll_volume.o
@COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS \
@COND_TOOLKIT_OSX_CARBON@	= monodll_carbon_utils.o monodll_uma.o
@COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS \
@@ -5667,6 +5669,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
 	monodll_msw_dialog.o \
 	monodll_msw_dirdlg.o \
 	monodll_dragimag.o \
+	monodll_msw_evtloop.o \
 	monodll_msw_filedlg.o \
 	monodll_msw_frame.o \
 	monodll_msw_gauge.o \
@@ -5906,6 +5909,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS =  \
 	monodll_msw_dialog.o \
 	monodll_msw_dirdlg.o \
 	monodll_dragimag.o \
+	monodll_msw_evtloop.o \
 	monodll_msw_filedlg.o \
 	monodll_msw_frame.o \
 	monodll_msw_gauge.o \
@@ -6662,6 +6666,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
 	monolib_dde.o \
 	monolib_msw_dir.o \
 	monolib_dlmsw.o \
+	monolib_evtloopconsole.o \
 	monolib_msw_mimetype.o \
 	monolib_power.o \
 	monolib_regconf.o \
@@ -6679,8 +6684,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_1 = monolib_wince_time.o
@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 = 
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
-@COND_PLATFORM_WIN32_1@	= monolib_msw_evtloop.o monolib_msw_main.o \
-@COND_PLATFORM_WIN32_1@	monolib_mslu.o monolib_volume.o
+@COND_PLATFORM_WIN32_1@	= monolib_msw_main.o monolib_mslu.o monolib_volume.o
@COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 \
@COND_TOOLKIT_OSX_CARBON@	= monolib_carbon_utils.o monolib_uma.o
@COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 \
@@ -7859,6 +7863,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
 	monolib_msw_dialog.o \
 	monolib_msw_dirdlg.o \
 	monolib_dragimag.o \
+	monolib_msw_evtloop.o \
 	monolib_msw_filedlg.o \
 	monolib_msw_frame.o \
 	monolib_msw_gauge.o \
@@ -8098,6 +8103,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 =  \
 	monolib_msw_dialog.o \
 	monolib_msw_dirdlg.o \
 	monolib_dragimag.o \
+	monolib_msw_evtloop.o \
 	monolib_msw_filedlg.o \
 	monolib_msw_frame.o \
 	monolib_msw_gauge.o \
@@ -8907,6 +8913,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
 	basedll_dde.o \
 	basedll_msw_dir.o \
 	basedll_dlmsw.o \
+	basedll_evtloopconsole.o \
 	basedll_msw_mimetype.o \
 	basedll_power.o \
 	basedll_regconf.o \
@@ -8924,8 +8931,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_2 = basedll_wince_time.o
@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 = 
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
-@COND_PLATFORM_WIN32_1@	= basedll_evtloop.o basedll_main.o basedll_mslu.o \
-@COND_PLATFORM_WIN32_1@	basedll_volume.o
+@COND_PLATFORM_WIN32_1@	= basedll_main.o basedll_mslu.o basedll_volume.o
@COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2 \
@COND_TOOLKIT_OSX_CARBON@	= basedll_carbon_utils.o basedll_uma.o
@COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2 \
@@ -9007,6 +9013,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
 	baselib_dde.o \
 	baselib_msw_dir.o \
 	baselib_dlmsw.o \
+	baselib_evtloopconsole.o \
 	baselib_msw_mimetype.o \
 	baselib_power.o \
 	baselib_regconf.o \
@@ -9024,8 +9031,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_3 = baselib_wince_time.o
@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 = 
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
-@COND_PLATFORM_WIN32_1@	= baselib_evtloop.o baselib_main.o baselib_mslu.o \
-@COND_PLATFORM_WIN32_1@	baselib_volume.o
+@COND_PLATFORM_WIN32_1@	= baselib_main.o baselib_mslu.o baselib_volume.o
@COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 \
@COND_TOOLKIT_OSX_CARBON@	= baselib_carbon_utils.o baselib_uma.o
@COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 \
@@ -9199,8 +9205,7 @@ COND_USE_SOVERSOLARIS_1___coredll___so_symlinks_uninst_cmd = rm -f \
@COND_PLATFORM_WIN32_1@__coredll___win32rc = coredll_version_rc.o
@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 = 
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 \
-@COND_PLATFORM_WIN32_1@	= coredll_msw_evtloop.o coredll_msw_main.o \
-@COND_PLATFORM_WIN32_1@	coredll_mslu.o coredll_volume.o
+@COND_PLATFORM_WIN32_1@	= coredll_msw_main.o coredll_mslu.o coredll_volume.o
@COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 \
@COND_TOOLKIT_OSX_CARBON@	= coredll_carbon_utils.o coredll_uma.o
@COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 \
@@ -10228,6 +10233,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
 	coredll_msw_dialog.o \
 	coredll_msw_dirdlg.o \
 	coredll_dragimag.o \
+	coredll_msw_evtloop.o \
 	coredll_msw_filedlg.o \
 	coredll_msw_frame.o \
 	coredll_msw_gauge.o \
@@ -10467,6 +10473,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 =  \
 	coredll_msw_dialog.o \
 	coredll_msw_dirdlg.o \
 	coredll_dragimag.o \
+	coredll_msw_evtloop.o \
 	coredll_msw_filedlg.o \
 	coredll_msw_frame.o \
 	coredll_msw_gauge.o \
@@ -10837,8 +10844,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \
@COND_USE_PCH_1@	= ./.pch/wxprec_corelib/wx/wxprec.h.gch
@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 = 
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
-@COND_PLATFORM_WIN32_1@	= corelib_msw_evtloop.o corelib_msw_main.o \
-@COND_PLATFORM_WIN32_1@	corelib_mslu.o corelib_volume.o
+@COND_PLATFORM_WIN32_1@	= corelib_msw_main.o corelib_mslu.o corelib_volume.o
@COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 \
@COND_TOOLKIT_OSX_CARBON@	= corelib_carbon_utils.o corelib_uma.o
@COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 \
@@ -11866,6 +11872,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
 	corelib_msw_dialog.o \
 	corelib_msw_dirdlg.o \
 	corelib_dragimag.o \
+	corelib_msw_evtloop.o \
 	corelib_msw_filedlg.o \
 	corelib_msw_frame.o \
 	corelib_msw_gauge.o \
@@ -12105,6 +12112,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 =  \
 	corelib_msw_dialog.o \
 	corelib_msw_dirdlg.o \
 	corelib_dragimag.o \
+	corelib_msw_evtloop.o \
 	corelib_msw_filedlg.o \
 	corelib_msw_frame.o \
 	corelib_msw_gauge.o \
@@ -16666,6 +16674,9 @@ monodll_msw_dir.o: $(srcdir)/src/msw/dir.cpp $(MONODLL_ODEP)
 monodll_dlmsw.o: $(srcdir)/src/msw/dlmsw.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dlmsw.cpp

+monodll_evtloopconsole.o: $(srcdir)/src/msw/evtloopconsole.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/evtloopconsole.cpp
+
 monodll_msw_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp

@@ -16765,9 +16776,6 @@ monodll_msgout.o: $(srcdir)/src/common/msgout.cpp $(MONODLL_ODEP)
 monodll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp

-monodll_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
-
 monodll_msw_main.o: $(srcdir)/src/msw/main.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/main.cpp

@@ -20329,6 +20337,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp

+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp

@@ -22276,6 +22290,9 @@ monolib_msw_dir.o: $(srcdir)/src/msw/dir.cpp $(MONOLIB_ODEP)
 monolib_dlmsw.o: $(srcdir)/src/msw/dlmsw.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dlmsw.cpp

+monolib_evtloopconsole.o: $(srcdir)/src/msw/evtloopconsole.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/evtloopconsole.cpp
+
 monolib_msw_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp

@@ -22375,9 +22392,6 @@ monolib_msgout.o: $(srcdir)/src/common/msgout.cpp $(MONOLIB_ODEP)
 monolib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp

-monolib_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
-
 monolib_msw_main.o: $(srcdir)/src/msw/main.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/main.cpp

@@ -25939,6 +25953,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp

+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp

@@ -27886,6 +27906,9 @@ basedll_msw_dir.o: $(srcdir)/src/msw/dir.cpp $(BASEDLL_ODEP)
 basedll_dlmsw.o: $(srcdir)/src/msw/dlmsw.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/dlmsw.cpp

+basedll_evtloopconsole.o: $(srcdir)/src/msw/evtloopconsole.cpp $(BASEDLL_ODEP)
+	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/evtloopconsole.cpp
+
 basedll_msw_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp

@@ -27985,9 +28008,6 @@ basedll_msgout.o: $(srcdir)/src/common/msgout.cpp $(BASEDLL_ODEP)
 basedll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp

-basedll_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(BASEDLL_ODEP)
-	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
-
 basedll_main.o: $(srcdir)/src/msw/main.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/main.cpp

@@ -28393,6 +28413,9 @@ baselib_msw_dir.o: $(srcdir)/src/msw/dir.cpp $(BASELIB_ODEP)
 baselib_dlmsw.o: $(srcdir)/src/msw/dlmsw.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/dlmsw.cpp

+baselib_evtloopconsole.o: $(srcdir)/src/msw/evtloopconsole.cpp $(BASELIB_ODEP)
+	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/evtloopconsole.cpp
+
 baselib_msw_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp

@@ -28492,9 +28515,6 @@ baselib_msgout.o: $(srcdir)/src/common/msgout.cpp $(BASELIB_ODEP)
 baselib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp

-baselib_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(BASELIB_ODEP)
-	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
-
 baselib_main.o: $(srcdir)/src/msw/main.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/main.cpp

@@ -28750,9 +28770,6 @@ coredll_msgout.o: $(srcdir)/src/common/msgout.cpp $(COREDLL_ODEP)
 coredll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp

-coredll_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(COREDLL_ODEP)
-	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
-
 coredll_msw_main.o: $(srcdir)/src/msw/main.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/main.cpp

@@ -31723,6 +31740,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp

+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp

@@ -32947,9 +32970,6 @@ corelib_msgout.o: $(srcdir)/src/common/msgout.cpp $(CORELIB_ODEP)
 corelib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp

-corelib_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(CORELIB_ODEP)
-	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
-
 corelib_msw_main.o: $(srcdir)/src/msw/main.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/main.cpp

@@ -35920,6 +35940,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp

+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp

--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -128,6 +128,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/msw/dde.cpp
    src/msw/dir.cpp
    src/msw/dlmsw.cpp
+    src/msw/evtloopconsole.cpp
    src/msw/mimetype.cpp
    src/msw/power.cpp
    src/msw/regconf.cpp
@@ -142,7 +143,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/msw/fswatcher.cpp
 </set>
 <set var="BASE_AND_GUI_WIN32_SRC" hints="files">
-    src/msw/evtloop.cpp
    src/msw/main.cpp
    src/msw/mslu.cpp
    src/msw/volume.cpp
@@ -157,6 +157,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/msw/crashrpt.h
    wx/msw/dde.h
    wx/msw/debughlp.h
+    wx/msw/evtloopconsole.h
    wx/msw/gccpriv.h
    wx/msw/libraries.h
    wx/msw/mimetype.h
@@ -1735,6 +1736,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/msw/dialog.cpp
    src/msw/dirdlg.cpp
    src/msw/dragimag.cpp
+    src/msw/evtloop.cpp
    src/msw/filedlg.cpp
    src/msw/frame.cpp
    src/msw/gauge.cpp
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -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 \
@@ -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

--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -402,6 +402,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_dde.o \
 	$(OBJS)\monodll_dir.o \
 	$(OBJS)\monodll_dlmsw.o \
+	$(OBJS)\monodll_evtloopconsole.o \
 	$(OBJS)\monodll_mimetype.o \
 	$(OBJS)\monodll_power.o \
 	$(OBJS)\monodll_regconf.o \
@@ -418,7 +419,6 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_fs_mem.o \
 	$(OBJS)\monodll_msgout.o \
 	$(OBJS)\monodll_utilscmn.o \
-	$(OBJS)\monodll_evtloop.o \
 	$(OBJS)\monodll_main.o \
 	$(OBJS)\monodll_mslu.o \
 	$(OBJS)\monodll_volume.o \
@@ -552,6 +552,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_dde.o \
 	$(OBJS)\monolib_dir.o \
 	$(OBJS)\monolib_dlmsw.o \
+	$(OBJS)\monolib_evtloopconsole.o \
 	$(OBJS)\monolib_mimetype.o \
 	$(OBJS)\monolib_power.o \
 	$(OBJS)\monolib_regconf.o \
@@ -568,7 +569,6 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_fs_mem.o \
 	$(OBJS)\monolib_msgout.o \
 	$(OBJS)\monolib_utilscmn.o \
-	$(OBJS)\monolib_evtloop.o \
 	$(OBJS)\monolib_main.o \
 	$(OBJS)\monolib_mslu.o \
 	$(OBJS)\monolib_volume.o \
@@ -700,6 +700,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_dde.o \
 	$(OBJS)\basedll_dir.o \
 	$(OBJS)\basedll_dlmsw.o \
+	$(OBJS)\basedll_evtloopconsole.o \
 	$(OBJS)\basedll_mimetype.o \
 	$(OBJS)\basedll_power.o \
 	$(OBJS)\basedll_regconf.o \
@@ -716,7 +717,6 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_fs_mem.o \
 	$(OBJS)\basedll_msgout.o \
 	$(OBJS)\basedll_utilscmn.o \
-	$(OBJS)\basedll_evtloop.o \
 	$(OBJS)\basedll_main.o \
 	$(OBJS)\basedll_mslu.o \
 	$(OBJS)\basedll_volume.o
@@ -832,6 +832,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_dde.o \
 	$(OBJS)\baselib_dir.o \
 	$(OBJS)\baselib_dlmsw.o \
+	$(OBJS)\baselib_evtloopconsole.o \
 	$(OBJS)\baselib_mimetype.o \
 	$(OBJS)\baselib_power.o \
 	$(OBJS)\baselib_regconf.o \
@@ -848,7 +849,6 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_fs_mem.o \
 	$(OBJS)\baselib_msgout.o \
 	$(OBJS)\baselib_utilscmn.o \
-	$(OBJS)\baselib_evtloop.o \
 	$(OBJS)\baselib_main.o \
 	$(OBJS)\baselib_mslu.o \
 	$(OBJS)\baselib_volume.o
@@ -916,7 +916,6 @@ COREDLL_OBJECTS =  \
 	$(OBJS)\coredll_fs_mem.o \
 	$(OBJS)\coredll_msgout.o \
 	$(OBJS)\coredll_utilscmn.o \
-	$(OBJS)\coredll_evtloop.o \
 	$(OBJS)\coredll_main.o \
 	$(OBJS)\coredll_mslu.o \
 	$(OBJS)\coredll_volume.o \
@@ -936,7 +935,6 @@ CORELIB_OBJECTS =  \
 	$(OBJS)\corelib_fs_mem.o \
 	$(OBJS)\corelib_msgout.o \
 	$(OBJS)\corelib_utilscmn.o \
-	$(OBJS)\corelib_evtloop.o \
 	$(OBJS)\corelib_main.o \
 	$(OBJS)\corelib_mslu.o \
 	$(OBJS)\corelib_volume.o \
@@ -1818,6 +1816,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_msw_dialog.o \
 	$(OBJS)\monodll_dirdlg.o \
 	$(OBJS)\monodll_dragimag.o \
+	$(OBJS)\monodll_evtloop.o \
 	$(OBJS)\monodll_filedlg.o \
 	$(OBJS)\monodll_frame.o \
 	$(OBJS)\monodll_msw_gauge.o \
@@ -2608,6 +2607,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_msw_dialog.o \
 	$(OBJS)\monolib_dirdlg.o \
 	$(OBJS)\monolib_dragimag.o \
+	$(OBJS)\monolib_evtloop.o \
 	$(OBJS)\monolib_filedlg.o \
 	$(OBJS)\monolib_frame.o \
 	$(OBJS)\monolib_msw_gauge.o \
@@ -3290,6 +3290,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_msw_dialog.o \
 	$(OBJS)\coredll_dirdlg.o \
 	$(OBJS)\coredll_dragimag.o \
+	$(OBJS)\coredll_evtloop.o \
 	$(OBJS)\coredll_filedlg.o \
 	$(OBJS)\coredll_frame.o \
 	$(OBJS)\coredll_msw_gauge.o \
@@ -3840,6 +3841,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_msw_dialog.o \
 	$(OBJS)\corelib_dirdlg.o \
 	$(OBJS)\corelib_dragimag.o \
+	$(OBJS)\corelib_evtloop.o \
 	$(OBJS)\corelib_filedlg.o \
 	$(OBJS)\corelib_frame.o \
 	$(OBJS)\corelib_msw_gauge.o \
@@ -6511,6 +6513,9 @@ $(OBJS)\monodll_dir.o: ../../src/msw/dir.cpp
 $(OBJS)\monodll_dlmsw.o: ../../src/msw/dlmsw.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\monodll_evtloopconsole.o: ../../src/msw/evtloopconsole.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_mimetype.o: ../../src/msw/mimetype.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

@@ -6559,9 +6564,6 @@ $(OBJS)\monodll_msgout.o: ../../src/common/msgout.cpp
 $(OBJS)\monodll_utilscmn.o: ../../src/common/utilscmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

-$(OBJS)\monodll_evtloop.o: ../../src/msw/evtloop.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monodll_main.o: ../../src/msw/main.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

@@ -6652,6 +6654,9 @@ $(OBJS)\monodll_dirdlg.o: ../../src/msw/dirdlg.cpp
 $(OBJS)\monodll_dragimag.o: ../../src/msw/dragimag.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\monodll_evtloop.o: ../../src/msw/evtloop.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_filedlg.o: ../../src/msw/filedlg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

@@ -8919,6 +8924,9 @@ $(OBJS)\monolib_dir.o: ../../src/msw/dir.cpp
 $(OBJS)\monolib_dlmsw.o: ../../src/msw/dlmsw.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\monolib_evtloopconsole.o: ../../src/msw/evtloopconsole.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_mimetype.o: ../../src/msw/mimetype.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

@@ -8967,9 +8975,6 @@ $(OBJS)\monolib_msgout.o: ../../src/common/msgout.cpp
 $(OBJS)\monolib_utilscmn.o: ../../src/common/utilscmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

-$(OBJS)\monolib_evtloop.o: ../../src/msw/evtloop.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monolib_main.o: ../../src/msw/main.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

@@ -9060,6 +9065,9 @@ $(OBJS)\monolib_dirdlg.o: ../../src/msw/dirdlg.cpp
 $(OBJS)\monolib_dragimag.o: ../../src/msw/dragimag.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\monolib_evtloop.o: ../../src/msw/evtloop.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_filedlg.o: ../../src/msw/filedlg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

@@ -11327,6 +11335,9 @@ $(OBJS)\basedll_dir.o: ../../src/msw/dir.cpp
 $(OBJS)\basedll_dlmsw.o: ../../src/msw/dlmsw.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\basedll_evtloopconsole.o: ../../src/msw/evtloopconsole.cpp
+	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\basedll_mimetype.o: ../../src/msw/mimetype.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<

@@ -11375,9 +11386,6 @@ $(OBJS)\basedll_msgout.o: ../../src/common/msgout.cpp
 $(OBJS)\basedll_utilscmn.o: ../../src/common/utilscmn.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<

-$(OBJS)\basedll_evtloop.o: ../../src/msw/evtloop.cpp
-	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\basedll_main.o: ../../src/msw/main.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<

@@ -11666,6 +11674,9 @@ $(OBJS)\baselib_dir.o: ../../src/msw/dir.cpp
 $(OBJS)\baselib_dlmsw.o: ../../src/msw/dlmsw.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\baselib_evtloopconsole.o: ../../src/msw/evtloopconsole.cpp
+	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\baselib_mimetype.o: ../../src/msw/mimetype.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<

@@ -11714,9 +11725,6 @@ $(OBJS)\baselib_msgout.o: ../../src/common/msgout.cpp
 $(OBJS)\baselib_utilscmn.o: ../../src/common/utilscmn.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<

-$(OBJS)\baselib_evtloop.o: ../../src/msw/evtloop.cpp
-	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\baselib_main.o: ../../src/msw/main.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<

@@ -11825,9 +11833,6 @@ $(OBJS)\coredll_msgout.o: ../../src/common/msgout.cpp
 $(OBJS)\coredll_utilscmn.o: ../../src/common/utilscmn.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<

-$(OBJS)\coredll_evtloop.o: ../../src/msw/evtloop.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\coredll_main.o: ../../src/msw/main.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<

@@ -11882,6 +11887,9 @@ $(OBJS)\coredll_dirdlg.o: ../../src/msw/dirdlg.cpp
 $(OBJS)\coredll_dragimag.o: ../../src/msw/dragimag.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\coredll_evtloop.o: ../../src/msw/evtloop.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\coredll_filedlg.o: ../../src/msw/filedlg.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<

@@ -13233,9 +13241,6 @@ $(OBJS)\corelib_msgout.o: ../../src/common/msgout.cpp
 $(OBJS)\corelib_utilscmn.o: ../../src/common/utilscmn.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<

-$(OBJS)\corelib_evtloop.o: ../../src/msw/evtloop.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\corelib_main.o: ../../src/msw/main.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<

@@ -13290,6 +13295,9 @@ $(OBJS)\corelib_dirdlg.o: ../../src/msw/dirdlg.cpp
 $(OBJS)\corelib_dragimag.o: ../../src/msw/dragimag.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\corelib_evtloop.o: ../../src/msw/evtloop.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\corelib_filedlg.o: ../../src/msw/filedlg.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<

--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -434,6 +434,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 \
@@ -450,7 +451,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 \
@@ -592,6 +592,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 \
@@ -608,7 +609,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 \
@@ -746,6 +746,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 \
@@ -762,7 +763,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
@@ -887,6 +887,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 \
@@ -903,7 +904,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
@@ -982,7 +982,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 \
@@ -1008,7 +1007,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 \
@@ -2098,6 +2096,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 \
@@ -2888,6 +2887,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 \
@@ -3620,6 +3620,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 \
@@ -4168,6 +4169,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 \
@@ -7027,6 +7029,9 @@ $(OBJS)\monodll_dir.obj: ..\..\src\msw\dir.cpp
 $(OBJS)\monodll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dlmsw.cpp

+$(OBJS)\monodll_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp
+
 $(OBJS)\monodll_mimetype.obj: ..\..\src\msw\mimetype.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mimetype.cpp

@@ -7075,9 +7080,6 @@ $(OBJS)\monodll_msgout.obj: ..\..\src\common\msgout.cpp
 $(OBJS)\monodll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp

-$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
-
 $(OBJS)\monodll_main.obj: ..\..\src\msw\main.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\main.cpp

@@ -7168,6 +7170,9 @@ $(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
 $(OBJS)\monodll_dragimag.obj: ..\..\src\msw\dragimag.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dragimag.cpp

+$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+
 $(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\filedlg.cpp

@@ -9435,6 +9440,9 @@ $(OBJS)\monolib_dir.obj: ..\..\src\msw\dir.cpp
 $(OBJS)\monolib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dlmsw.cpp

+$(OBJS)\monolib_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp
+
 $(OBJS)\monolib_mimetype.obj: ..\..\src\msw\mimetype.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mimetype.cpp

@@ -9483,9 +9491,6 @@ $(OBJS)\monolib_msgout.obj: ..\..\src\common\msgout.cpp
 $(OBJS)\monolib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp

-$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
-
 $(OBJS)\monolib_main.obj: ..\..\src\msw\main.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\main.cpp

@@ -9576,6 +9581,9 @@ $(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
 $(OBJS)\monolib_dragimag.obj: ..\..\src\msw\dragimag.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dragimag.cpp

+$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+
 $(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\filedlg.cpp

@@ -11843,6 +11851,9 @@ $(OBJS)\basedll_dir.obj: ..\..\src\msw\dir.cpp
 $(OBJS)\basedll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\dlmsw.cpp

+$(OBJS)\basedll_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp
+
 $(OBJS)\basedll_mimetype.obj: ..\..\src\msw\mimetype.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\mimetype.cpp

@@ -11891,9 +11902,6 @@ $(OBJS)\basedll_msgout.obj: ..\..\src\common\msgout.cpp
 $(OBJS)\basedll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp

-$(OBJS)\basedll_evtloop.obj: ..\..\src\msw\evtloop.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
-
 $(OBJS)\basedll_main.obj: ..\..\src\msw\main.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\main.cpp

@@ -12182,6 +12190,9 @@ $(OBJS)\baselib_dir.obj: ..\..\src\msw\dir.cpp
 $(OBJS)\baselib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\dlmsw.cpp

+$(OBJS)\baselib_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp
+
 $(OBJS)\baselib_mimetype.obj: ..\..\src\msw\mimetype.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\mimetype.cpp

@@ -12230,9 +12241,6 @@ $(OBJS)\baselib_msgout.obj: ..\..\src\common\msgout.cpp
 $(OBJS)\baselib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp

-$(OBJS)\baselib_evtloop.obj: ..\..\src\msw\evtloop.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
-
 $(OBJS)\baselib_main.obj: ..\..\src\msw\main.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\main.cpp

@@ -12341,9 +12349,6 @@ $(OBJS)\coredll_msgout.obj: ..\..\src\common\msgout.cpp
 $(OBJS)\coredll_utilscmn.obj: ..\..\src\common\utilscmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp

-$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
-
 $(OBJS)\coredll_main.obj: ..\..\src\msw\main.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\main.cpp

@@ -12398,6 +12403,9 @@ $(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
 $(OBJS)\coredll_dragimag.obj: ..\..\src\msw\dragimag.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dragimag.cpp

+$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+
 $(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\filedlg.cpp

@@ -13749,9 +13757,6 @@ $(OBJS)\corelib_msgout.obj: ..\..\src\common\msgout.cpp
 $(OBJS)\corelib_utilscmn.obj: ..\..\src\common\utilscmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp

-$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
-
 $(OBJS)\corelib_main.obj: ..\..\src\msw\main.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\main.cpp

@@ -13806,6 +13811,9 @@ $(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
 $(OBJS)\corelib_dragimag.obj: ..\..\src\msw\dragimag.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dragimag.cpp

+$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+
 $(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\filedlg.cpp

--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -330,6 +330,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 &
@@ -1125,6 +1126,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 &
@@ -1818,6 +1820,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 &
@@ -2370,6 +2373,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 &
@@ -3951,6 +3955,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 &
@@ -3967,7 +3972,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 &
@@ -4099,6 +4103,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 &
@@ -4115,7 +4120,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 &
@@ -4245,6 +4249,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 &
@@ -4261,7 +4266,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
@@ -4376,6 +4380,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 &
@@ -4392,7 +4397,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
@@ -4457,7 +4461,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 &
@@ -4477,7 +4480,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 &
@@ -6784,6 +6786,9 @@ $(OBJS)\monodll_dir.obj :  .AUTODEPEND ..\..\src\msw\dir.cpp
 $(OBJS)\monodll_dlmsw.obj :  .AUTODEPEND ..\..\src\msw\dlmsw.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

+$(OBJS)\monodll_evtloopconsole.obj :  .AUTODEPEND ..\..\src\msw\evtloopconsole.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_mimetype.obj :  .AUTODEPEND ..\..\src\msw\mimetype.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

@@ -6832,9 +6837,6 @@ $(OBJS)\monodll_msgout.obj :  .AUTODEPEND ..\..\src\common\msgout.cpp
 $(OBJS)\monodll_utilscmn.obj :  .AUTODEPEND ..\..\src\common\utilscmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

-$(OBJS)\monodll_evtloop.obj :  .AUTODEPEND ..\..\src\msw\evtloop.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
 $(OBJS)\monodll_main.obj :  .AUTODEPEND ..\..\src\msw\main.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

@@ -6925,6 +6927,9 @@ $(OBJS)\monodll_dirdlg.obj :  .AUTODEPEND ..\..\src\msw\dirdlg.cpp
 $(OBJS)\monodll_dragimag.obj :  .AUTODEPEND ..\..\src\msw\dragimag.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

+$(OBJS)\monodll_evtloop.obj :  .AUTODEPEND ..\..\src\msw\evtloop.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_filedlg.obj :  .AUTODEPEND ..\..\src\msw\filedlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

@@ -9192,6 +9197,9 @@ $(OBJS)\monolib_dir.obj :  .AUTODEPEND ..\..\src\msw\dir.cpp
 $(OBJS)\monolib_dlmsw.obj :  .AUTODEPEND ..\..\src\msw\dlmsw.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

+$(OBJS)\monolib_evtloopconsole.obj :  .AUTODEPEND ..\..\src\msw\evtloopconsole.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_mimetype.obj :  .AUTODEPEND ..\..\src\msw\mimetype.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

@@ -9240,9 +9248,6 @@ $(OBJS)\monolib_msgout.obj :  .AUTODEPEND ..\..\src\common\msgout.cpp
 $(OBJS)\monolib_utilscmn.obj :  .AUTODEPEND ..\..\src\common\utilscmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

-$(OBJS)\monolib_evtloop.obj :  .AUTODEPEND ..\..\src\msw\evtloop.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
 $(OBJS)\monolib_main.obj :  .AUTODEPEND ..\..\src\msw\main.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

@@ -9333,6 +9338,9 @@ $(OBJS)\monolib_dirdlg.obj :  .AUTODEPEND ..\..\src\msw\dirdlg.cpp
 $(OBJS)\monolib_dragimag.obj :  .AUTODEPEND ..\..\src\msw\dragimag.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

+$(OBJS)\monolib_evtloop.obj :  .AUTODEPEND ..\..\src\msw\evtloop.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_filedlg.obj :  .AUTODEPEND ..\..\src\msw\filedlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

@@ -11600,6 +11608,9 @@ $(OBJS)\basedll_dir.obj :  .AUTODEPEND ..\..\src\msw\dir.cpp
 $(OBJS)\basedll_dlmsw.obj :  .AUTODEPEND ..\..\src\msw\dlmsw.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<

+$(OBJS)\basedll_evtloopconsole.obj :  .AUTODEPEND ..\..\src\msw\evtloopconsole.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
+
 $(OBJS)\basedll_mimetype.obj :  .AUTODEPEND ..\..\src\msw\mimetype.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<

@@ -11648,9 +11659,6 @@ $(OBJS)\basedll_msgout.obj :  .AUTODEPEND ..\..\src\common\msgout.cpp
 $(OBJS)\basedll_utilscmn.obj :  .AUTODEPEND ..\..\src\common\utilscmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<

-$(OBJS)\basedll_evtloop.obj :  .AUTODEPEND ..\..\src\msw\evtloop.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
 $(OBJS)\basedll_main.obj :  .AUTODEPEND ..\..\src\msw\main.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<

@@ -11939,6 +11947,9 @@ $(OBJS)\baselib_dir.obj :  .AUTODEPEND ..\..\src\msw\dir.cpp
 $(OBJS)\baselib_dlmsw.obj :  .AUTODEPEND ..\..\src\msw\dlmsw.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<

+$(OBJS)\baselib_evtloopconsole.obj :  .AUTODEPEND ..\..\src\msw\evtloopconsole.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
+
 $(OBJS)\baselib_mimetype.obj :  .AUTODEPEND ..\..\src\msw\mimetype.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<

@@ -11987,9 +11998,6 @@ $(OBJS)\baselib_msgout.obj :  .AUTODEPEND ..\..\src\common\msgout.cpp
 $(OBJS)\baselib_utilscmn.obj :  .AUTODEPEND ..\..\src\common\utilscmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<

-$(OBJS)\baselib_evtloop.obj :  .AUTODEPEND ..\..\src\msw\evtloop.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
 $(OBJS)\baselib_main.obj :  .AUTODEPEND ..\..\src\msw\main.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<

@@ -12098,9 +12106,6 @@ $(OBJS)\coredll_msgout.obj :  .AUTODEPEND ..\..\src\common\msgout.cpp
 $(OBJS)\coredll_utilscmn.obj :  .AUTODEPEND ..\..\src\common\utilscmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<

-$(OBJS)\coredll_evtloop.obj :  .AUTODEPEND ..\..\src\msw\evtloop.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
 $(OBJS)\coredll_main.obj :  .AUTODEPEND ..\..\src\msw\main.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<

@@ -12155,6 +12160,9 @@ $(OBJS)\coredll_dirdlg.obj :  .AUTODEPEND ..\..\src\msw\dirdlg.cpp
 $(OBJS)\coredll_dragimag.obj :  .AUTODEPEND ..\..\src\msw\dragimag.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<

+$(OBJS)\coredll_evtloop.obj :  .AUTODEPEND ..\..\src\msw\evtloop.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+
 $(OBJS)\coredll_filedlg.obj :  .AUTODEPEND ..\..\src\msw\filedlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<

@@ -13506,9 +13514,6 @@ $(OBJS)\corelib_msgout.obj :  .AUTODEPEND ..\..\src\common\msgout.cpp
 $(OBJS)\corelib_utilscmn.obj :  .AUTODEPEND ..\..\src\common\utilscmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<

-$(OBJS)\corelib_evtloop.obj :  .AUTODEPEND ..\..\src\msw\evtloop.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
 $(OBJS)\corelib_main.obj :  .AUTODEPEND ..\..\src\msw\main.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<

@@ -13563,6 +13568,9 @@ $(OBJS)\corelib_dirdlg.obj :  .AUTODEPEND ..\..\src\msw\dirdlg.cpp
 $(OBJS)\corelib_dragimag.obj :  .AUTODEPEND ..\..\src\msw\dragimag.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<

+$(OBJS)\corelib_evtloop.obj :  .AUTODEPEND ..\..\src\msw\evtloop.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+
 $(OBJS)\corelib_filedlg.obj :  .AUTODEPEND ..\..\src\msw\filedlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<

--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -635,7 +635,7 @@ SOURCE=..\..\src\msw\dlmsw.cpp
 # End Source File
 # Begin Source File

-SOURCE=..\..\src\msw\evtloop.cpp
+SOURCE=..\..\src\msw\evtloopconsole.cpp
 # End Source File
 # Begin Source File

@@ -916,6 +916,10 @@ SOURCE=..\..\include\wx\msw\debughlp.h
 # End Source File
 # Begin Source File

+SOURCE=..\..\include\wx\msw\evtloopconsole.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\msw\fswatcher.h
 # End Source File
 # Begin Source File
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -1415,6 +1415,37 @@ SOURCE=..\..\src\msw\enhmeta.cpp
 # Begin Source File

 SOURCE=..\..\src\msw\evtloop.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+
+!ENDIF
+
 # End Source File
 # Begin Source File

--- a/build/msw/wx_vc7_base.vcproj
+++ b/build/msw/wx_vc7_base.vcproj
@@ -917,7 +917,7 @@
 				RelativePath="..\..\src\msw\dlmsw.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\msw\evtloop.cpp">
+				RelativePath="..\..\src\msw\evtloopconsole.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\msw\fswatcher.cpp">
@@ -1098,6 +1098,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\debughlp.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\evtloopconsole.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\fswatcher.h">
 			</File>
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -1491,6 +1491,18 @@
 			</File>
 			<File
 				RelativePath="..\..\src\msw\evtloop.cpp">
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\fdrepdlg.cpp">
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -1256,7 +1256,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\evtloop.cpp"
+				RelativePath="..\..\src\msw\evtloopconsole.cpp"
 				>
 			</File>
 			<File
@@ -1494,6 +1494,10 @@
 				RelativePath="..\..\include\wx\msw\debughlp.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\evtloopconsole.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\fswatcher.h"
 				>
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -2022,6 +2022,22 @@
 			<File
 				RelativePath="..\..\src\msw\evtloop.cpp"
 				>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\fdrepdlg.cpp"
--- a/build/msw/wx_vc9_base.vcproj
+++ b/build/msw/wx_vc9_base.vcproj
@@ -1252,7 +1252,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\evtloop.cpp"
+				RelativePath="..\..\src\msw\evtloopconsole.cpp"
 				>
 			</File>
 			<File
@@ -1490,6 +1490,10 @@
 				RelativePath="..\..\include\wx\msw\debughlp.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\evtloopconsole.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\fswatcher.h"
 				>
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -2018,6 +2018,22 @@
 			<File
 				RelativePath="..\..\src\msw\evtloop.cpp"
 				>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\fdrepdlg.cpp"
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -184,7 +184,7 @@ protected:
    wxDECLARE_NO_COPY_CLASS(wxEventLoopBase);
 };

-#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXDFB__) || (defined(__UNIX__) && !defined(__WXOSX__))
+#if defined(__WINDOWS__) || defined(__WXMAC__) || defined(__WXDFB__) || (defined(__UNIX__) && !defined(__WXOSX__))

 // this class can be used to implement a standard event loop logic using
 // Pending() and Dispatch()
@@ -233,10 +233,7 @@ private:
 // integration with MFC) but currently this is not done for all ports yet (e.g.
 // wxX11) so fall back to the old wxGUIEventLoop definition below for them

-#if defined(__WXMSW__)
-    // this header defines both console and GUI loops for MSW
-    #include "wx/msw/evtloop.h"
-#elif defined(__WXOSX__)
+#if defined(__WXOSX__)
    // CoreFoundation-based event loop is currently in wxBase so include it in
    // any case too (although maybe it actually shouldn't be there at all)
    #include "wx/osx/evtloop.h"
@@ -244,7 +241,9 @@ private:

 // include the appropriate header defining wxGUIEventLoop

-#if defined(__WXCOCOA__)
+#if defined(__WXMSW__)
+    #include "wx/msw/evtloop.h"
+#elif defined(__WXCOCOA__)
    #include "wx/cocoa/evtloop.h"
 #elif defined(__WXDFB__)
    #include "wx/dfb/evtloop.h"
@@ -310,6 +309,8 @@ protected:
 // include the header defining wxConsoleEventLoop for Unix systems
 #if defined(__UNIX__) && !defined(__WXMSW__)
 #include "wx/unix/evtloop.h"
+#elif defined(__WINDOWS__)
+#include "wx/msw/evtloopconsole.h"
 #endif

 #if wxUSE_GUI
@@ -319,7 +320,7 @@ protected:
 #else // !wxUSE_GUI
    // we can't define wxEventLoop differently in GUI and base libraries so use
    // a #define to still allow writing wxEventLoop in the user code
-    #if wxUSE_CONSOLE_EVENTLOOP && (defined(__WXMSW__) || defined(__UNIX__))
+    #if wxUSE_CONSOLE_EVENTLOOP && (defined(__WINDOWS__) || defined(__UNIX__))
        #define wxEventLoop wxConsoleEventLoop
    #else // we still must define it somehow for the code below...
        #define wxEventLoop wxEventLoopBase
--- a/include/wx/msw/evtloop.h
+++ b/include/wx/msw/evtloop.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/evtloop.h
-// Purpose:     wxEventLoop class for MSW
+// Purpose:     wxEventLoop class for wxMSW port
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-07-31
@@ -12,36 +12,15 @@
 #ifndef _WX_MSW_EVTLOOP_H_
 #define _WX_MSW_EVTLOOP_H_

-#if wxUSE_GUI
 #include "wx/dynarray.h"
 #include "wx/msw/wrapwin.h"
 #include "wx/window.h"
-#endif
+#include "wx/msw/evtloopconsole.h" // for wxMSWEventLoopBase

 // ----------------------------------------------------------------------------
 // wxEventLoop
 // ----------------------------------------------------------------------------

-class WXDLLIMPEXP_BASE wxMSWEventLoopBase : public wxEventLoopManual
-{
-public:
-    wxMSWEventLoopBase();
-
-    // implement base class pure virtuals
-    virtual bool Pending() const;
-
-protected:
-    // get the next message from queue and return true or return false if we
-    // got WM_QUIT or an error occurred
-    bool GetNextMessage(WXMSG *msg);
-
-    // same as above but with a timeout and return value can be -1 meaning that
-    // time out expired in addition to
-    int GetNextMessageTimeout(WXMSG *msg, unsigned long timeout);
-};
-
-#if wxUSE_GUI
-
 WX_DECLARE_EXPORTED_OBJARRAY(MSG, wxMSGArray);

 class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxMSWEventLoopBase
@@ -93,27 +72,4 @@ private:
    static wxWindowMSW *ms_winCritical;
 };

-#else // !wxUSE_GUI
-
-#if wxUSE_CONSOLE_EVENTLOOP
-
-class WXDLLIMPEXP_BASE wxConsoleEventLoop : public wxMSWEventLoopBase
-{
-public:
-    wxConsoleEventLoop() { }
-
-    // override/implement base class virtuals
-    virtual bool Dispatch();
-    virtual int DispatchTimeout(unsigned long timeout);
-    virtual void WakeUp();
-    virtual bool YieldFor(long WXUNUSED(eventsToProcess)) { return true; }
-
-    // MSW-specific function to process a single message
-    virtual void ProcessMessage(WXMSG *msg);
-};
-
-#endif // wxUSE_CONSOLE_EVENTLOOP
-
-#endif // wxUSE_GUI/!wxUSE_GUI
-
 #endif // _WX_MSW_EVTLOOP_H_
--- a/include/wx/msw/evtloopconsole.h
+++ b/include/wx/msw/evtloopconsole.h
@@ -0,0 +1,52 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msw/evtloopconsole.h
+// Purpose:     wxConsoleEventLoop class for Windows
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     2004-07-31
+// RCS-ID:      $Id$
+// Copyright:   (c) 2003-2004 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MSW_EVTLOOPCONSOLE_H_
+#define _WX_MSW_EVTLOOPCONSOLE_H_
+
+class WXDLLIMPEXP_BASE wxMSWEventLoopBase : public wxEventLoopManual
+{
+public:
+    wxMSWEventLoopBase();
+
+    // implement base class pure virtuals
+    virtual bool Pending() const;
+
+protected:
+    // get the next message from queue and return true or return false if we
+    // got WM_QUIT or an error occurred
+    bool GetNextMessage(WXMSG *msg);
+
+    // same as above but with a timeout and return value can be -1 meaning that
+    // time out expired in addition to
+    int GetNextMessageTimeout(WXMSG *msg, unsigned long timeout);
+};
+
+#if wxUSE_CONSOLE_EVENTLOOP
+
+class WXDLLIMPEXP_BASE wxConsoleEventLoop : public wxMSWEventLoopBase
+{
+public:
+    wxConsoleEventLoop() { }
+
+    // override/implement base class virtuals
+    virtual bool Dispatch();
+    virtual int DispatchTimeout(unsigned long timeout);
+    virtual void WakeUp();
+    virtual bool YieldFor(long WXUNUSED(eventsToProcess)) { return true; }
+
+    // Windows-specific function to process a single message
+    virtual void ProcessMessage(WXMSG *msg);
+};
+
+#endif // wxUSE_CONSOLE_EVENTLOOP
+
+#endif // _WX_MSW_EVTLOOPCONSOLE_H_
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        src/msw/evtloop.cpp
-// Purpose:     implements wxEventLoop for MSW
+// Purpose:     implements wxEventLoop for wxMSW port
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     01.06.01
@@ -27,9 +27,7 @@
 #include "wx/evtloop.h"

 #ifndef WX_PRECOMP
-    #if wxUSE_GUI
-        #include "wx/window.h"
-    #endif
+    #include "wx/window.h"
    #include "wx/app.h"
    #include "wx/log.h"
 #endif //WX_PRECOMP
@@ -39,115 +37,15 @@
 #include "wx/msw/private.h"
 #include "wx/scopeguard.h"

-#if wxUSE_GUI
-    #include "wx/tooltip.h"
-    #if wxUSE_THREADS
-        // define the list of MSG strutures
-        WX_DECLARE_LIST(MSG, wxMsgList);
+#include "wx/tooltip.h"
+#if wxUSE_THREADS
+    // define the list of MSG strutures
+    WX_DECLARE_LIST(MSG, wxMsgList);

-        #include "wx/listimpl.cpp"
+    #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)
-{
-    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;
-}
-
-int wxMSWEventLoopBase::GetNextMessageTimeout(WXMSG *msg, unsigned long timeout)
-{
-    // MsgWaitForMultipleObjects() won't notice any input which was already
-    // examined (e.g. using PeekMessage()) but not yet removed from the queue
-    // so we need to remove any immediately messages manually
-    //
-    // NB: using MsgWaitForMultipleObjectsEx() could simplify the code here but
-    //     it is not available in very old Windows versions
-    if ( !::PeekMessage(msg, 0, 0, 0, PM_REMOVE) )
-    {
-        // we use this function just in order to not block longer than the
-        // given timeout, so we don't pass any handles to it at all
-        DWORD rc = ::MsgWaitForMultipleObjects
-                     (
-                        0, NULL,
-                        FALSE,
-                        timeout,
-                        QS_ALLINPUT
-                     );
-
-        switch ( rc )
-        {
-            default:
-                wxLogDebug("unexpected MsgWaitForMultipleObjects() return "
-                           "value %lu", rc);
-                // fall through
-
-            case WAIT_TIMEOUT:
-                return -1;
-
-            case WAIT_OBJECT_0:
-                if ( !::PeekMessage(msg, 0, 0, 0, PM_REMOVE) )
-                {
-                    // somehow it may happen that MsgWaitForMultipleObjects()
-                    // returns true but there are no messages -- just treat it
-                    // the same as timeout then
-                    return -1;
-                }
-                break;
-        }
-    }
-
-    return msg->message != WM_QUIT;
-}
-
-
-#endif // wxUSE_BASE
-
-#if wxUSE_GUI
+    WX_DEFINE_LIST(wxMsgList)
+#endif // wxUSE_THREADS

 // ============================================================================
 // GUI wxEventLoop implementation
@@ -553,52 +451,3 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)

    return true;
 }
-
-
-#else // !wxUSE_GUI
-
-
-// ============================================================================
-// wxConsoleEventLoop implementation
-// ============================================================================
-
-#if wxUSE_CONSOLE_EVENTLOOP
-
-void wxConsoleEventLoop::WakeUp()
-{
-#if wxUSE_THREADS
-    wxWakeUpMainThread();
-#endif
-}
-
-void wxConsoleEventLoop::ProcessMessage(WXMSG *msg)
-{
-    ::DispatchMessage(msg);
-}
-
-bool wxConsoleEventLoop::Dispatch()
-{
-    MSG msg;
-    if ( !GetNextMessage(&msg) )
-        return false;
-
-    ProcessMessage(&msg);
-
-    return !m_shouldExit;
-}
-
-int wxConsoleEventLoop::DispatchTimeout(unsigned long timeout)
-{
-    MSG msg;
-    int rc = GetNextMessageTimeout(&msg, timeout);
-    if ( rc != 1 )
-        return rc;
-
-    ProcessMessage(&msg);
-
-    return !m_shouldExit;
-}
-
-#endif // wxUSE_CONSOLE_EVENTLOOP
-
-#endif //wxUSE_GUI
--- a/src/msw/evtloopconsole.cpp
+++ b/src/msw/evtloopconsole.cpp
@@ -0,0 +1,161 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/msw/evtloopconsole.cpp
+// Purpose:     wxConsoleEventLoop class for Windows
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     01.06.01
+// RCS-ID:      $Id$
+// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/evtloop.h"
+
+// ============================================================================
+// 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)
+{
+    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;
+}
+
+int wxMSWEventLoopBase::GetNextMessageTimeout(WXMSG *msg, unsigned long timeout)
+{
+    // MsgWaitForMultipleObjects() won't notice any input which was already
+    // examined (e.g. using PeekMessage()) but not yet removed from the queue
+    // so we need to remove any immediately messages manually
+    //
+    // NB: using MsgWaitForMultipleObjectsEx() could simplify the code here but
+    //     it is not available in very old Windows versions
+    if ( !::PeekMessage(msg, 0, 0, 0, PM_REMOVE) )
+    {
+        // we use this function just in order to not block longer than the
+        // given timeout, so we don't pass any handles to it at all
+        DWORD rc = ::MsgWaitForMultipleObjects
+                     (
+                        0, NULL,
+                        FALSE,
+                        timeout,
+                        QS_ALLINPUT
+                     );
+
+        switch ( rc )
+        {
+            default:
+                wxLogDebug("unexpected MsgWaitForMultipleObjects() return "
+                           "value %lu", rc);
+                // fall through
+
+            case WAIT_TIMEOUT:
+                return -1;
+
+            case WAIT_OBJECT_0:
+                if ( !::PeekMessage(msg, 0, 0, 0, PM_REMOVE) )
+                {
+                    // somehow it may happen that MsgWaitForMultipleObjects()
+                    // returns true but there are no messages -- just treat it
+                    // the same as timeout then
+                    return -1;
+                }
+                break;
+        }
+    }
+
+    return msg->message != WM_QUIT;
+}
+
+// ============================================================================
+// wxConsoleEventLoop implementation
+// ============================================================================
+
+#if wxUSE_CONSOLE_EVENTLOOP
+
+void wxConsoleEventLoop::WakeUp()
+{
+#if wxUSE_THREADS
+    wxWakeUpMainThread();
+#endif
+}
+
+void wxConsoleEventLoop::ProcessMessage(WXMSG *msg)
+{
+    ::DispatchMessage(msg);
+}
+
+bool wxConsoleEventLoop::Dispatch()
+{
+    MSG msg;
+    if ( !GetNextMessage(&msg) )
+        return false;
+
+    ProcessMessage(&msg);
+
+    return !m_shouldExit;
+}
+
+int wxConsoleEventLoop::DispatchTimeout(unsigned long timeout)
+{
+    MSG msg;
+    int rc = GetNextMessageTimeout(&msg, timeout);
+    if ( rc != 1 )
+        return rc;
+
+    ProcessMessage(&msg);
+
+    return !m_shouldExit;
+}
+
+#endif // wxUSE_CONSOLE_EVENTLOOP