Add a public wxModalDialogHook class for intercepting modal dialogs.

Extract wxModalDialogHook from wx/testing.h into its own wx/modalhook.h, extend it to allow to be notified not only about showing modal dialogs but also about dismissing them and document it and show its use in the dialogs sample. Also replace all the WX_TESTING_SHOW_MODAL_HOOK macros occurrences with WX_HOOK_MODAL_DIALOG. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-05-20 13:15:41 +00:00
parent 9bc3af3e64
commit 691745ab41
64 changed files with 712 additions and 194 deletions
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -709,6 +709,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/common/markupparser.cpp
    src/common/matrix.cpp
    src/common/menucmn.cpp
+    src/common/modalhook.cpp
    src/common/mousemanager.cpp
    src/common/nbkbase.cpp
    src/common/overlaycmn.cpp
@@ -867,6 +868,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/listbox.h
    wx/mdi.h
    wx/menu.h
+    wx/modalhook.h
    wx/mousemanager.h
    wx/msgdlg.h
    wx/nativewin.h
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1920,6 +1920,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_markupparser.obj \
 	$(OBJS)\monodll_matrix.obj \
 	$(OBJS)\monodll_menucmn.obj \
+	$(OBJS)\monodll_modalhook.obj \
 	$(OBJS)\monodll_mousemanager.obj \
 	$(OBJS)\monodll_nbkbase.obj \
 	$(OBJS)\monodll_overlaycmn.obj \
@@ -2141,6 +2142,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_markupparser.obj \
 	$(OBJS)\monodll_matrix.obj \
 	$(OBJS)\monodll_menucmn.obj \
+	$(OBJS)\monodll_modalhook.obj \
 	$(OBJS)\monodll_mousemanager.obj \
 	$(OBJS)\monodll_nbkbase.obj \
 	$(OBJS)\monodll_overlaycmn.obj \
@@ -3310,6 +3312,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_markupparser.obj \
 	$(OBJS)\monolib_matrix.obj \
 	$(OBJS)\monolib_menucmn.obj \
+	$(OBJS)\monolib_modalhook.obj \
 	$(OBJS)\monolib_mousemanager.obj \
 	$(OBJS)\monolib_nbkbase.obj \
 	$(OBJS)\monolib_overlaycmn.obj \
@@ -3531,6 +3534,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_markupparser.obj \
 	$(OBJS)\monolib_matrix.obj \
 	$(OBJS)\monolib_menucmn.obj \
+	$(OBJS)\monolib_modalhook.obj \
 	$(OBJS)\monolib_mousemanager.obj \
 	$(OBJS)\monolib_nbkbase.obj \
 	$(OBJS)\monolib_overlaycmn.obj \
@@ -4605,6 +4609,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_markupparser.obj \
 	$(OBJS)\coredll_matrix.obj \
 	$(OBJS)\coredll_menucmn.obj \
+	$(OBJS)\coredll_modalhook.obj \
 	$(OBJS)\coredll_mousemanager.obj \
 	$(OBJS)\coredll_nbkbase.obj \
 	$(OBJS)\coredll_overlaycmn.obj \
@@ -4826,6 +4831,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_markupparser.obj \
 	$(OBJS)\coredll_matrix.obj \
 	$(OBJS)\coredll_menucmn.obj \
+	$(OBJS)\coredll_modalhook.obj \
 	$(OBJS)\coredll_mousemanager.obj \
 	$(OBJS)\coredll_nbkbase.obj \
 	$(OBJS)\coredll_overlaycmn.obj \
@@ -5650,6 +5656,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_markupparser.obj \
 	$(OBJS)\corelib_matrix.obj \
 	$(OBJS)\corelib_menucmn.obj \
+	$(OBJS)\corelib_modalhook.obj \
 	$(OBJS)\corelib_mousemanager.obj \
 	$(OBJS)\corelib_nbkbase.obj \
 	$(OBJS)\corelib_overlaycmn.obj \
@@ -5871,6 +5878,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_markupparser.obj \
 	$(OBJS)\corelib_matrix.obj \
 	$(OBJS)\corelib_menucmn.obj \
+	$(OBJS)\corelib_modalhook.obj \
 	$(OBJS)\corelib_mousemanager.obj \
 	$(OBJS)\corelib_nbkbase.obj \
 	$(OBJS)\corelib_overlaycmn.obj \
