From f01e6a7efdcd224114a58cea540a36cec1ded705 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 25 Aug 2014 17:47:44 +0000
Subject: [PATCH] Rebake MSW makefiles properly after wxQt merge.

Somehow the makefiles contained references to a non-existing
src/common/textdlg.cpp, fix this by rebaking them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/msw/makefile.bcc | 84 ++++++++++++++++++++++++++++--------------
 build/msw/makefile.gcc | 84 ++++++++++++++++++++++++++++--------------
 build/msw/makefile.vc  | 84 ++++++++++++++++++++++++++++--------------
 3 files changed, 168 insertions(+), 84 deletions(-)

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 3a2dbca8e5..73e2f76cfb 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1986,7 +1986,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_stockitem.obj \
 	$(OBJS)\monodll_tbarbase.obj \
 	$(OBJS)\monodll_textcmn.obj \
-	$(OBJS)\monodll_textdlg.obj \
 	$(OBJS)\monodll_textentrycmn.obj \
 	$(OBJS)\monodll_textmeasurecmn.obj \
 	$(OBJS)\monodll_toplvcmn.obj \
@@ -2028,8 +2027,10 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_srchctlg.obj \
 	$(OBJS)\monodll_statbmpg.obj \
 	$(OBJS)\monodll_stattextg.obj \
+	$(OBJS)\monodll_textdlgg.obj \
 	$(OBJS)\monodll_tipwin.obj \
 	$(OBJS)\monodll_toolbkg.obj \
+	$(OBJS)\monodll_treectlg.obj \
 	$(OBJS)\monodll_treebkg.obj \
 	$(OBJS)\monodll_vlbox.obj \
 	$(OBJS)\monodll_vscroll.obj \
@@ -2260,7 +2261,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_stockitem.obj \
 	$(OBJS)\monodll_tbarbase.obj \
 	$(OBJS)\monodll_textcmn.obj \
-	$(OBJS)\monodll_textdlg.obj \
 	$(OBJS)\monodll_textentrycmn.obj \
 	$(OBJS)\monodll_textmeasurecmn.obj \
 	$(OBJS)\monodll_toplvcmn.obj \
@@ -2302,8 +2302,10 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_srchctlg.obj \
 	$(OBJS)\monodll_statbmpg.obj \
 	$(OBJS)\monodll_stattextg.obj \
+	$(OBJS)\monodll_textdlgg.obj \
 	$(OBJS)\monodll_tipwin.obj \
 	$(OBJS)\monodll_toolbkg.obj \
+	$(OBJS)\monodll_treectlg.obj \
 	$(OBJS)\monodll_treebkg.obj \
 	$(OBJS)\monodll_vlbox.obj \
 	$(OBJS)\monodll_vscroll.obj \
@@ -2792,7 +2794,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_stockitem.obj \
 	$(OBJS)\monolib_tbarbase.obj \
 	$(OBJS)\monolib_textcmn.obj \
-	$(OBJS)\monolib_textdlg.obj \
 	$(OBJS)\monolib_textentrycmn.obj \
 	$(OBJS)\monolib_textmeasurecmn.obj \
 	$(OBJS)\monolib_toplvcmn.obj \
@@ -2834,8 +2835,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_srchctlg.obj \
 	$(OBJS)\monolib_statbmpg.obj \
 	$(OBJS)\monolib_stattextg.obj \
+	$(OBJS)\monolib_textdlgg.obj \
 	$(OBJS)\monolib_tipwin.obj \
 	$(OBJS)\monolib_toolbkg.obj \
+	$(OBJS)\monolib_treectlg.obj \
 	$(OBJS)\monolib_treebkg.obj \
 	$(OBJS)\monolib_vlbox.obj \
 	$(OBJS)\monolib_vscroll.obj \
@@ -3066,7 +3069,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_stockitem.obj \
 	$(OBJS)\monolib_tbarbase.obj \
 	$(OBJS)\monolib_textcmn.obj \
