Explicitly include wx/aui/dockart.h from the file needing it.

[wxWidgets.git] / build / msw / makefile.wat

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index b03ef51786c30ada76e64a3f1b1ea38961aff104..283c85f6835c75bb390ac2c730b5a911820978ea 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -91,7 +91,7 @@ EXTRALIBS_FOR_BASE =
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r
 !endif\r
 __monodll___depname =\r
 !ifeq MONOLITHIC 1\r
@@ -818,7 +818,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_richtooltipg.obj &\r
        $(OBJS)\monodll_sashwin.obj &\r
        $(OBJS)\monodll_splash.obj &\r
-       $(OBJS)\monodll_generic_timectrl.obj &\r
+       $(OBJS)\monodll_timectrlg.obj &\r
        $(OBJS)\monodll_tipdlg.obj &\r
        $(OBJS)\monodll_treelist.obj &\r
        $(OBJS)\monodll_wizard.obj &\r
@@ -837,7 +837,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_datectrl.obj &\r
        $(OBJS)\monodll_datetimectrl.obj &\r
        $(OBJS)\monodll_hyperlink.obj &\r
-       $(OBJS)\monodll_msw_timectrl.obj\r
+       $(OBJS)\monodll_timectrl.obj\r
 !endif\r
 !ifeq WXUNIV 1\r
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  &\r
@@ -870,7 +870,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_richtooltipg.obj &\r
        $(OBJS)\monodll_sashwin.obj &\r
        $(OBJS)\monodll_splash.obj &\r
-       $(OBJS)\monodll_generic_timectrl.obj &\r
+       $(OBJS)\monodll_timectrlg.obj &\r
        $(OBJS)\monodll_tipdlg.obj &\r
        $(OBJS)\monodll_treelist.obj &\r
        $(OBJS)\monodll_wizard.obj &\r
@@ -1612,7 +1612,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_richtooltipg.obj &\r
        $(OBJS)\monolib_sashwin.obj &\r
        $(OBJS)\monolib_splash.obj &\r
-       $(OBJS)\monolib_generic_timectrl.obj &\r
+       $(OBJS)\monolib_timectrlg.obj &\r
        $(OBJS)\monolib_tipdlg.obj &\r
        $(OBJS)\monolib_treelist.obj &\r
        $(OBJS)\monolib_wizard.obj &\r
@@ -1631,7 +1631,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_datectrl.obj &\r
        $(OBJS)\monolib_datetimectrl.obj &\r
        $(OBJS)\monolib_hyperlink.obj &\r
-       $(OBJS)\monolib_msw_timectrl.obj\r
+       $(OBJS)\monolib_timectrl.obj\r
 !endif\r
 !ifeq WXUNIV 1\r
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &\r
@@ -1664,7 +1664,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_richtooltipg.obj &\r
        $(OBJS)\monolib_sashwin.obj &\r
        $(OBJS)\monolib_splash.obj &\r
-       $(OBJS)\monolib_generic_timectrl.obj &\r
+       $(OBJS)\monolib_timectrlg.obj &\r
        $(OBJS)\monolib_tipdlg.obj &\r
        $(OBJS)\monolib_treelist.obj &\r
        $(OBJS)\monolib_wizard.obj &\r
@@ -2874,7 +2874,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\advdll_richtooltipg.obj &\r
        $(OBJS)\advdll_sashwin.obj &\r
        $(OBJS)\advdll_splash.obj &\r
-       $(OBJS)\advdll_generic_timectrl.obj &\r
+       $(OBJS)\advdll_timectrlg.obj &\r
        $(OBJS)\advdll_tipdlg.obj &\r
        $(OBJS)\advdll_treelist.obj &\r
        $(OBJS)\advdll_wizard.obj &\r
@@ -2893,7 +2893,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\advdll_datectrl.obj &\r
        $(OBJS)\advdll_datetimectrl.obj &\r
        $(OBJS)\advdll_hyperlink.obj &\r
-       $(OBJS)\advdll_msw_timectrl.obj\r
+       $(OBJS)\advdll_timectrl.obj\r
 !endif\r
 !ifeq WXUNIV 1\r
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &\r
@@ -2926,7 +2926,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\advdll_richtooltipg.obj &\r
        $(OBJS)\advdll_sashwin.obj &\r
        $(OBJS)\advdll_splash.obj &\r