@@ -15107,6 +15115,11 @@ $(OBJS)\monodll_menucmn.obj: ..\..\src\common\menucmn.cpp
 !endif

 !if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_modalhook.obj: ..\..\src\common\modalhook.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\modalhook.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_mousemanager.obj: ..\..\src\common\mousemanager.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp
 !endif
@@ -20632,6 +20645,11 @@ $(OBJS)\monolib_menucmn.obj: ..\..\src\common\menucmn.cpp
 !endif

 !if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_modalhook.obj: ..\..\src\common\modalhook.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\modalhook.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_mousemanager.obj: ..\..\src\common\mousemanager.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp
 !endif
@@ -26154,6 +26172,11 @@ $(OBJS)\coredll_menucmn.obj: ..\..\src\common\menucmn.cpp
 !endif

 !if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_modalhook.obj: ..\..\src\common\modalhook.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\modalhook.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_mousemanager.obj: ..\..\src\common\mousemanager.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp
 !endif
@@ -30243,6 +30266,11 @@ $(OBJS)\corelib_menucmn.obj: ..\..\src\common\menucmn.cpp
 !endif

 !if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_modalhook.obj: ..\..\src\common\modalhook.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\modalhook.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_mousemanager.obj: ..\..\src\common\mousemanager.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp
 !endif
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1944,6 +1944,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_markupparser.o \
 	$(OBJS)\monodll_matrix.o \
 	$(OBJS)\monodll_menucmn.o \
+	$(OBJS)\monodll_modalhook.o \
 	$(OBJS)\monodll_mousemanager.o \
 	$(OBJS)\monodll_nbkbase.o \
 	$(OBJS)\monodll_overlaycmn.o \
@@ -2167,6 +2168,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_markupparser.o \
 	$(OBJS)\monodll_matrix.o \
 	$(OBJS)\monodll_menucmn.o \
+	$(OBJS)\monodll_modalhook.o \
 	$(OBJS)\monodll_mousemanager.o \
 	$(OBJS)\monodll_nbkbase.o \
 	$(OBJS)\monodll_overlaycmn.o \
@@ -3354,6 +3356,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_markupparser.o \
 	$(OBJS)\monolib_matrix.o \
 	$(OBJS)\monolib_menucmn.o \
+	$(OBJS)\monolib_modalhook.o \
 	$(OBJS)\monolib_mousemanager.o \
 	$(OBJS)\monolib_nbkbase.o \
 	$(OBJS)\monolib_overlaycmn.o \
@@ -3577,6 +3580,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_markupparser.o \
 	$(OBJS)\monolib_matrix.o \
 	$(OBJS)\monolib_menucmn.o \
+	$(OBJS)\monolib_modalhook.o \
 	$(OBJS)\monolib_mousemanager.o \
 	$(OBJS)\monolib_nbkbase.o \
 	$(OBJS)\monolib_overlaycmn.o \
@@ -4679,6 +4683,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_markupparser.o \
 	$(OBJS)\coredll_matrix.o \
 	$(OBJS)\coredll_menucmn.o \
+	$(OBJS)\coredll_modalhook.o \
 	$(OBJS)\coredll_mousemanager.o \
 	$(OBJS)\coredll_nbkbase.o \
 	$(OBJS)\coredll_overlaycmn.o \
@@ -4902,6 +4907,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_markupparser.o \
 	$(OBJS)\coredll_matrix.o \
 	$(OBJS)\coredll_menucmn.o \
+	$(OBJS)\coredll_modalhook.o \
 	$(OBJS)\coredll_mousemanager.o \
 	$(OBJS)\coredll_nbkbase.o \
 	$(OBJS)\coredll_overlaycmn.o \
@@ -5738,6 +5744,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_markupparser.o \
 	$(OBJS)\corelib_matrix.o \
 	$(OBJS)\corelib_menucmn.o \
+	$(OBJS)\corelib_modalhook.o \
 	$(OBJS)\corelib_mousemanager.o \
 	$(OBJS)\corelib_nbkbase.o \
 	$(OBJS)\corelib_overlaycmn.o \
@@ -5961,6 +5968,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_markupparser.o \
 	$(OBJS)\corelib_matrix.o \
 	$(OBJS)\corelib_menucmn.o \
+	$(OBJS)\corelib_modalhook.o \
 	$(OBJS)\corelib_mousemanager.o \
 	$(OBJS)\corelib_nbkbase.o \
 	$(OBJS)\corelib_overlaycmn.o \
@@ -16617,6 +16625,11 @@ $(OBJS)\monodll_menucmn.o: ../../src/common/menucmn.cpp
 endif

 ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_modalhook.o: ../../src/common/modalhook.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_mousemanager.o: ../../src/common/mousemanager.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
@@ -23586,6 +23599,11 @@ $(OBJS)\monolib_menucmn.o: ../../src/common/menucmn.cpp
 endif

 ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_modalhook.o: ../../src/common/modalhook.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_mousemanager.o: ../../src/common/mousemanager.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
@@ -30552,6 +30570,11 @@ $(OBJS)\coredll_menucmn.o: ../../src/common/menucmn.cpp
 endif

 ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_modalhook.o: ../../src/common/modalhook.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_mousemanager.o: ../../src/common/mousemanager.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
@@ -35859,6 +35882,11 @@ $(OBJS)\corelib_menucmn.o: ../../src/common/menucmn.cpp
 endif

 ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_modalhook.o: ../../src/common/modalhook.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_mousemanager.o: ../../src/common/mousemanager.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -2248,6 +2248,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_markupparser.obj \
 	$(OBJS)\monodll_matrix.obj \
 	$(OBJS)\monodll_menucmn.obj \
+	$(OBJS)\monodll_modalhook.obj \
 	$(OBJS)\monodll_mousemanager.obj \
 	$(OBJS)\monodll_nbkbase.obj \
 	$(OBJS)\monodll_overlaycmn.obj \
@@ -2469,6 +2470,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_markupparser.obj \
 	$(OBJS)\monodll_matrix.obj \
 	$(OBJS)\monodll_menucmn.obj \
+	$(OBJS)\monodll_modalhook.obj \
 	$(OBJS)\monodll_mousemanager.obj \
 	$(OBJS)\monodll_nbkbase.obj \
 	$(OBJS)\monodll_overlaycmn.obj \
@@ -3644,6 +3646,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_markupparser.obj \
 	$(OBJS)\monolib_matrix.obj \
 	$(OBJS)\monolib_menucmn.obj \
+	$(OBJS)\monolib_modalhook.obj \
 	$(OBJS)\monolib_mousemanager.obj \
 	$(OBJS)\monolib_nbkbase.obj \
 	$(OBJS)\monolib_overlaycmn.obj \
@@ -3865,6 +3868,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_markupparser.obj \
 	$(OBJS)\monolib_matrix.obj \
 	$(OBJS)\monolib_menucmn.obj \
+	$(OBJS)\monolib_modalhook.obj \
 	$(OBJS)\monolib_mousemanager.obj \
 	$(OBJS)\monolib_nbkbase.obj \
 	$(OBJS)\monolib_overlaycmn.obj \
@@ -5005,6 +5009,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_markupparser.obj \
 	$(OBJS)\coredll_matrix.obj \
 	$(OBJS)\coredll_menucmn.obj \
+	$(OBJS)\coredll_modalhook.obj \
 	$(OBJS)\coredll_mousemanager.obj \
 	$(OBJS)\coredll_nbkbase.obj \
 	$(OBJS)\coredll_overlaycmn.obj \
@@ -5226,6 +5231,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_markupparser.obj \
 	$(OBJS)\coredll_matrix.obj \
 	$(OBJS)\coredll_menucmn.obj \
+	$(OBJS)\coredll_modalhook.obj \
 	$(OBJS)\coredll_mousemanager.obj \
 	$(OBJS)\coredll_nbkbase.obj \
 	$(OBJS)\coredll_overlaycmn.obj \
@@ -6056,6 +6062,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_markupparser.obj \
 	$(OBJS)\corelib_matrix.obj \
 	$(OBJS)\corelib_menucmn.obj \
+	$(OBJS)\corelib_modalhook.obj \
 	$(OBJS)\corelib_mousemanager.obj \
 	$(OBJS)\corelib_nbkbase.obj \
 	$(OBJS)\corelib_overlaycmn.obj \
@@ -6277,6 +6284,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_markupparser.obj \
 	$(OBJS)\corelib_matrix.obj \
 	$(OBJS)\corelib_menucmn.obj \
+	$(OBJS)\corelib_modalhook.obj \
 	$(OBJS)\corelib_mousemanager.obj \
 	$(OBJS)\corelib_nbkbase.obj \
 	$(OBJS)\corelib_overlaycmn.obj \
@@ -15827,6 +15835,11 @@ $(OBJS)\monodll_menucmn.obj: ..\..\src\common\menucmn.cpp
 !endif

 !if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_modalhook.obj: ..\..\src\common\modalhook.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\modalhook.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_mousemanager.obj: ..\..\src\common\mousemanager.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp
 !endif
@@ -21352,6 +21365,11 @@ $(OBJS)\monolib_menucmn.obj: ..\..\src\common\menucmn.cpp
 !endif

 !if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_modalhook.obj: ..\..\src\common\modalhook.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\modalhook.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_mousemanager.obj: ..\..\src\common\mousemanager.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp
 !endif
@@ -26874,6 +26892,11 @@ $(OBJS)\coredll_menucmn.obj: ..\..\src\common\menucmn.cpp
 !endif

 !if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_modalhook.obj: ..\..\src\common\modalhook.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\modalhook.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_mousemanager.obj: ..\..\src\common\mousemanager.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp
 !endif
@@ -30963,6 +30986,11 @@ $(OBJS)\corelib_menucmn.obj: ..\..\src\common\menucmn.cpp
 !endif

 !if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_modalhook.obj: ..\..\src\common\modalhook.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\modalhook.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_mousemanager.obj: ..\..\src\common\mousemanager.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp
 !endif
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -382,6 +382,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_markupparser.obj &
 	$(OBJS)\monodll_matrix.obj &
 	$(OBJS)\monodll_menucmn.obj &
+	$(OBJS)\monodll_modalhook.obj &
 	$(OBJS)\monodll_mousemanager.obj &
 	$(OBJS)\monodll_nbkbase.obj &
 	$(OBJS)\monodll_overlaycmn.obj &
@@ -605,6 +606,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_markupparser.obj &
 	$(OBJS)\monodll_matrix.obj &
 	$(OBJS)\monodll_menucmn.obj &
+	$(OBJS)\monodll_modalhook.obj &
 	$(OBJS)\monodll_mousemanager.obj &
 	$(OBJS)\monodll_nbkbase.obj &
 	$(OBJS)\monodll_overlaycmn.obj &
@@ -1808,6 +1810,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_markupparser.obj &
 	$(OBJS)\monolib_matrix.obj &
 	$(OBJS)\monolib_menucmn.obj &
+	$(OBJS)\monolib_modalhook.obj &
 	$(OBJS)\monolib_mousemanager.obj &
 	$(OBJS)\monolib_nbkbase.obj &
 	$(OBJS)\monolib_overlaycmn.obj &
@@ -2031,6 +2034,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_markupparser.obj &
 	$(OBJS)\monolib_matrix.obj &
 	$(OBJS)\monolib_menucmn.obj &
+	$(OBJS)\monolib_modalhook.obj &
 	$(OBJS)\monolib_mousemanager.obj &
 	$(OBJS)\monolib_nbkbase.obj &
 	$(OBJS)\monolib_overlaycmn.obj &
@@ -3159,6 +3163,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_markupparser.obj &
 	$(OBJS)\coredll_matrix.obj &
 	$(OBJS)\coredll_menucmn.obj &
+	$(OBJS)\coredll_modalhook.obj &
 	$(OBJS)\coredll_mousemanager.obj &
 	$(OBJS)\coredll_nbkbase.obj &
 	$(OBJS)\coredll_overlaycmn.obj &
@@ -3382,6 +3387,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_markupparser.obj &
 	$(OBJS)\coredll_matrix.obj &
 	$(OBJS)\coredll_menucmn.obj &
+	$(OBJS)\coredll_modalhook.obj &
 	$(OBJS)\coredll_mousemanager.obj &
 	$(OBJS)\coredll_nbkbase.obj &
 	$(OBJS)\coredll_overlaycmn.obj &
@@ -4223,6 +4229,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_markupparser.obj &
 	$(OBJS)\corelib_matrix.obj &
 	$(OBJS)\corelib_menucmn.obj &
+	$(OBJS)\corelib_modalhook.obj &
 	$(OBJS)\corelib_mousemanager.obj &
 	$(OBJS)\corelib_nbkbase.obj &
 	$(OBJS)\corelib_overlaycmn.obj &
@@ -4446,6 +4453,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_markupparser.obj &
 	$(OBJS)\corelib_matrix.obj &
 	$(OBJS)\corelib_menucmn.obj &
+	$(OBJS)\corelib_modalhook.obj &
 	$(OBJS)\corelib_mousemanager.obj &
 	$(OBJS)\corelib_nbkbase.obj &
 	$(OBJS)\corelib_overlaycmn.obj &