-	$(OBJS)\monolib_textdlg.obj \
 	$(OBJS)\monolib_textentrycmn.obj \
 	$(OBJS)\monolib_textmeasurecmn.obj \
 	$(OBJS)\monolib_toplvcmn.obj \
@@ -3108,8 +3110,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_srchctlg.obj \
 	$(OBJS)\monolib_statbmpg.obj \
 	$(OBJS)\monolib_stattextg.obj \
+	$(OBJS)\monolib_textdlgg.obj \
 	$(OBJS)\monolib_tipwin.obj \
 	$(OBJS)\monolib_toolbkg.obj \
+	$(OBJS)\monolib_treectlg.obj \
 	$(OBJS)\monolib_treebkg.obj \
 	$(OBJS)\monolib_vlbox.obj \
 	$(OBJS)\monolib_vscroll.obj \
@@ -3474,7 +3478,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_stockitem.obj \
 	$(OBJS)\coredll_tbarbase.obj \
 	$(OBJS)\coredll_textcmn.obj \
-	$(OBJS)\coredll_textdlg.obj \
 	$(OBJS)\coredll_textentrycmn.obj \
 	$(OBJS)\coredll_textmeasurecmn.obj \
 	$(OBJS)\coredll_toplvcmn.obj \
@@ -3516,8 +3519,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_srchctlg.obj \
 	$(OBJS)\coredll_statbmpg.obj \
 	$(OBJS)\coredll_stattextg.obj \
+	$(OBJS)\coredll_textdlgg.obj \
 	$(OBJS)\coredll_tipwin.obj \
 	$(OBJS)\coredll_toolbkg.obj \
+	$(OBJS)\coredll_treectlg.obj \
 	$(OBJS)\coredll_treebkg.obj \
 	$(OBJS)\coredll_vlbox.obj \
 	$(OBJS)\coredll_vscroll.obj \
@@ -3748,7 +3753,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_stockitem.obj \
 	$(OBJS)\coredll_tbarbase.obj \
 	$(OBJS)\coredll_textcmn.obj \
-	$(OBJS)\coredll_textdlg.obj \
 	$(OBJS)\coredll_textentrycmn.obj \
 	$(OBJS)\coredll_textmeasurecmn.obj \
 	$(OBJS)\coredll_toplvcmn.obj \
@@ -3790,8 +3794,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_srchctlg.obj \
 	$(OBJS)\coredll_statbmpg.obj \
 	$(OBJS)\coredll_stattextg.obj \
+	$(OBJS)\coredll_textdlgg.obj \
 	$(OBJS)\coredll_tipwin.obj \
 	$(OBJS)\coredll_toolbkg.obj \
+	$(OBJS)\coredll_treectlg.obj \
 	$(OBJS)\coredll_treebkg.obj \
 	$(OBJS)\coredll_vlbox.obj \
 	$(OBJS)\coredll_vscroll.obj \
@@ -4032,7 +4038,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_stockitem.obj \
 	$(OBJS)\corelib_tbarbase.obj \
 	$(OBJS)\corelib_textcmn.obj \
-	$(OBJS)\corelib_textdlg.obj \
 	$(OBJS)\corelib_textentrycmn.obj \
 	$(OBJS)\corelib_textmeasurecmn.obj \
 	$(OBJS)\corelib_toplvcmn.obj \
@@ -4074,8 +4079,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_srchctlg.obj \
 	$(OBJS)\corelib_statbmpg.obj \
 	$(OBJS)\corelib_stattextg.obj \
+	$(OBJS)\corelib_textdlgg.obj \
 	$(OBJS)\corelib_tipwin.obj \
 	$(OBJS)\corelib_toolbkg.obj \
+	$(OBJS)\corelib_treectlg.obj \
 	$(OBJS)\corelib_treebkg.obj \
 	$(OBJS)\corelib_vlbox.obj \
 	$(OBJS)\corelib_vscroll.obj \