-       $(OBJS)\advdll_generic_timectrl.obj &\r
+       $(OBJS)\advdll_timectrlg.obj &\r
        $(OBJS)\advdll_tipdlg.obj &\r
        $(OBJS)\advdll_treelist.obj &\r
        $(OBJS)\advdll_wizard.obj &\r
@@ -2980,7 +2980,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\advlib_richtooltipg.obj &\r
        $(OBJS)\advlib_sashwin.obj &\r
        $(OBJS)\advlib_splash.obj &\r
-       $(OBJS)\advlib_generic_timectrl.obj &\r
+       $(OBJS)\advlib_timectrlg.obj &\r
        $(OBJS)\advlib_tipdlg.obj &\r
        $(OBJS)\advlib_treelist.obj &\r
        $(OBJS)\advlib_wizard.obj &\r
@@ -2999,7 +2999,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\advlib_datectrl.obj &\r
        $(OBJS)\advlib_datetimectrl.obj &\r
        $(OBJS)\advlib_hyperlink.obj &\r
-       $(OBJS)\advlib_msw_timectrl.obj\r
+       $(OBJS)\advlib_timectrl.obj\r
 !endif\r
 !ifeq WXUNIV 1\r
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &\r
@@ -3032,7 +3032,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\advlib_richtooltipg.obj &\r
        $(OBJS)\advlib_sashwin.obj &\r
        $(OBJS)\advlib_splash.obj &\r
-       $(OBJS)\advlib_generic_timectrl.obj &\r
+       $(OBJS)\advlib_timectrlg.obj &\r
        $(OBJS)\advlib_tipdlg.obj &\r
        $(OBJS)\advlib_treelist.obj &\r
        $(OBJS)\advlib_wizard.obj &\r
@@ -3567,7 +3567,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &\r
        RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
 WX_RELEASE_NODOT = 29\r
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3\r
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4\r
 COMPILER_PREFIX = wat\r
 OBJS = &\r
        $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
@@ -5796,7 +5796,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h :  $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcde
 build_cfg_file : .SYMBOLIC $(SETUPHDIR)\r
        @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)\r
        @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE)\r
-       @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)\r
+       @echo WXVER_RELEASE=4 >>$(BUILD_CFG_FILE)\r
        @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)\r
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)\r
        @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)\r
@@ -7190,7 +7190,7 @@ $(OBJS)\monodll_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
 $(OBJS)\monodll_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\monodll_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp\r
+$(OBJS)\monodll_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
 $(OBJS)\monodll_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp\r
@@ -8831,7 +8831,7 @@ $(OBJS)\monodll_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monodll_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp\r
+$(OBJS)\monodll_timectrlg.obj :  .AUTODEPEND ..\..\src\generic\timectrlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
@@ -9595,7 +9595,7 @@ $(OBJS)\monolib_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
 $(OBJS)\monolib_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\monolib_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp\r
+$(OBJS)\monolib_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
 $(OBJS)\monolib_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp\r
@@ -11236,7 +11236,7 @@ $(OBJS)\monolib_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monolib_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp\r
+$(OBJS)\monolib_timectrlg.obj :  .AUTODEPEND ..\..\src\generic\timectrlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
@@ -14903,7 +14903,7 @@ $(OBJS)\advdll_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
 $(OBJS)\advdll_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\advdll_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp\r
+$(OBJS)\advdll_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
 \r
 $(OBJS)\advdll_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp\r
@@ -14993,7 +14993,7 @@ $(OBJS)\advdll_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
 $(OBJS)\advdll_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\advdll_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp\r
+$(OBJS)\advdll_timectrlg.obj :  .AUTODEPEND ..\..\src\generic\timectrlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
 \r
 $(OBJS)\advdll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp\r
@@ -15053,7 +15053,7 @@ $(OBJS)\advlib_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
 $(OBJS)\advlib_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\advlib_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp\r
+$(OBJS)\advlib_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
 \r
 $(OBJS)\advlib_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp\r
@@ -15143,7 +15143,7 @@ $(OBJS)\advlib_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
 $(OBJS)\advlib_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\advlib_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp\r
+$(OBJS)\advlib_timectrlg.obj :  .AUTODEPEND ..\..\src\generic\timectrlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
 \r
 $(OBJS)\advlib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp\r