@@ -16966,6 +16974,11 @@ $(OBJS)\monodll_menucmn.obj :  .AUTODEPEND ..\..\src\common\menucmn.cpp
 !endif

 !ifeq USE_GUI 1
+$(OBJS)\monodll_modalhook.obj :  .AUTODEPEND ..\..\src\common\modalhook.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
 $(OBJS)\monodll_mousemanager.obj :  .AUTODEPEND ..\..\src\common\mousemanager.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
@@ -23935,6 +23948,11 @@ $(OBJS)\monolib_menucmn.obj :  .AUTODEPEND ..\..\src\common\menucmn.cpp
 !endif

 !ifeq USE_GUI 1
+$(OBJS)\monolib_modalhook.obj :  .AUTODEPEND ..\..\src\common\modalhook.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
 $(OBJS)\monolib_mousemanager.obj :  .AUTODEPEND ..\..\src\common\mousemanager.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
@@ -30901,6 +30919,11 @@ $(OBJS)\coredll_menucmn.obj :  .AUTODEPEND ..\..\src\common\menucmn.cpp
 !endif

 !ifeq USE_GUI 1
+$(OBJS)\coredll_modalhook.obj :  .AUTODEPEND ..\..\src\common\modalhook.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
 $(OBJS)\coredll_mousemanager.obj :  .AUTODEPEND ..\..\src\common\mousemanager.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
@@ -36208,6 +36231,11 @@ $(OBJS)\corelib_menucmn.obj :  .AUTODEPEND ..\..\src\common\menucmn.cpp
 !endif

 !ifeq USE_GUI 1
+$(OBJS)\corelib_modalhook.obj :  .AUTODEPEND ..\..\src\common\modalhook.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
 $(OBJS)\corelib_mousemanager.obj :  .AUTODEPEND ..\..\src\common\mousemanager.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -8,21 +8,21 @@
 CFG=core - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "wx_core.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "wx_core.mak" CFG="core - Win32 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "core - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "core - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "core - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "core - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
+!MESSAGE

 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -478,6 +478,10 @@ SOURCE=..\..\src\common\menucmn.cpp
 # End Source File
 # Begin Source File

+SOURCE=..\..\src\common\modalhook.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\mousemanager.cpp
 # End Source File
 # Begin Source File
@@ -1362,25 +1366,25 @@ SOURCE=..\..\include\wx\univ\setup.h

 !IF  "$(CFG)" == "core - Win32 DLL Release"

-# Begin Custom Build - 
+# Begin Custom Build -

 # End Custom Build

 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

-# Begin Custom Build - 
+# Begin Custom Build -

 # End Custom Build

 !ELSEIF  "$(CFG)" == "core - Win32 Release"

-# Begin Custom Build - 
+# Begin Custom Build -

 # End Custom Build

 !ELSEIF  "$(CFG)" == "core - Win32 Debug"

-# Begin Custom Build - 
+# Begin Custom Build -

 # End Custom Build

@@ -2800,6 +2804,10 @@ SOURCE=..\..\include\wx\minifram.h
 # End Source File
 # Begin Source File

+SOURCE=..\..\include\wx\modalhook.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\mousemanager.h
 # End Source File
 # Begin Source File
@@ -3605,4 +3613,3 @@ SOURCE=..\..\src\xrc\xmlreshandler.cpp
 # End Group
 # End Target
 # End Project
-
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -552,6 +552,9 @@
 			<File
 				RelativePath="..\..\src\common\menucmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\modalhook.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\mousemanager.cpp">
 			</File>
@@ -2285,6 +2288,9 @@
 			<File
 				RelativePath="..\..\include\wx\minifram.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\modalhook.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\mousemanager.h">
 			</File>
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -752,6 +752,10 @@
 				RelativePath="..\..\src\common\menucmn.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\modalhook.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\mousemanager.cpp"
 				>
@@ -3055,6 +3059,10 @@
 				RelativePath="..\..\include\wx\minifram.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\modalhook.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\mousemanager.h"
 				>
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -750,6 +750,10 @@
 				RelativePath="..\..\src\common\menucmn.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\modalhook.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\mousemanager.cpp"
 				>
@@ -3053,6 +3057,10 @@
 				RelativePath="..\..\include\wx\minifram.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\modalhook.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\mousemanager.h"
 				>