@@ -4306,7 +4313,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_stockitem.obj \
 	$(OBJS)\corelib_tbarbase.obj \
 	$(OBJS)\corelib_textcmn.obj \
-	$(OBJS)\corelib_textdlg.obj \
 	$(OBJS)\corelib_textentrycmn.obj \
 	$(OBJS)\corelib_textmeasurecmn.obj \
 	$(OBJS)\corelib_toplvcmn.obj \
@@ -4348,8 +4354,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_srchctlg.obj \
 	$(OBJS)\corelib_statbmpg.obj \
 	$(OBJS)\corelib_stattextg.obj \
+	$(OBJS)\corelib_textdlgg.obj \
 	$(OBJS)\corelib_tipwin.obj \
 	$(OBJS)\corelib_toolbkg.obj \
+	$(OBJS)\corelib_treectlg.obj \
 	$(OBJS)\corelib_treebkg.obj \
 	$(OBJS)\corelib_vlbox.obj \
 	$(OBJS)\corelib_vscroll.obj \
@@ -8260,11 +8268,6 @@ $(OBJS)\monodll_textcmn.obj: ..\..\src\common\textcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textcmn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_textdlg.obj: ..\..\src\common\textdlg.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textdlg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -8470,6 +8473,11 @@ $(OBJS)\monodll_stattextg.obj: ..\..\src\generic\stattextg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_tipwin.obj: ..\..\src\generic\tipwin.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -8480,6 +8488,11 @@ $(OBJS)\monodll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_treebkg.obj: ..\..\src\generic\treebkg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp
@@ -10726,11 +10739,6 @@ $(OBJS)\monolib_textcmn.obj: ..\..\src\common\textcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textcmn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_textdlg.obj: ..\..\src\common\textdlg.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textdlg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -10936,6 +10944,11 @@ $(OBJS)\monolib_stattextg.obj: ..\..\src\generic\stattextg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_tipwin.obj: ..\..\src\generic\tipwin.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -10946,6 +10959,11 @@ $(OBJS)\monolib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_treebkg.obj: ..\..\src\generic\treebkg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp
@@ -13138,11 +13156,6 @@ $(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textcmn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_textdlg.obj: ..\..\src\common\textdlg.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textdlg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -13348,6 +13361,11 @@ $(OBJS)\coredll_stattextg.obj: ..\..\src\generic\stattextg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_tipwin.obj: ..\..\src\generic\tipwin.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -13358,6 +13376,11 @@ $(OBJS)\coredll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_treebkg.obj: ..\..\src\generic\treebkg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp
@@ -14580,11 +14603,6 @@ $(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textcmn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_textdlg.obj: ..\..\src\common\textdlg.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textdlg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -14790,6 +14808,11 @@ $(OBJS)\corelib_stattextg.obj: ..\..\src\generic\stattextg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_tipwin.obj: ..\..\src\generic\tipwin.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -14800,6 +14823,11 @@ $(OBJS)\corelib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_treebkg.obj: ..\..\src\generic\treebkg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 9712780c2e..4b5787b502 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -2005,7 +2005,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_stockitem.o \
 	$(OBJS)\monodll_tbarbase.o \
 	$(OBJS)\monodll_textcmn.o \
-	$(OBJS)\monodll_textdlg.o \
 	$(OBJS)\monodll_textentrycmn.o \
 	$(OBJS)\monodll_textmeasurecmn.o \
 	$(OBJS)\monodll_toplvcmn.o \
@@ -2047,8 +2046,10 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_srchctlg.o \
 	$(OBJS)\monodll_statbmpg.o \
 	$(OBJS)\monodll_stattextg.o \
+	$(OBJS)\monodll_textdlgg.o \
 	$(OBJS)\monodll_tipwin.o \
 	$(OBJS)\monodll_toolbkg.o \
+	$(OBJS)\monodll_treectlg.o \
 	$(OBJS)\monodll_treebkg.o \
 	$(OBJS)\monodll_vlbox.o \
 	$(OBJS)\monodll_vscroll.o \
@@ -2281,7 +2282,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_stockitem.o \
 	$(OBJS)\monodll_tbarbase.o \
 	$(OBJS)\monodll_textcmn.o \
-	$(OBJS)\monodll_textdlg.o \
 	$(OBJS)\monodll_textentrycmn.o \
 	$(OBJS)\monodll_textmeasurecmn.o \
 	$(OBJS)\monodll_toplvcmn.o \
@@ -2323,8 +2323,10 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_srchctlg.o \
 	$(OBJS)\monodll_statbmpg.o \
 	$(OBJS)\monodll_stattextg.o \
+	$(OBJS)\monodll_textdlgg.o \
 	$(OBJS)\monodll_tipwin.o \
 	$(OBJS)\monodll_toolbkg.o \
+	$(OBJS)\monodll_treectlg.o \
 	$(OBJS)\monodll_treebkg.o \
 	$(OBJS)\monodll_vlbox.o \
 	$(OBJS)\monodll_vscroll.o \
@@ -2817,7 +2819,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_stockitem.o \
 	$(OBJS)\monolib_tbarbase.o \
 	$(OBJS)\monolib_textcmn.o \
-	$(OBJS)\monolib_textdlg.o \
 	$(OBJS)\monolib_textentrycmn.o \
 	$(OBJS)\monolib_textmeasurecmn.o \
 	$(OBJS)\monolib_toplvcmn.o \
@@ -2859,8 +2860,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_srchctlg.o \
 	$(OBJS)\monolib_statbmpg.o \
 	$(OBJS)\monolib_stattextg.o \
+	$(OBJS)\monolib_textdlgg.o \
 	$(OBJS)\monolib_tipwin.o \
 	$(OBJS)\monolib_toolbkg.o \
+	$(OBJS)\monolib_treectlg.o \
 	$(OBJS)\monolib_treebkg.o \
 	$(OBJS)\monolib_vlbox.o \
 	$(OBJS)\monolib_vscroll.o \
@@ -3093,7 +3096,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_stockitem.o \
 	$(OBJS)\monolib_tbarbase.o \
 	$(OBJS)\monolib_textcmn.o \
-	$(OBJS)\monolib_textdlg.o \
 	$(OBJS)\monolib_textentrycmn.o \
 	$(OBJS)\monolib_textmeasurecmn.o \
 	$(OBJS)\monolib_toplvcmn.o \
@@ -3135,8 +3137,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_srchctlg.o \
 	$(OBJS)\monolib_statbmpg.o \
 	$(OBJS)\monolib_stattextg.o \
+	$(OBJS)\monolib_textdlgg.o \
 	$(OBJS)\monolib_tipwin.o \
 	$(OBJS)\monolib_toolbkg.o \
+	$(OBJS)\monolib_treectlg.o \
 	$(OBJS)\monolib_treebkg.o \
 	$(OBJS)\monolib_vlbox.o \
 	$(OBJS)\monolib_vscroll.o \
@@ -3515,7 +3519,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_stockitem.o \
 	$(OBJS)\coredll_tbarbase.o \
 	$(OBJS)\coredll_textcmn.o \
-	$(OBJS)\coredll_textdlg.o \
 	$(OBJS)\coredll_textentrycmn.o \
 	$(OBJS)\coredll_textmeasurecmn.o \
 	$(OBJS)\coredll_toplvcmn.o \
@@ -3557,8 +3560,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_srchctlg.o \
 	$(OBJS)\coredll_statbmpg.o \
 	$(OBJS)\coredll_stattextg.o \
+	$(OBJS)\coredll_textdlgg.o \
 	$(OBJS)\coredll_tipwin.o \
 	$(OBJS)\coredll_toolbkg.o \
+	$(OBJS)\coredll_treectlg.o \
 	$(OBJS)\coredll_treebkg.o \
 	$(OBJS)\coredll_vlbox.o \
 	$(OBJS)\coredll_vscroll.o \
@@ -3791,7 +3796,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_stockitem.o \
 	$(OBJS)\coredll_tbarbase.o \
 	$(OBJS)\coredll_textcmn.o \
-	$(OBJS)\coredll_textdlg.o \
 	$(OBJS)\coredll_textentrycmn.o \
 	$(OBJS)\coredll_textmeasurecmn.o \
 	$(OBJS)\coredll_toplvcmn.o \
@@ -3833,8 +3837,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_srchctlg.o \
 	$(OBJS)\coredll_statbmpg.o \
 	$(OBJS)\coredll_stattextg.o \
+	$(OBJS)\coredll_textdlgg.o \
 	$(OBJS)\coredll_tipwin.o \
 	$(OBJS)\coredll_toolbkg.o \
+	$(OBJS)\coredll_treectlg.o \
 	$(OBJS)\coredll_treebkg.o \
 	$(OBJS)\coredll_vlbox.o \
 	$(OBJS)\coredll_vscroll.o \
@@ -4081,7 +4087,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_stockitem.o \
 	$(OBJS)\corelib_tbarbase.o \
 	$(OBJS)\corelib_textcmn.o \
-	$(OBJS)\corelib_textdlg.o \
 	$(OBJS)\corelib_textentrycmn.o \
 	$(OBJS)\corelib_textmeasurecmn.o \
 	$(OBJS)\corelib_toplvcmn.o \
@@ -4123,8 +4128,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_srchctlg.o \
 	$(OBJS)\corelib_statbmpg.o \
 	$(OBJS)\corelib_stattextg.o \
+	$(OBJS)\corelib_textdlgg.o \
 	$(OBJS)\corelib_tipwin.o \
 	$(OBJS)\corelib_toolbkg.o \
+	$(OBJS)\corelib_treectlg.o \
 	$(OBJS)\corelib_treebkg.o \
 	$(OBJS)\corelib_vlbox.o \
 	$(OBJS)\corelib_vscroll.o \
@@ -4357,7 +4364,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_stockitem.o \
 	$(OBJS)\corelib_tbarbase.o \
 	$(OBJS)\corelib_textcmn.o \
-	$(OBJS)\corelib_textdlg.o \
 	$(OBJS)\corelib_textentrycmn.o \
 	$(OBJS)\corelib_textmeasurecmn.o \
 	$(OBJS)\corelib_toplvcmn.o \
@@ -4399,8 +4405,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_srchctlg.o \
 	$(OBJS)\corelib_statbmpg.o \
 	$(OBJS)\corelib_stattextg.o \
+	$(OBJS)\corelib_textdlgg.o \
 	$(OBJS)\corelib_tipwin.o \
 	$(OBJS)\corelib_toolbkg.o \
+	$(OBJS)\corelib_treectlg.o \
 	$(OBJS)\corelib_treebkg.o \
 	$(OBJS)\corelib_vlbox.o \
 	$(OBJS)\corelib_vscroll.o \
@@ -8435,11 +8443,6 @@ $(OBJS)\monodll_textcmn.o: ../../src/common/textcmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_textdlg.o: ../../src/common/textdlg.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_textentrycmn.o: ../../src/common/textentrycmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8645,6 +8648,11 @@ $(OBJS)\monodll_stattextg.o: ../../src/generic/stattextg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_textdlgg.o: ../../src/generic/textdlgg.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_tipwin.o: ../../src/generic/tipwin.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8655,6 +8663,11 @@ $(OBJS)\monodll_toolbkg.o: ../../src/generic/toolbkg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_treectlg.o: ../../src/generic/treectlg.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_treebkg.o: ../../src/generic/treebkg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -10901,11 +10914,6 @@ $(OBJS)\monolib_textcmn.o: ../../src/common/textcmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_textdlg.o: ../../src/common/textdlg.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_textentrycmn.o: ../../src/common/textentrycmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -11111,6 +11119,11 @@ $(OBJS)\monolib_stattextg.o: ../../src/generic/stattextg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_textdlgg.o: ../../src/generic/textdlgg.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_tipwin.o: ../../src/generic/tipwin.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -11121,6 +11134,11 @@ $(OBJS)\monolib_toolbkg.o: ../../src/generic/toolbkg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_treectlg.o: ../../src/generic/treectlg.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_treebkg.o: ../../src/generic/treebkg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -13313,11 +13331,6 @@ $(OBJS)\coredll_textcmn.o: ../../src/common/textcmn.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_textdlg.o: ../../src/common/textdlg.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_textentrycmn.o: ../../src/common/textentrycmn.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13523,6 +13536,11 @@ $(OBJS)\coredll_stattextg.o: ../../src/generic/stattextg.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_textdlgg.o: ../../src/generic/textdlgg.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_tipwin.o: ../../src/generic/tipwin.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13533,6 +13551,11 @@ $(OBJS)\coredll_toolbkg.o: ../../src/generic/toolbkg.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_treectlg.o: ../../src/generic/treectlg.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_treebkg.o: ../../src/generic/treebkg.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -14755,11 +14778,6 @@ $(OBJS)\corelib_textcmn.o: ../../src/common/textcmn.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_textdlg.o: ../../src/common/textdlg.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_textentrycmn.o: ../../src/common/textentrycmn.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -14965,6 +14983,11 @@ $(OBJS)\corelib_stattextg.o: ../../src/generic/stattextg.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_textdlgg.o: ../../src/generic/textdlgg.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_tipwin.o: ../../src/generic/tipwin.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -14975,6 +14998,11 @@ $(OBJS)\corelib_toolbkg.o: ../../src/generic/toolbkg.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_treectlg.o: ../../src/generic/treectlg.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_treebkg.o: ../../src/generic/treebkg.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 5f73088ffc..e5088e4391 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -2286,7 +2286,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_stockitem.obj \
 	$(OBJS)\monodll_tbarbase.obj \
 	$(OBJS)\monodll_textcmn.obj \
-	$(OBJS)\monodll_textdlg.obj \
 	$(OBJS)\monodll_textentrycmn.obj \
 	$(OBJS)\monodll_textmeasurecmn.obj \
 	$(OBJS)\monodll_toplvcmn.obj \
@@ -2328,8 +2327,10 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_srchctlg.obj \
 	$(OBJS)\monodll_statbmpg.obj \
 	$(OBJS)\monodll_stattextg.obj \
+	$(OBJS)\monodll_textdlgg.obj \
 	$(OBJS)\monodll_tipwin.obj \
 	$(OBJS)\monodll_toolbkg.obj \
+	$(OBJS)\monodll_treectlg.obj \
 	$(OBJS)\monodll_treebkg.obj \
 	$(OBJS)\monodll_vlbox.obj \
 	$(OBJS)\monodll_vscroll.obj \
@@ -2560,7 +2561,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_stockitem.obj \
 	$(OBJS)\monodll_tbarbase.obj \
 	$(OBJS)\monodll_textcmn.obj \
-	$(OBJS)\monodll_textdlg.obj \
 	$(OBJS)\monodll_textentrycmn.obj \
 	$(OBJS)\monodll_textmeasurecmn.obj \
 	$(OBJS)\monodll_toplvcmn.obj \
@@ -2602,8 +2602,10 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_srchctlg.obj \
 	$(OBJS)\monodll_statbmpg.obj \
 	$(OBJS)\monodll_stattextg.obj \
+	$(OBJS)\monodll_textdlgg.obj \
 	$(OBJS)\monodll_tipwin.obj \
 	$(OBJS)\monodll_toolbkg.obj \
+	$(OBJS)\monodll_treectlg.obj \
 	$(OBJS)\monodll_treebkg.obj \
 	$(OBJS)\monodll_vlbox.obj \
 	$(OBJS)\monodll_vscroll.obj \
@@ -3098,7 +3100,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_stockitem.obj \
 	$(OBJS)\monolib_tbarbase.obj \
 	$(OBJS)\monolib_textcmn.obj \
-	$(OBJS)\monolib_textdlg.obj \
 	$(OBJS)\monolib_textentrycmn.obj \
 	$(OBJS)\monolib_textmeasurecmn.obj \
 	$(OBJS)\monolib_toplvcmn.obj \
@@ -3140,8 +3141,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_srchctlg.obj \
 	$(OBJS)\monolib_statbmpg.obj \
 	$(OBJS)\monolib_stattextg.obj \
+	$(OBJS)\monolib_textdlgg.obj \
 	$(OBJS)\monolib_tipwin.obj \
 	$(OBJS)\monolib_toolbkg.obj \
+	$(OBJS)\monolib_treectlg.obj \
 	$(OBJS)\monolib_treebkg.obj \
 	$(OBJS)\monolib_vlbox.obj \
 	$(OBJS)\monolib_vscroll.obj \
@@ -3372,7 +3375,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_stockitem.obj \
 	$(OBJS)\monolib_tbarbase.obj \
 	$(OBJS)\monolib_textcmn.obj \
-	$(OBJS)\monolib_textdlg.obj \
 	$(OBJS)\monolib_textentrycmn.obj \
 	$(OBJS)\monolib_textmeasurecmn.obj \
 	$(OBJS)\monolib_toplvcmn.obj \
@@ -3414,8 +3416,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_srchctlg.obj \
 	$(OBJS)\monolib_statbmpg.obj \
 	$(OBJS)\monolib_stattextg.obj \
+	$(OBJS)\monolib_textdlgg.obj \
 	$(OBJS)\monolib_tipwin.obj \
 	$(OBJS)\monolib_toolbkg.obj \
+	$(OBJS)\monolib_treectlg.obj \
 	$(OBJS)\monolib_treebkg.obj \
 	$(OBJS)\monolib_vlbox.obj \
 	$(OBJS)\monolib_vscroll.obj \
@@ -3846,7 +3850,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_stockitem.obj \
 	$(OBJS)\coredll_tbarbase.obj \
 	$(OBJS)\coredll_textcmn.obj \
-	$(OBJS)\coredll_textdlg.obj \
 	$(OBJS)\coredll_textentrycmn.obj \
 	$(OBJS)\coredll_textmeasurecmn.obj \
 	$(OBJS)\coredll_toplvcmn.obj \
@@ -3888,8 +3891,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_srchctlg.obj \
 	$(OBJS)\coredll_statbmpg.obj \
 	$(OBJS)\coredll_stattextg.obj \
+	$(OBJS)\coredll_textdlgg.obj \
 	$(OBJS)\coredll_tipwin.obj \
 	$(OBJS)\coredll_toolbkg.obj \
+	$(OBJS)\coredll_treectlg.obj \
 	$(OBJS)\coredll_treebkg.obj \
 	$(OBJS)\coredll_vlbox.obj \
 	$(OBJS)\coredll_vscroll.obj \
@@ -4120,7 +4125,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_stockitem.obj \
 	$(OBJS)\coredll_tbarbase.obj \
 	$(OBJS)\coredll_textcmn.obj \
-	$(OBJS)\coredll_textdlg.obj \
 	$(OBJS)\coredll_textentrycmn.obj \
 	$(OBJS)\coredll_textmeasurecmn.obj \
 	$(OBJS)\coredll_toplvcmn.obj \
@@ -4162,8 +4166,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_srchctlg.obj \
 	$(OBJS)\coredll_statbmpg.obj \
 	$(OBJS)\coredll_stattextg.obj \
+	$(OBJS)\coredll_textdlgg.obj \
 	$(OBJS)\coredll_tipwin.obj \
 	$(OBJS)\coredll_toolbkg.obj \
+	$(OBJS)\coredll_treectlg.obj \
 	$(OBJS)\coredll_treebkg.obj \
 	$(OBJS)\coredll_vlbox.obj \
 	$(OBJS)\coredll_vscroll.obj \
@@ -4410,7 +4416,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_stockitem.obj \
 	$(OBJS)\corelib_tbarbase.obj \
 	$(OBJS)\corelib_textcmn.obj \
-	$(OBJS)\corelib_textdlg.obj \
 	$(OBJS)\corelib_textentrycmn.obj \
 	$(OBJS)\corelib_textmeasurecmn.obj \
 	$(OBJS)\corelib_toplvcmn.obj \
@@ -4452,8 +4457,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_srchctlg.obj \
 	$(OBJS)\corelib_statbmpg.obj \
 	$(OBJS)\corelib_stattextg.obj \
+	$(OBJS)\corelib_textdlgg.obj \
 	$(OBJS)\corelib_tipwin.obj \
 	$(OBJS)\corelib_toolbkg.obj \
+	$(OBJS)\corelib_treectlg.obj \
 	$(OBJS)\corelib_treebkg.obj \
 	$(OBJS)\corelib_vlbox.obj \
 	$(OBJS)\corelib_vscroll.obj \
@@ -4684,7 +4691,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_stockitem.obj \
 	$(OBJS)\corelib_tbarbase.obj \
 	$(OBJS)\corelib_textcmn.obj \
-	$(OBJS)\corelib_textdlg.obj \
 	$(OBJS)\corelib_textentrycmn.obj \
 	$(OBJS)\corelib_textmeasurecmn.obj \
 	$(OBJS)\corelib_toplvcmn.obj \
@@ -4726,8 +4732,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_srchctlg.obj \
 	$(OBJS)\corelib_statbmpg.obj \
 	$(OBJS)\corelib_stattextg.obj \
+	$(OBJS)\corelib_textdlgg.obj \
 	$(OBJS)\corelib_tipwin.obj \
 	$(OBJS)\corelib_toolbkg.obj \
+	$(OBJS)\corelib_treectlg.obj \
 	$(OBJS)\corelib_treebkg.obj \
 	$(OBJS)\corelib_vlbox.obj \
 	$(OBJS)\corelib_vscroll.obj \
@@ -8952,11 +8960,6 @@ $(OBJS)\monodll_textcmn.obj: ..\..\src\common\textcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textcmn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_textdlg.obj: ..\..\src\common\textdlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textdlg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -9162,6 +9165,11 @@ $(OBJS)\monodll_stattextg.obj: ..\..\src\generic\stattextg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_tipwin.obj: ..\..\src\generic\tipwin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -9172,6 +9180,11 @@ $(OBJS)\monodll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_treebkg.obj: ..\..\src\generic\treebkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp
@@ -11418,11 +11431,6 @@ $(OBJS)\monolib_textcmn.obj: ..\..\src\common\textcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textcmn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_textdlg.obj: ..\..\src\common\textdlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textdlg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -11628,6 +11636,11 @@ $(OBJS)\monolib_stattextg.obj: ..\..\src\generic\stattextg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_tipwin.obj: ..\..\src\generic\tipwin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -11638,6 +11651,11 @@ $(OBJS)\monolib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_treebkg.obj: ..\..\src\generic\treebkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp
@@ -13830,11 +13848,6 @@ $(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textcmn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_textdlg.obj: ..\..\src\common\textdlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textdlg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -14040,6 +14053,11 @@ $(OBJS)\coredll_stattextg.obj: ..\..\src\generic\stattextg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_tipwin.obj: ..\..\src\generic\tipwin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -14050,6 +14068,11 @@ $(OBJS)\coredll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_treebkg.obj: ..\..\src\generic\treebkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp
@@ -15272,11 +15295,6 @@ $(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textcmn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_textdlg.obj: ..\..\src\common\textdlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textdlg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -15482,6 +15500,11 @@ $(OBJS)\corelib_stattextg.obj: ..\..\src\generic\stattextg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_tipwin.obj: ..\..\src\generic\tipwin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -15492,6 +15515,11 @@ $(OBJS)\corelib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_treebkg.obj: ..\..\src\generic\treebkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp