Backport r70231 to 2.9.3: Fixed javascript errors in CHM version of the manual. No need to re-spin release, just a helpful fix for generating a more useful CHM manual for 2.9.3.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_9_3@70232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

Makefile.in

@@ -6188,7 +6188,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS =  \
 	monodll_richtooltipg.o \
 	monodll_sashwin.o \
 	monodll_splash.o \
-	monodll_generic_timectrl.o \
+	monodll_timectrlg.o \
 	monodll_tipdlg.o \
 	monodll_treelist.o \
 	monodll_wizard.o \
@@ -6225,7 +6225,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS =  \
 	monodll_richtooltipg.o \
 	monodll_sashwin.o \
 	monodll_splash.o \
-	monodll_generic_timectrl.o \
+	monodll_timectrlg.o \
 	monodll_tipdlg.o \
 	monodll_treelist.o \
 	monodll_wizard.o \
@@ -6249,7 +6249,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS =  \
 	monodll_datectrl.o \
 	monodll_datetimectrl.o \
 	monodll_msw_hyperlink.o \
-	monodll_msw_timectrl.o
+	monodll_timectrl.o
 @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS)
 COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS =  \
 	monodll_animateg.o \
@@ -6260,7 +6260,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS =  \
 	monodll_datectrl.o \
 	monodll_datetimectrl.o \
 	monodll_msw_hyperlink.o \
-	monodll_msw_timectrl.o
+	monodll_timectrl.o
 @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS)
 @COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS = \
 @COND_TOOLKIT_COCOA@	monodll_cocoa_mediactrl.o
@@ -8146,7 +8146,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 =  \
 	monolib_richtooltipg.o \
 	monolib_sashwin.o \
 	monolib_splash.o \
-	monolib_generic_timectrl.o \
+	monolib_timectrlg.o \
 	monolib_tipdlg.o \
 	monolib_treelist.o \
 	monolib_wizard.o \
@@ -8183,7 +8183,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 =  \
 	monolib_richtooltipg.o \
 	monolib_sashwin.o \
 	monolib_splash.o \
-	monolib_generic_timectrl.o \
+	monolib_timectrlg.o \
 	monolib_tipdlg.o \
 	monolib_treelist.o \
 	monolib_wizard.o \
@@ -8207,7 +8207,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 =  \
 	monolib_datectrl.o \
 	monolib_datetimectrl.o \
 	monolib_msw_hyperlink.o \
-	monolib_msw_timectrl.o
+	monolib_timectrl.o
 @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1)
 COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 =  \
 	monolib_animateg.o \
@@ -8218,7 +8218,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 =  \
 	monolib_datectrl.o \
 	monolib_datetimectrl.o \
 	monolib_msw_hyperlink.o \
-	monolib_msw_timectrl.o
+	monolib_timectrl.o
 @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1)
 @COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
 @COND_TOOLKIT_COCOA@	monolib_cocoa_mediactrl.o
@@ -11946,7 +11946,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2 =  \
 	advdll_richtooltipg.o \
 	advdll_sashwin.o \
 	advdll_splash.o \
-	advdll_generic_timectrl.o \
+	advdll_timectrlg.o \
 	advdll_tipdlg.o \
 	advdll_treelist.o \
 	advdll_wizard.o \
@@ -11983,7 +11983,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2 =  \
 	advdll_richtooltipg.o \
 	advdll_sashwin.o \
 	advdll_splash.o \
-	advdll_generic_timectrl.o \
+	advdll_timectrlg.o \
 	advdll_tipdlg.o \
 	advdll_treelist.o \
 	advdll_wizard.o \
@@ -12007,7 +12007,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 =  \
 	advdll_datectrl.o \
 	advdll_datetimectrl.o \
 	advdll_msw_hyperlink.o \
-	advdll_msw_timectrl.o
+	advdll_timectrl.o
 @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2)
 COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 =  \
 	advdll_animateg.o \
@@ -12018,7 +12018,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 =  \
 	advdll_datectrl.o \
 	advdll_datetimectrl.o \
 	advdll_msw_hyperlink.o \
-	advdll_msw_timectrl.o
+	advdll_timectrl.o
 @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2)
 @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_2 \
 @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@	= advdll_sound_sdl.o
@@ -12064,7 +12064,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 =  \
 	advlib_richtooltipg.o \
 	advlib_sashwin.o \
 	advlib_splash.o \
-	advlib_generic_timectrl.o \
+	advlib_timectrlg.o \
 	advlib_tipdlg.o \
 	advlib_treelist.o \
 	advlib_wizard.o \
@@ -12101,7 +12101,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 =  \
 	advlib_richtooltipg.o \
 	advlib_sashwin.o \
 	advlib_splash.o \
-	advlib_generic_timectrl.o \
+	advlib_timectrlg.o \
 	advlib_tipdlg.o \
 	advlib_treelist.o \
 	advlib_wizard.o \
@@ -12125,7 +12125,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 =  \
 	advlib_datectrl.o \
 	advlib_datetimectrl.o \
 	advlib_msw_hyperlink.o \
-	advlib_msw_timectrl.o
+	advlib_timectrl.o
 @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3)
 COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 =  \
 	advlib_animateg.o \
@@ -12136,7 +12136,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 =  \
 	advlib_datectrl.o \
 	advlib_datetimectrl.o \
 	advlib_msw_hyperlink.o \
-	advlib_msw_timectrl.o
+	advlib_timectrl.o
 @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3)
 @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
 @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@	= advlib_sound_sdl.o
@@ -20759,8 +20759,8 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@monodll_splash.o: $(srcdir)/src/generic/splash.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/splash.cpp
 
-@COND_USE_GUI_1@monodll_generic_timectrl.o: $(srcdir)/src/generic/timectrl.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/timectrl.cpp
+@COND_USE_GUI_1@monodll_timectrlg.o: $(srcdir)/src/generic/timectrlg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/timectrlg.cpp
 
 @COND_USE_GUI_1@monodll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tipdlg.cpp
@@ -21032,10 +21032,10 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp
 
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/timectrl.cpp
 
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/timectrl.cpp
 
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONODLL_ODEP)
@@ -26147,8 +26147,8 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@monolib_splash.o: $(srcdir)/src/generic/splash.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/splash.cpp
 
-@COND_USE_GUI_1@monolib_generic_timectrl.o: $(srcdir)/src/generic/timectrl.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/timectrl.cpp
+@COND_USE_GUI_1@monolib_timectrlg.o: $(srcdir)/src/generic/timectrlg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/timectrlg.cpp
 
 @COND_USE_GUI_1@monolib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tipdlg.cpp
@@ -26420,10 +26420,10 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp
 
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/timectrl.cpp
 
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/timectrl.cpp
 
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONOLIB_ODEP)
@@ -35735,8 +35735,8 @@ advdll_sashwin.o: $(srcdir)/src/generic/sashwin.cpp $(ADVDLL_ODEP)
 advdll_splash.o: $(srcdir)/src/generic/splash.cpp $(ADVDLL_ODEP)
 	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/splash.cpp
 
-advdll_generic_timectrl.o: $(srcdir)/src/generic/timectrl.cpp $(ADVDLL_ODEP)
-	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/timectrl.cpp
+advdll_timectrlg.o: $(srcdir)/src/generic/timectrlg.cpp $(ADVDLL_ODEP)
+	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/timectrlg.cpp
 
 advdll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(ADVDLL_ODEP)
 	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/tipdlg.cpp
@@ -36008,10 +36008,10 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_WINCE_WXUNIV_0@advdll_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_WINCE_WXUNIV_0@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp
 
-@COND_TOOLKIT_MSW_WXUNIV_0@advdll_msw_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW_WXUNIV_0@advdll_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_MSW_WXUNIV_0@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/timectrl.cpp
 
-@COND_TOOLKIT_WINCE_WXUNIV_0@advdll_msw_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_WINCE_WXUNIV_0@advdll_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_WINCE_WXUNIV_0@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/timectrl.cpp
 
 advlib_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(ADVLIB_ODEP)
@@ -36122,8 +36122,8 @@ advlib_sashwin.o: $(srcdir)/src/generic/sashwin.cpp $(ADVLIB_ODEP)
 advlib_splash.o: $(srcdir)/src/generic/splash.cpp $(ADVLIB_ODEP)
 	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/splash.cpp
 
-advlib_generic_timectrl.o: $(srcdir)/src/generic/timectrl.cpp $(ADVLIB_ODEP)
-	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/timectrl.cpp
+advlib_timectrlg.o: $(srcdir)/src/generic/timectrlg.cpp $(ADVLIB_ODEP)
+	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/timectrlg.cpp
 
 advlib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(ADVLIB_ODEP)
 	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/tipdlg.cpp
@@ -36395,10 +36395,10 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_WINCE_WXUNIV_0@advlib_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_WINCE_WXUNIV_0@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp
 
-@COND_TOOLKIT_MSW_WXUNIV_0@advlib_msw_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW_WXUNIV_0@advlib_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_MSW_WXUNIV_0@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/timectrl.cpp
 
-@COND_TOOLKIT_WINCE_WXUNIV_0@advlib_msw_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_WINCE_WXUNIV_0@advlib_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_WINCE_WXUNIV_0@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/timectrl.cpp
 
 mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP)

build/bakefiles/files.bkl

@@ -2986,7 +2986,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/richtooltipg.cpp
     src/generic/sashwin.cpp
     src/generic/splash.cpp
-    src/generic/timectrl.cpp
+    src/generic/timectrlg.cpp
     src/generic/tipdlg.cpp
     src/generic/treelist.cpp
     src/generic/wizard.cpp

build/msw/makefile.bcc

@@ -2289,7 +2289,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_richtooltipg.obj \
 	$(OBJS)\monodll_sashwin.obj \
 	$(OBJS)\monodll_splash.obj \
-	$(OBJS)\monodll_generic_timectrl.obj \
+	$(OBJS)\monodll_timectrlg.obj \
 	$(OBJS)\monodll_tipdlg.obj \
 	$(OBJS)\monodll_treelist.obj \
 	$(OBJS)\monodll_wizard.obj \
@@ -2308,7 +2308,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datectrl.obj \
 	$(OBJS)\monodll_datetimectrl.obj \
 	$(OBJS)\monodll_hyperlink.obj \
-	$(OBJS)\monodll_msw_timectrl.obj
+	$(OBJS)\monodll_timectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
@@ -2341,7 +2341,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_richtooltipg.obj \
 	$(OBJS)\monodll_sashwin.obj \
 	$(OBJS)\monodll_splash.obj \
-	$(OBJS)\monodll_generic_timectrl.obj \
+	$(OBJS)\monodll_timectrlg.obj \
 	$(OBJS)\monodll_tipdlg.obj \
 	$(OBJS)\monodll_treelist.obj \
 	$(OBJS)\monodll_wizard.obj \
@@ -3072,7 +3072,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_richtooltipg.obj \
 	$(OBJS)\monolib_sashwin.obj \
 	$(OBJS)\monolib_splash.obj \
-	$(OBJS)\monolib_generic_timectrl.obj \
+	$(OBJS)\monolib_timectrlg.obj \
 	$(OBJS)\monolib_tipdlg.obj \
 	$(OBJS)\monolib_treelist.obj \
 	$(OBJS)\monolib_wizard.obj \
@@ -3091,7 +3091,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datectrl.obj \
 	$(OBJS)\monolib_datetimectrl.obj \
 	$(OBJS)\monolib_hyperlink.obj \
-	$(OBJS)\monolib_msw_timectrl.obj
+	$(OBJS)\monolib_timectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
@@ -3124,7 +3124,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_richtooltipg.obj \
 	$(OBJS)\monolib_sashwin.obj \
 	$(OBJS)\monolib_splash.obj \
-	$(OBJS)\monolib_generic_timectrl.obj \
+	$(OBJS)\monolib_timectrlg.obj \
 	$(OBJS)\monolib_tipdlg.obj \
 	$(OBJS)\monolib_treelist.obj \
 	$(OBJS)\monolib_wizard.obj \
@@ -4290,7 +4290,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_richtooltipg.obj \
 	$(OBJS)\advdll_sashwin.obj \
 	$(OBJS)\advdll_splash.obj \
-	$(OBJS)\advdll_generic_timectrl.obj \
+	$(OBJS)\advdll_timectrlg.obj \
 	$(OBJS)\advdll_tipdlg.obj \
 	$(OBJS)\advdll_treelist.obj \
 	$(OBJS)\advdll_wizard.obj \
@@ -4309,7 +4309,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_datectrl.obj \
 	$(OBJS)\advdll_datetimectrl.obj \
 	$(OBJS)\advdll_hyperlink.obj \
-	$(OBJS)\advdll_msw_timectrl.obj
+	$(OBJS)\advdll_timectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
@@ -4342,7 +4342,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_richtooltipg.obj \
 	$(OBJS)\advdll_sashwin.obj \
 	$(OBJS)\advdll_splash.obj \
-	$(OBJS)\advdll_generic_timectrl.obj \
+	$(OBJS)\advdll_timectrlg.obj \
 	$(OBJS)\advdll_tipdlg.obj \
 	$(OBJS)\advdll_treelist.obj \
 	$(OBJS)\advdll_wizard.obj \
@@ -4390,7 +4390,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_richtooltipg.obj \
 	$(OBJS)\advlib_sashwin.obj \
 	$(OBJS)\advlib_splash.obj \
-	$(OBJS)\advlib_generic_timectrl.obj \
+	$(OBJS)\advlib_timectrlg.obj \
 	$(OBJS)\advlib_tipdlg.obj \
 	$(OBJS)\advlib_treelist.obj \
 	$(OBJS)\advlib_wizard.obj \
@@ -4409,7 +4409,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_datectrl.obj \
 	$(OBJS)\advlib_datetimectrl.obj \
 	$(OBJS)\advlib_hyperlink.obj \
-	$(OBJS)\advlib_msw_timectrl.obj
+	$(OBJS)\advlib_timectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
@@ -4442,7 +4442,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_richtooltipg.obj \
 	$(OBJS)\advlib_sashwin.obj \
 	$(OBJS)\advlib_splash.obj \
-	$(OBJS)\advlib_generic_timectrl.obj \
+	$(OBJS)\advlib_timectrlg.obj \
 	$(OBJS)\advlib_tipdlg.obj \
 	$(OBJS)\advlib_treelist.obj \
 	$(OBJS)\advlib_wizard.obj \
@@ -6751,7 +6751,7 @@ $(OBJS)\monodll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
 $(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
 
-$(OBJS)\monodll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
+$(OBJS)\monodll_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp
 
 $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
@@ -8392,8 +8392,8 @@ $(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp
+$(OBJS)\monodll_timectrlg.obj: ..\..\src\generic\timectrlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\timectrlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -9156,7 +9156,7 @@ $(OBJS)\monolib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
 $(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
 
-$(OBJS)\monolib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
+$(OBJS)\monolib_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp
 
 $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
@@ -10797,8 +10797,8 @@ $(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp
+$(OBJS)\monolib_timectrlg.obj: ..\..\src\generic\timectrlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\timectrlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -14464,7 +14464,7 @@ $(OBJS)\advdll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
 $(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
 
-$(OBJS)\advdll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
+$(OBJS)\advdll_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp
 
 $(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
@@ -14554,8 +14554,8 @@ $(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp
 $(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\splash.cpp
 
-$(OBJS)\advdll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp
+$(OBJS)\advdll_timectrlg.obj: ..\..\src\generic\timectrlg.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\timectrlg.cpp
 
 $(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
@@ -14614,7 +14614,7 @@ $(OBJS)\advlib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
 $(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
 
-$(OBJS)\advlib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
+$(OBJS)\advlib_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp
 
 $(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
@@ -14704,8 +14704,8 @@ $(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp
 $(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\splash.cpp
 
-$(OBJS)\advlib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp
+$(OBJS)\advlib_timectrlg.obj: ..\..\src\generic\timectrlg.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\timectrlg.cpp
 
 $(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp

build/msw/makefile.gcc

@@ -2304,7 +2304,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_richtooltipg.o \
 	$(OBJS)\monodll_sashwin.o \
 	$(OBJS)\monodll_splash.o \
-	$(OBJS)\monodll_generic_timectrl.o \
+	$(OBJS)\monodll_timectrlg.o \
 	$(OBJS)\monodll_tipdlg.o \
 	$(OBJS)\monodll_treelist.o \
 	$(OBJS)\monodll_wizard.o \
@@ -2323,7 +2323,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datectrl.o \
 	$(OBJS)\monodll_datetimectrl.o \
 	$(OBJS)\monodll_hyperlink.o \
-	$(OBJS)\monodll_msw_timectrl.o
+	$(OBJS)\monodll_timectrl.o
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
@@ -2356,7 +2356,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_richtooltipg.o \
 	$(OBJS)\monodll_sashwin.o \
 	$(OBJS)\monodll_splash.o \
-	$(OBJS)\monodll_generic_timectrl.o \
+	$(OBJS)\monodll_timectrlg.o \
 	$(OBJS)\monodll_tipdlg.o \
 	$(OBJS)\monodll_treelist.o \
 	$(OBJS)\monodll_wizard.o \
@@ -3093,7 +3093,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_richtooltipg.o \
 	$(OBJS)\monolib_sashwin.o \
 	$(OBJS)\monolib_splash.o \
-	$(OBJS)\monolib_generic_timectrl.o \
+	$(OBJS)\monolib_timectrlg.o \
 	$(OBJS)\monolib_tipdlg.o \
 	$(OBJS)\monolib_treelist.o \
 	$(OBJS)\monolib_wizard.o \
@@ -3112,7 +3112,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datectrl.o \
 	$(OBJS)\monolib_datetimectrl.o \
 	$(OBJS)\monolib_hyperlink.o \
-	$(OBJS)\monolib_msw_timectrl.o
+	$(OBJS)\monolib_timectrl.o
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
@@ -3145,7 +3145,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_richtooltipg.o \
 	$(OBJS)\monolib_sashwin.o \
 	$(OBJS)\monolib_splash.o \
-	$(OBJS)\monolib_generic_timectrl.o \
+	$(OBJS)\monolib_timectrlg.o \
 	$(OBJS)\monolib_tipdlg.o \
 	$(OBJS)\monolib_treelist.o \
 	$(OBJS)\monolib_wizard.o \
@@ -4339,7 +4339,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_richtooltipg.o \
 	$(OBJS)\advdll_sashwin.o \
 	$(OBJS)\advdll_splash.o \
-	$(OBJS)\advdll_generic_timectrl.o \
+	$(OBJS)\advdll_timectrlg.o \
 	$(OBJS)\advdll_tipdlg.o \
 	$(OBJS)\advdll_treelist.o \
 	$(OBJS)\advdll_wizard.o \
@@ -4358,7 +4358,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_datectrl.o \
 	$(OBJS)\advdll_datetimectrl.o \
 	$(OBJS)\advdll_hyperlink.o \
-	$(OBJS)\advdll_msw_timectrl.o
+	$(OBJS)\advdll_timectrl.o
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
@@ -4391,7 +4391,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_richtooltipg.o \
 	$(OBJS)\advdll_sashwin.o \
 	$(OBJS)\advdll_splash.o \
-	$(OBJS)\advdll_generic_timectrl.o \
+	$(OBJS)\advdll_timectrlg.o \
 	$(OBJS)\advdll_tipdlg.o \
 	$(OBJS)\advdll_treelist.o \
 	$(OBJS)\advdll_wizard.o \
@@ -4443,7 +4443,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_richtooltipg.o \
 	$(OBJS)\advlib_sashwin.o \
 	$(OBJS)\advlib_splash.o \
-	$(OBJS)\advlib_generic_timectrl.o \
+	$(OBJS)\advlib_timectrlg.o \
 	$(OBJS)\advlib_tipdlg.o \
 	$(OBJS)\advlib_treelist.o \
 	$(OBJS)\advlib_wizard.o \
@@ -4462,7 +4462,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_datectrl.o \
 	$(OBJS)\advlib_datetimectrl.o \
 	$(OBJS)\advlib_hyperlink.o \
-	$(OBJS)\advlib_msw_timectrl.o
+	$(OBJS)\advlib_timectrl.o
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
@@ -4495,7 +4495,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_richtooltipg.o \
 	$(OBJS)\advlib_sashwin.o \
 	$(OBJS)\advlib_splash.o \
-	$(OBJS)\advlib_generic_timectrl.o \
+	$(OBJS)\advlib_timectrlg.o \
 	$(OBJS)\advlib_tipdlg.o \
 	$(OBJS)\advlib_treelist.o \
 	$(OBJS)\advlib_wizard.o \
@@ -6919,7 +6919,7 @@ $(OBJS)\monodll_datetimectrl.o: ../../src/msw/datetimectrl.cpp
 $(OBJS)\monodll_hyperlink.o: ../../src/msw/hyperlink.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monodll_msw_timectrl.o: ../../src/msw/timectrl.cpp
+$(OBJS)\monodll_timectrl.o: ../../src/msw/timectrl.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\monodll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
@@ -8560,7 +8560,7 @@ $(OBJS)\monodll_splash.o: ../../src/generic/splash.cpp
 endif
 
 ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_generic_timectrl.o: ../../src/generic/timectrl.cpp
+$(OBJS)\monodll_timectrlg.o: ../../src/generic/timectrlg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
@@ -9324,7 +9324,7 @@ $(OBJS)\monolib_datetimectrl.o: ../../src/msw/datetimectrl.cpp
 $(OBJS)\monolib_hyperlink.o: ../../src/msw/hyperlink.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monolib_msw_timectrl.o: ../../src/msw/timectrl.cpp
+$(OBJS)\monolib_timectrl.o: ../../src/msw/timectrl.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\monolib_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
@@ -10965,7 +10965,7 @@ $(OBJS)\monolib_splash.o: ../../src/generic/splash.cpp
 endif
 
 ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_generic_timectrl.o: ../../src/generic/timectrl.cpp
+$(OBJS)\monolib_timectrlg.o: ../../src/generic/timectrlg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
@@ -14632,7 +14632,7 @@ $(OBJS)\advdll_datetimectrl.o: ../../src/msw/datetimectrl.cpp
 $(OBJS)\advdll_hyperlink.o: ../../src/msw/hyperlink.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\advdll_msw_timectrl.o: ../../src/msw/timectrl.cpp
+$(OBJS)\advdll_timectrl.o: ../../src/msw/timectrl.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\advdll_animatecmn.o: ../../src/common/animatecmn.cpp
@@ -14722,7 +14722,7 @@ $(OBJS)\advdll_sashwin.o: ../../src/generic/sashwin.cpp
 $(OBJS)\advdll_splash.o: ../../src/generic/splash.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\advdll_generic_timectrl.o: ../../src/generic/timectrl.cpp
+$(OBJS)\advdll_timectrlg.o: ../../src/generic/timectrlg.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\advdll_tipdlg.o: ../../src/generic/tipdlg.cpp
@@ -14782,7 +14782,7 @@ $(OBJS)\advlib_datetimectrl.o: ../../src/msw/datetimectrl.cpp
 $(OBJS)\advlib_hyperlink.o: ../../src/msw/hyperlink.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\advlib_msw_timectrl.o: ../../src/msw/timectrl.cpp
+$(OBJS)\advlib_timectrl.o: ../../src/msw/timectrl.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\advlib_animatecmn.o: ../../src/common/animatecmn.cpp
@@ -14872,7 +14872,7 @@ $(OBJS)\advlib_sashwin.o: ../../src/generic/sashwin.cpp
 $(OBJS)\advlib_splash.o: ../../src/generic/splash.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\advlib_generic_timectrl.o: ../../src/generic/timectrl.cpp
+$(OBJS)\advlib_timectrlg.o: ../../src/generic/timectrlg.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\advlib_tipdlg.o: ../../src/generic/tipdlg.cpp

build/msw/makefile.vc

@@ -2503,7 +2503,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_richtooltipg.obj \
 	$(OBJS)\monodll_sashwin.obj \
 	$(OBJS)\monodll_splash.obj \
-	$(OBJS)\monodll_generic_timectrl.obj \
+	$(OBJS)\monodll_timectrlg.obj \
 	$(OBJS)\monodll_tipdlg.obj \
 	$(OBJS)\monodll_treelist.obj \
 	$(OBJS)\monodll_wizard.obj \
@@ -2522,7 +2522,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datectrl.obj \
 	$(OBJS)\monodll_datetimectrl.obj \
 	$(OBJS)\monodll_hyperlink.obj \
-	$(OBJS)\monodll_msw_timectrl.obj
+	$(OBJS)\monodll_timectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
@@ -2555,7 +2555,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_richtooltipg.obj \
 	$(OBJS)\monodll_sashwin.obj \
 	$(OBJS)\monodll_splash.obj \
-	$(OBJS)\monodll_generic_timectrl.obj \
+	$(OBJS)\monodll_timectrlg.obj \
 	$(OBJS)\monodll_tipdlg.obj \
 	$(OBJS)\monodll_treelist.obj \
 	$(OBJS)\monodll_wizard.obj \
@@ -3292,7 +3292,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_richtooltipg.obj \
 	$(OBJS)\monolib_sashwin.obj \
 	$(OBJS)\monolib_splash.obj \
-	$(OBJS)\monolib_generic_timectrl.obj \
+	$(OBJS)\monolib_timectrlg.obj \
 	$(OBJS)\monolib_tipdlg.obj \
 	$(OBJS)\monolib_treelist.obj \
 	$(OBJS)\monolib_wizard.obj \
@@ -3311,7 +3311,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datectrl.obj \
 	$(OBJS)\monolib_datetimectrl.obj \
 	$(OBJS)\monolib_hyperlink.obj \
-	$(OBJS)\monolib_msw_timectrl.obj
+	$(OBJS)\monolib_timectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
@@ -3344,7 +3344,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_richtooltipg.obj \
 	$(OBJS)\monolib_sashwin.obj \
 	$(OBJS)\monolib_splash.obj \
-	$(OBJS)\monolib_generic_timectrl.obj \
+	$(OBJS)\monolib_timectrlg.obj \
 	$(OBJS)\monolib_tipdlg.obj \
 	$(OBJS)\monolib_treelist.obj \
 	$(OBJS)\monolib_wizard.obj \
@@ -4600,7 +4600,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_richtooltipg.obj \
 	$(OBJS)\advdll_sashwin.obj \
 	$(OBJS)\advdll_splash.obj \
-	$(OBJS)\advdll_generic_timectrl.obj \
+	$(OBJS)\advdll_timectrlg.obj \
 	$(OBJS)\advdll_tipdlg.obj \
 	$(OBJS)\advdll_treelist.obj \
 	$(OBJS)\advdll_wizard.obj \
@@ -4619,7 +4619,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_datectrl.obj \
 	$(OBJS)\advdll_datetimectrl.obj \
 	$(OBJS)\advdll_hyperlink.obj \
-	$(OBJS)\advdll_msw_timectrl.obj
+	$(OBJS)\advdll_timectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
@@ -4652,7 +4652,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_richtooltipg.obj \
 	$(OBJS)\advdll_sashwin.obj \
 	$(OBJS)\advdll_splash.obj \
-	$(OBJS)\advdll_generic_timectrl.obj \
+	$(OBJS)\advdll_timectrlg.obj \
 	$(OBJS)\advdll_tipdlg.obj \
 	$(OBJS)\advdll_treelist.obj \
 	$(OBJS)\advdll_wizard.obj \
@@ -4706,7 +4706,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_richtooltipg.obj \
 	$(OBJS)\advlib_sashwin.obj \
 	$(OBJS)\advlib_splash.obj \
-	$(OBJS)\advlib_generic_timectrl.obj \
+	$(OBJS)\advlib_timectrlg.obj \
 	$(OBJS)\advlib_tipdlg.obj \
 	$(OBJS)\advlib_treelist.obj \
 	$(OBJS)\advlib_wizard.obj \
@@ -4725,7 +4725,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_datectrl.obj \
 	$(OBJS)\advlib_datetimectrl.obj \
 	$(OBJS)\advlib_hyperlink.obj \
-	$(OBJS)\advlib_msw_timectrl.obj
+	$(OBJS)\advlib_timectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
@@ -4758,7 +4758,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_richtooltipg.obj \
 	$(OBJS)\advlib_sashwin.obj \
 	$(OBJS)\advlib_splash.obj \
-	$(OBJS)\advlib_generic_timectrl.obj \
+	$(OBJS)\advlib_timectrlg.obj \
 	$(OBJS)\advlib_tipdlg.obj \
 	$(OBJS)\advlib_treelist.obj \
 	$(OBJS)\advlib_wizard.obj \
@@ -7357,7 +7357,7 @@ $(OBJS)\monodll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
 $(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
 
-$(OBJS)\monodll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
+$(OBJS)\monodll_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp
 
 $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
@@ -8998,8 +8998,8 @@ $(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp
+$(OBJS)\monodll_timectrlg.obj: ..\..\src\generic\timectrlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\timectrlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -9762,7 +9762,7 @@ $(OBJS)\monolib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
 $(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
 
-$(OBJS)\monolib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
+$(OBJS)\monolib_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp
 
 $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
@@ -11403,8 +11403,8 @@ $(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp
+$(OBJS)\monolib_timectrlg.obj: ..\..\src\generic\timectrlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\timectrlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -15070,7 +15070,7 @@ $(OBJS)\advdll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
 $(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
 
-$(OBJS)\advdll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
+$(OBJS)\advdll_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp
 
 $(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
@@ -15160,8 +15160,8 @@ $(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp
 $(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\splash.cpp
 
-$(OBJS)\advdll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp
+$(OBJS)\advdll_timectrlg.obj: ..\..\src\generic\timectrlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\timectrlg.cpp
 
 $(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
@@ -15220,7 +15220,7 @@ $(OBJS)\advlib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
 $(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
 
-$(OBJS)\advlib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
+$(OBJS)\advlib_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp
 
 $(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
@@ -15310,8 +15310,8 @@ $(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp
 $(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\splash.cpp
 
-$(OBJS)\advlib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp
+$(OBJS)\advlib_timectrlg.obj: ..\..\src\generic\timectrlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\timectrlg.cpp
 
 $(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp

build/msw/makefile.wat

@@ -818,7 +818,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_richtooltipg.obj &
 	$(OBJS)\monodll_sashwin.obj &
 	$(OBJS)\monodll_splash.obj &
-	$(OBJS)\monodll_generic_timectrl.obj &
+	$(OBJS)\monodll_timectrlg.obj &
 	$(OBJS)\monodll_tipdlg.obj &
 	$(OBJS)\monodll_treelist.obj &
 	$(OBJS)\monodll_wizard.obj &
@@ -837,7 +837,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_datectrl.obj &
 	$(OBJS)\monodll_datetimectrl.obj &
 	$(OBJS)\monodll_hyperlink.obj &
-	$(OBJS)\monodll_msw_timectrl.obj
+	$(OBJS)\monodll_timectrl.obj
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
@@ -870,7 +870,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_richtooltipg.obj &
 	$(OBJS)\monodll_sashwin.obj &
 	$(OBJS)\monodll_splash.obj &
-	$(OBJS)\monodll_generic_timectrl.obj &
+	$(OBJS)\monodll_timectrlg.obj &
 	$(OBJS)\monodll_tipdlg.obj &
 	$(OBJS)\monodll_treelist.obj &
 	$(OBJS)\monodll_wizard.obj &
@@ -1612,7 +1612,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_richtooltipg.obj &
 	$(OBJS)\monolib_sashwin.obj &
 	$(OBJS)\monolib_splash.obj &
-	$(OBJS)\monolib_generic_timectrl.obj &
+	$(OBJS)\monolib_timectrlg.obj &
 	$(OBJS)\monolib_tipdlg.obj &
 	$(OBJS)\monolib_treelist.obj &
 	$(OBJS)\monolib_wizard.obj &
@@ -1631,7 +1631,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_datectrl.obj &
 	$(OBJS)\monolib_datetimectrl.obj &
 	$(OBJS)\monolib_hyperlink.obj &
-	$(OBJS)\monolib_msw_timectrl.obj
+	$(OBJS)\monolib_timectrl.obj
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
@@ -1664,7 +1664,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_richtooltipg.obj &
 	$(OBJS)\monolib_sashwin.obj &
 	$(OBJS)\monolib_splash.obj &
-	$(OBJS)\monolib_generic_timectrl.obj &
+	$(OBJS)\monolib_timectrlg.obj &
 	$(OBJS)\monolib_tipdlg.obj &
 	$(OBJS)\monolib_treelist.obj &
 	$(OBJS)\monolib_wizard.obj &
@@ -2874,7 +2874,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\advdll_richtooltipg.obj &
 	$(OBJS)\advdll_sashwin.obj &
 	$(OBJS)\advdll_splash.obj &
-	$(OBJS)\advdll_generic_timectrl.obj &
+	$(OBJS)\advdll_timectrlg.obj &
 	$(OBJS)\advdll_tipdlg.obj &
 	$(OBJS)\advdll_treelist.obj &
 	$(OBJS)\advdll_wizard.obj &
@@ -2893,7 +2893,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\advdll_datectrl.obj &
 	$(OBJS)\advdll_datetimectrl.obj &
 	$(OBJS)\advdll_hyperlink.obj &
-	$(OBJS)\advdll_msw_timectrl.obj
+	$(OBJS)\advdll_timectrl.obj
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
@@ -2926,7 +2926,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\advdll_richtooltipg.obj &
 	$(OBJS)\advdll_sashwin.obj &
 	$(OBJS)\advdll_splash.obj &
-	$(OBJS)\advdll_generic_timectrl.obj &
+	$(OBJS)\advdll_timectrlg.obj &
 	$(OBJS)\advdll_tipdlg.obj &
 	$(OBJS)\advdll_treelist.obj &
 	$(OBJS)\advdll_wizard.obj &
@@ -2980,7 +2980,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\advlib_richtooltipg.obj &
 	$(OBJS)\advlib_sashwin.obj &
 	$(OBJS)\advlib_splash.obj &
-	$(OBJS)\advlib_generic_timectrl.obj &
+	$(OBJS)\advlib_timectrlg.obj &
 	$(OBJS)\advlib_tipdlg.obj &
 	$(OBJS)\advlib_treelist.obj &
 	$(OBJS)\advlib_wizard.obj &
@@ -2999,7 +2999,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\advlib_datectrl.obj &
 	$(OBJS)\advlib_datetimectrl.obj &
 	$(OBJS)\advlib_hyperlink.obj &
-	$(OBJS)\advlib_msw_timectrl.obj
+	$(OBJS)\advlib_timectrl.obj
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
@@ -3032,7 +3032,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\advlib_richtooltipg.obj &
 	$(OBJS)\advlib_sashwin.obj &
 	$(OBJS)\advlib_splash.obj &
-	$(OBJS)\advlib_generic_timectrl.obj &
+	$(OBJS)\advlib_timectrlg.obj &
 	$(OBJS)\advlib_tipdlg.obj &
 	$(OBJS)\advlib_treelist.obj &
 	$(OBJS)\advlib_wizard.obj &
@@ -7190,7 +7190,7 @@ $(OBJS)\monodll_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
 $(OBJS)\monodll_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
+$(OBJS)\monodll_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
@@ -8831,7 +8831,7 @@ $(OBJS)\monodll_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
 !endif
 
 !ifeq USE_GUI 1
-$(OBJS)\monodll_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp
+$(OBJS)\monodll_timectrlg.obj :  .AUTODEPEND ..\..\src\generic\timectrlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
@@ -9595,7 +9595,7 @@ $(OBJS)\monolib_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
 $(OBJS)\monolib_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
+$(OBJS)\monolib_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
@@ -11236,7 +11236,7 @@ $(OBJS)\monolib_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
 !endif
 
 !ifeq USE_GUI 1
-$(OBJS)\monolib_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp
+$(OBJS)\monolib_timectrlg.obj :  .AUTODEPEND ..\..\src\generic\timectrlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
@@ -14903,7 +14903,7 @@ $(OBJS)\advdll_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
 $(OBJS)\advdll_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
-$(OBJS)\advdll_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
+$(OBJS)\advdll_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
 $(OBJS)\advdll_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
@@ -14993,7 +14993,7 @@ $(OBJS)\advdll_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
 $(OBJS)\advdll_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
-$(OBJS)\advdll_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp
+$(OBJS)\advdll_timectrlg.obj :  .AUTODEPEND ..\..\src\generic\timectrlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
 $(OBJS)\advdll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
@@ -15053,7 +15053,7 @@ $(OBJS)\advlib_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
 $(OBJS)\advlib_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
-$(OBJS)\advlib_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
+$(OBJS)\advlib_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
 $(OBJS)\advlib_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
@@ -15143,7 +15143,7 @@ $(OBJS)\advlib_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
 $(OBJS)\advlib_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
-$(OBJS)\advlib_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp
+$(OBJS)\advlib_timectrlg.obj :  .AUTODEPEND ..\..\src\generic\timectrlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
 $(OBJS)\advlib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp

build/msw/wx_adv.dsp

@@ -721,7 +721,7 @@ SOURCE=..\..\src\generic\splash.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\timectrl.cpp
+SOURCE=..\..\src\generic\timectrlg.cpp
 # End Source File
 # Begin Source File
 

build/msw/wx_vc7_adv.vcproj

@@ -735,36 +735,12 @@
 			</File>
 			<File
 				RelativePath="..\..\src\msw\timectrl.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\adv\msw_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu\adv\msw_timectrl.obj"/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="DLL Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll\adv\msw_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll\adv\msw_timectrl.obj"/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
@@ -858,55 +834,7 @@
 				RelativePath="..\..\src\generic\splash.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\generic\timectrl.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\adv\generic_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu\adv\generic_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivud\adv\generic_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivu\adv\generic_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll\adv\generic_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll\adv\generic_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivuddll\adv\generic_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivudll\adv\generic_timectrl.obj"/>
-				</FileConfiguration>
+				RelativePath="..\..\src\generic\timectrlg.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\generic\tipdlg.cpp">

build/msw/wx_vc8_adv.vcproj

@@ -1014,22 +1014,6 @@
 			<File
 				RelativePath="..\..\src\msw\timectrl.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\adv\msw_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu\adv\msw_timectrl.obj"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
@@ -1038,22 +1022,6 @@
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll\adv\msw_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll\adv\msw_timectrl.obj"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
@@ -1177,72 +1145,8 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\generic\timectrl.cpp"
+				RelativePath="..\..\src\generic\timectrlg.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivud\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivu\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivuddll\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivudll\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\tipdlg.cpp"

build/msw/wx_vc9_adv.vcproj

@@ -1010,22 +1010,6 @@
 			<File
 				RelativePath="..\..\src\msw\timectrl.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\adv\msw_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu\adv\msw_timectrl.obj"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
@@ -1034,22 +1018,6 @@
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll\adv\msw_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll\adv\msw_timectrl.obj"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
@@ -1173,72 +1141,8 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\generic\timectrl.cpp"
+				RelativePath="..\..\src\generic\timectrlg.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivud\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivu\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivuddll\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivudll\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\tipdlg.cpp"

build/osx/wxcarbon.xcodeproj/project.pbxproj

@@ -309,8 +309,6 @@
 		2DF74933A90E34129F1BEF73 /* dnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA72410F615B3A78A6340532 /* dnd_osx.cpp */; };
 		2E4747E0736B30569ACD5422 /* textbuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 701B84EE7C043B539FF5195A /* textbuf.cpp */; };
 		2E4747E0736B30569ACD5423 /* textbuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 701B84EE7C043B539FF5195A /* textbuf.cpp */; };
-		2E80D643C6B43AAFB7EFF14D /* timectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D05DAB233D8538A484CF8698 /* timectrl.cpp */; };
-		2E80D643C6B43AAFB7EFF14E /* timectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D05DAB233D8538A484CF8698 /* timectrl.cpp */; };
 		2E8440A2BDD53BE7B01547C2 /* uri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4E1DC1869C6327C80D2F5F4 /* uri.cpp */; };
 		2E8440A2BDD53BE7B01547C3 /* uri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4E1DC1869C6327C80D2F5F4 /* uri.cpp */; };
 		2E930206397C3EDCBD8206FC /* gridctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A1BD6BCA15430CA8A4869EF /* gridctrl.cpp */; };
@@ -939,6 +937,8 @@
 		98AD7D0478BA36249B03C624 /* time.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5B9586328A1F3C4BA0390AA5 /* time.cpp */; };
 		98DF13E96160304EBB905E73 /* jcmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = 810EB7316DF3344197C78EC0 /* jcmainct.c */; };
 		98DF13E96160304EBB905E74 /* jcmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = 810EB7316DF3344197C78EC0 /* jcmainct.c */; };
+		98F52D5224B438DFA8887E06 /* timectrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 741578B590AF3F2CABE615EB /* timectrlg.cpp */; };
+		98F52D5224B438DFA8887E07 /* timectrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 741578B590AF3F2CABE615EB /* timectrlg.cpp */; };
 		99C3EE31DC1B3ADAAC8E5DA2 /* anybutton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9979CCEEC4C73A6489EF1A21 /* anybutton.cpp */; };
 		99C3EE31DC1B3ADAAC8E5DA3 /* anybutton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9979CCEEC4C73A6489EF1A21 /* anybutton.cpp */; };
 		99E7A46106C03484BA70D29E /* tif_unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D2F8259CC99380CB8217DEF /* tif_unix.c */; };
@@ -1956,6 +1956,7 @@
 		727F25F832AD32D4B12D8E39 /* m_span.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_span.cpp; path = ../../src/html/m_span.cpp; sourceTree = "<group>"; };
 		72869747E68E37998CB0A07E /* jdhuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdhuff.c; path = ../../src/jpeg/jdhuff.c; sourceTree = "<group>"; };
 		72D7AF345E563587941BD868 /* longlong.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = longlong.cpp; path = ../../src/common/longlong.cpp; sourceTree = "<group>"; };
+		741578B590AF3F2CABE615EB /* timectrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timectrlg.cpp; path = ../../src/generic/timectrlg.cpp; sourceTree = "<group>"; };
 		75278C04709D3482A2660DFC /* slider.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = slider.cpp; path = ../../src/osx/carbon/slider.cpp; sourceTree = "<group>"; };
 		757B31FCCA1F381C95B30DF8 /* app.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = app.cpp; path = ../../src/osx/carbon/app.cpp; sourceTree = "<group>"; };
 		75BF90BEF2F83BF28EC0458D /* stdpbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdpbase.cpp; path = ../../src/common/stdpbase.cpp; sourceTree = "<group>"; };
@@ -2263,7 +2264,6 @@
 		CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = menuitem_osx.cpp; path = ../../src/osx/menuitem_osx.cpp; sourceTree = "<group>"; };
 		D03731D60A063988AF6AE70F /* mediactrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mediactrl.cpp; path = ../../src/osx/carbon/mediactrl.cpp; sourceTree = "<group>"; };
 		D037EA567C253DEEA17E822B /* mousemanager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mousemanager.cpp; path = ../../src/common/mousemanager.cpp; sourceTree = "<group>"; };
-		D05DAB233D8538A484CF8698 /* timectrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timectrl.cpp; path = ../../src/generic/timectrl.cpp; sourceTree = "<group>"; };
 		D0817D6A1AF83608B050EBC3 /* fontmap.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontmap.cpp; path = ../../src/common/fontmap.cpp; sourceTree = "<group>"; };
 		D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_cmdlinkbn.cpp; path = ../../src/xrc/xh_cmdlinkbn.cpp; sourceTree = "<group>"; };
 		D0B9C41A4D12345AAA764CAD /* stc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stc.cpp; path = ../../src/stc/stc.cpp; sourceTree = "<group>"; };
@@ -2920,7 +2920,7 @@
 				54710DA2AC4F3262A8A1EA63 /* richtooltipg.cpp */,
 				917F2666B67E3D2EB84E74F8 /* sashwin.cpp */,
 				3F8836E29C5A370E80CE070E /* splash.cpp */,
-				D05DAB233D8538A484CF8698 /* timectrl.cpp */,
+				741578B590AF3F2CABE615EB /* timectrlg.cpp */,
 				B56A9BF7AE1E3F11A5848297 /* tipdlg.cpp */,
 				5190E3E110443FD29F2474FC /* treelist.cpp */,
 				8F08F70E1EF239999A4D2AC4 /* wizard.cpp */,
@@ -4296,7 +4296,7 @@
 				C67EAE20657E36839BF86691 /* richtooltipg.cpp in Sources */,
 				3554C88010CE3D2A8970A136 /* sashwin.cpp in Sources */,
 				8AA341CCFB8E3F6AB3523596 /* splash.cpp in Sources */,
-				2E80D643C6B43AAFB7EFF14E /* timectrl.cpp in Sources */,
+				98F52D5224B438DFA8887E07 /* timectrlg.cpp in Sources */,
 				77BC918AF05C30E8A0BD27F9 /* tipdlg.cpp in Sources */,
 				060E095718B03EF98C75479A /* treelist.cpp in Sources */,
 				82FA4AA043213728AC266701 /* wizard.cpp in Sources */,
@@ -5102,7 +5102,7 @@
 				C67EAE20657E36839BF86690 /* richtooltipg.cpp in Sources */,
 				3554C88010CE3D2A8970A135 /* sashwin.cpp in Sources */,
 				8AA341CCFB8E3F6AB3523595 /* splash.cpp in Sources */,
-				2E80D643C6B43AAFB7EFF14D /* timectrl.cpp in Sources */,
+				98F52D5224B438DFA8887E06 /* timectrlg.cpp in Sources */,
 				77BC918AF05C30E8A0BD27F8 /* tipdlg.cpp in Sources */,
 				060E095718B03EF98C754799 /* treelist.cpp in Sources */,
 				82FA4AA043213728AC266700 /* wizard.cpp in Sources */,

build/osx/wxcocoa.xcodeproj/project.pbxproj

@@ -315,8 +315,6 @@
 		2DF74933A90E34129F1BEF73 /* dnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA72410F615B3A78A6340532 /* dnd_osx.cpp */; };
 		2E4747E0736B30569ACD5422 /* textbuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 701B84EE7C043B539FF5195A /* textbuf.cpp */; };
 		2E4747E0736B30569ACD5423 /* textbuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 701B84EE7C043B539FF5195A /* textbuf.cpp */; };
-		2E80D643C6B43AAFB7EFF14D /* timectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D05DAB233D8538A484CF8698 /* timectrl.cpp */; };
-		2E80D643C6B43AAFB7EFF14E /* timectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D05DAB233D8538A484CF8698 /* timectrl.cpp */; };
 		2E8440A2BDD53BE7B01547C2 /* uri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4E1DC1869C6327C80D2F5F4 /* uri.cpp */; };
 		2E8440A2BDD53BE7B01547C3 /* uri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4E1DC1869C6327C80D2F5F4 /* uri.cpp */; };
 		2E930206397C3EDCBD8206FC /* gridctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A1BD6BCA15430CA8A4869EF /* gridctrl.cpp */; };
@@ -949,6 +947,8 @@
 		98AD7D0478BA36249B03C624 /* time.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5B9586328A1F3C4BA0390AA5 /* time.cpp */; };
 		98DF13E96160304EBB905E73 /* jcmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = 810EB7316DF3344197C78EC0 /* jcmainct.c */; };
 		98DF13E96160304EBB905E74 /* jcmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = 810EB7316DF3344197C78EC0 /* jcmainct.c */; };
+		98F52D5224B438DFA8887E06 /* timectrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 741578B590AF3F2CABE615EB /* timectrlg.cpp */; };
+		98F52D5224B438DFA8887E07 /* timectrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 741578B590AF3F2CABE615EB /* timectrlg.cpp */; };
 		99E7A46106C03484BA70D29E /* tif_unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D2F8259CC99380CB8217DEF /* tif_unix.c */; };
 		99E7A46106C03484BA70D29F /* tif_unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D2F8259CC99380CB8217DEF /* tif_unix.c */; };
 		99F7D7BFBB543A04AB728375 /* m_hline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECA4A44BEC2F3AED8CF0C911 /* m_hline.cpp */; };
@@ -1951,6 +1951,7 @@
 		727F25F832AD32D4B12D8E39 /* m_span.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_span.cpp; path = ../../src/html/m_span.cpp; sourceTree = "<group>"; };
 		72869747E68E37998CB0A07E /* jdhuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdhuff.c; path = ../../src/jpeg/jdhuff.c; sourceTree = "<group>"; };
 		72D7AF345E563587941BD868 /* longlong.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = longlong.cpp; path = ../../src/common/longlong.cpp; sourceTree = "<group>"; };
+		741578B590AF3F2CABE615EB /* timectrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timectrlg.cpp; path = ../../src/generic/timectrlg.cpp; sourceTree = "<group>"; };
 		743EF8DB16CE371DA5C66623 /* statline.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = statline.mm; path = ../../src/osx/cocoa/statline.mm; sourceTree = "<group>"; };
 		757B31FCCA1F381C95B30DF8 /* app.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = app.cpp; path = ../../src/osx/carbon/app.cpp; sourceTree = "<group>"; };
 		75BF90BEF2F83BF28EC0458D /* stdpbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdpbase.cpp; path = ../../src/common/stdpbase.cpp; sourceTree = "<group>"; };
@@ -2256,7 +2257,6 @@
 		CF4F4F5211933057824B5621 /* button_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = button_osx.cpp; path = ../../src/osx/button_osx.cpp; sourceTree = "<group>"; };
 		CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = menuitem_osx.cpp; path = ../../src/osx/menuitem_osx.cpp; sourceTree = "<group>"; };
 		D037EA567C253DEEA17E822B /* mousemanager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mousemanager.cpp; path = ../../src/common/mousemanager.cpp; sourceTree = "<group>"; };
-		D05DAB233D8538A484CF8698 /* timectrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timectrl.cpp; path = ../../src/generic/timectrl.cpp; sourceTree = "<group>"; };
 		D0817D6A1AF83608B050EBC3 /* fontmap.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontmap.cpp; path = ../../src/common/fontmap.cpp; sourceTree = "<group>"; };
 		D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_cmdlinkbn.cpp; path = ../../src/xrc/xh_cmdlinkbn.cpp; sourceTree = "<group>"; };
 		D0B9C41A4D12345AAA764CAD /* stc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stc.cpp; path = ../../src/stc/stc.cpp; sourceTree = "<group>"; };
@@ -2846,7 +2846,7 @@
 				54710DA2AC4F3262A8A1EA63 /* richtooltipg.cpp */,
 				917F2666B67E3D2EB84E74F8 /* sashwin.cpp */,
 				3F8836E29C5A370E80CE070E /* splash.cpp */,
-				D05DAB233D8538A484CF8698 /* timectrl.cpp */,
+				741578B590AF3F2CABE615EB /* timectrlg.cpp */,
 				B56A9BF7AE1E3F11A5848297 /* tipdlg.cpp */,
 				5190E3E110443FD29F2474FC /* treelist.cpp */,
 				8F08F70E1EF239999A4D2AC4 /* wizard.cpp */,
@@ -4285,7 +4285,7 @@
 				C67EAE20657E36839BF86691 /* richtooltipg.cpp in Sources */,
 				3554C88010CE3D2A8970A136 /* sashwin.cpp in Sources */,
 				8AA341CCFB8E3F6AB3523596 /* splash.cpp in Sources */,
-				2E80D643C6B43AAFB7EFF14E /* timectrl.cpp in Sources */,
+				98F52D5224B438DFA8887E07 /* timectrlg.cpp in Sources */,
 				77BC918AF05C30E8A0BD27F9 /* tipdlg.cpp in Sources */,
 				060E095718B03EF98C75479A /* treelist.cpp in Sources */,
 				82FA4AA043213728AC266701 /* wizard.cpp in Sources */,
@@ -5087,7 +5087,7 @@
 				C67EAE20657E36839BF86690 /* richtooltipg.cpp in Sources */,
 				3554C88010CE3D2A8970A135 /* sashwin.cpp in Sources */,
 				8AA341CCFB8E3F6AB3523595 /* splash.cpp in Sources */,
-				2E80D643C6B43AAFB7EFF14D /* timectrl.cpp in Sources */,
+				98F52D5224B438DFA8887E06 /* timectrlg.cpp in Sources */,
 				77BC918AF05C30E8A0BD27F8 /* tipdlg.cpp in Sources */,
 				060E095718B03EF98C754799 /* treelist.cpp in Sources */,
 				82FA4AA043213728AC266700 /* wizard.cpp in Sources */,

build/osx/wxiphone.xcodeproj/project.pbxproj

@@ -153,7 +153,6 @@
 		2D60F289103837EA8925E3F1 /* dcbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D1EE17722EA937E88A7F0C01 /* dcbase.cpp */; };
 		2DF74933A90E34129F1BEF72 /* dnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA72410F615B3A78A6340532 /* dnd_osx.cpp */; };
 		2E4747E0736B30569ACD5422 /* textbuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 701B84EE7C043B539FF5195A /* textbuf.cpp */; };
-		2E80D643C6B43AAFB7EFF14D /* timectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D05DAB233D8538A484CF8698 /* timectrl.cpp */; };
 		2E8440A2BDD53BE7B01547C2 /* uri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4E1DC1869C6327C80D2F5F4 /* uri.cpp */; };
 		2E930206397C3EDCBD8206FC /* gridctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A1BD6BCA15430CA8A4869EF /* gridctrl.cpp */; };
 		2EECB3C2F9523D0B95847A7F /* accel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C78A1539462370CAA429508 /* accel.cpp */; };
@@ -460,6 +459,7 @@
 		9881E3FB23ED3283B6CC71A2 /* filepickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BFA50405234C30EEA3F77F17 /* filepickercmn.cpp */; };
 		98AD7D0478BA36249B03C623 /* time.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5B9586328A1F3C4BA0390AA5 /* time.cpp */; };
 		98DF13E96160304EBB905E73 /* jcmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = 810EB7316DF3344197C78EC0 /* jcmainct.c */; };
+		98F52D5224B438DFA8887E06 /* timectrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 741578B590AF3F2CABE615EB /* timectrlg.cpp */; };
 		99E7A46106C03484BA70D29E /* tif_unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D2F8259CC99380CB8217DEF /* tif_unix.c */; };
 		99F7D7BFBB543A04AB728375 /* m_hline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECA4A44BEC2F3AED8CF0C911 /* m_hline.cpp */; };
 		9A16829C34C9344D9AB010F9 /* DocumentAccessor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 38B8924D1E583C90A4933105 /* DocumentAccessor.cxx */; };
@@ -1117,6 +1117,7 @@
 		727F25F832AD32D4B12D8E39 /* m_span.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_span.cpp; path = ../../src/html/m_span.cpp; sourceTree = "<group>"; };
 		72869747E68E37998CB0A07E /* jdhuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdhuff.c; path = ../../src/jpeg/jdhuff.c; sourceTree = "<group>"; };
 		72D7AF345E563587941BD868 /* longlong.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = longlong.cpp; path = ../../src/common/longlong.cpp; sourceTree = "<group>"; };
+		741578B590AF3F2CABE615EB /* timectrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timectrlg.cpp; path = ../../src/generic/timectrlg.cpp; sourceTree = "<group>"; };
 		757B31FCCA1F381C95B30DF8 /* app.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = app.cpp; path = ../../src/osx/carbon/app.cpp; sourceTree = "<group>"; };
 		75BF90BEF2F83BF28EC0458D /* stdpbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdpbase.cpp; path = ../../src/common/stdpbase.cpp; sourceTree = "<group>"; };
 		75D0C937F2A03ADA8581A2BB /* arcall.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = arcall.cpp; path = ../../src/common/arcall.cpp; sourceTree = "<group>"; };
@@ -1416,7 +1417,6 @@
 		CF4F4F5211933057824B5621 /* button_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = button_osx.cpp; path = ../../src/osx/button_osx.cpp; sourceTree = "<group>"; };
 		CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = menuitem_osx.cpp; path = ../../src/osx/menuitem_osx.cpp; sourceTree = "<group>"; };
 		D037EA567C253DEEA17E822B /* mousemanager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mousemanager.cpp; path = ../../src/common/mousemanager.cpp; sourceTree = "<group>"; };
-		D05DAB233D8538A484CF8698 /* timectrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timectrl.cpp; path = ../../src/generic/timectrl.cpp; sourceTree = "<group>"; };
 		D0817D6A1AF83608B050EBC3 /* fontmap.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontmap.cpp; path = ../../src/common/fontmap.cpp; sourceTree = "<group>"; };
 		D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_cmdlinkbn.cpp; path = ../../src/xrc/xh_cmdlinkbn.cpp; sourceTree = "<group>"; };
 		D0B9C41A4D12345AAA764CAD /* stc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stc.cpp; path = ../../src/stc/stc.cpp; sourceTree = "<group>"; };
@@ -2000,7 +2000,7 @@
 				54710DA2AC4F3262A8A1EA63 /* richtooltipg.cpp */,
 				917F2666B67E3D2EB84E74F8 /* sashwin.cpp */,
 				3F8836E29C5A370E80CE070E /* splash.cpp */,
-				D05DAB233D8538A484CF8698 /* timectrl.cpp */,
+				741578B590AF3F2CABE615EB /* timectrlg.cpp */,
 				B56A9BF7AE1E3F11A5848297 /* tipdlg.cpp */,
 				5190E3E110443FD29F2474FC /* treelist.cpp */,
 				8F08F70E1EF239999A4D2AC4 /* wizard.cpp */,
@@ -3345,7 +3345,7 @@
 				C67EAE20657E36839BF86690 /* richtooltipg.cpp in Sources */,
 				3554C88010CE3D2A8970A135 /* sashwin.cpp in Sources */,
 				8AA341CCFB8E3F6AB3523595 /* splash.cpp in Sources */,
-				2E80D643C6B43AAFB7EFF14D /* timectrl.cpp in Sources */,
+				98F52D5224B438DFA8887E06 /* timectrlg.cpp in Sources */,
 				77BC918AF05C30E8A0BD27F8 /* tipdlg.cpp in Sources */,
 				060E095718B03EF98C754799 /* treelist.cpp in Sources */,
 				82FA4AA043213728AC266700 /* wizard.cpp in Sources */,

build/tools/bld_chm_exe.bat

@@ -17,7 +17,7 @@ set INNO=c:\wx\inno\wxWidgets
 
 rem svn already in my path...
 set PATH=%PATH%;c:\wx\Gnu\bin;c:\progra~1\htmlhe~1;C:\PROGRA~1\INNOSE~1;c:\wx\doxygen\bin
-
+set PATH=%PATH%;C:\wx\Graphviz\bin
 echo %PATH% >>  c:\temp.log
 
 
@@ -59,15 +59,15 @@ call regen chm
 
 
 cd %WXWIN%\docs\doxygen\out
-zip wxWidgets-%WXW_VER%-chm.zip wx.chm
-copy wxWidgets-%WXW_VER%-chm.zip %DAILY%
+zip wxWidgets-%WXW_VER%-docs-chm.zip wx.chm
+copy wxWidgets-%WXW_VER%-docs-chm.zip %DAILY%
 cd html
 del *.dot
 del *.md5
 zip -r wx.htb *.*
-copy wx.htb %DAILY%\wxWidgets-%WXW_VER%-html.zip
-zip wxWidgets-%WXW_VER%-htb.zip wx.htb
-copy wxWidgets-%WXW_VER%-htb.zip %DAILY%
+copy wx.htb %DAILY%\wxWidgets-%WXW_VER%-docs-html.zip
+zip wxWidgets-%WXW_VER%-docs-htb.zip wx.htb
+copy wxWidgets-%WXW_VER%-docs-htb.zip %DAILY%
 
 
 mkdir %INNO%\docs\htmlhelp

build/tools/wxwidgets.iss

@@ -31,6 +31,7 @@ InfoBeforeFile={#INNODIR}\docs\readme.txt
 InfoAfterFile={#INFOFILE}
 OutputDir=c:\daily
 OutputBaseFilename={#SETUPFILENAME}
+PrivilegesRequired=none
 SetupIconFile={#INNODIR}\art\wxwin.ico
 Compression=lzma
 SolidCompression=yes
@@ -50,7 +51,7 @@ Source: "{#INNODIR}\docs\msw\install.txt"; DestDir: "{app}\docs\msw";  Flags: ig
 Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.wxwidgets.org"
 
 [Icons]
-Name: "{group}\{cm:ProgramOnTheWeb,wxWidgets {#WX_VERSION}}"; Filename: "{app}\wx.url"
+Name: "{group}\{cm:ProgramOnTheWeb,wxWidgets}"; Filename: "{app}\wx.url"
 Name: {group}\wxWidgets Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
 Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
 Name: {group}\Readme; Filename: {app}\docs\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths

configure

@@ -19583,6 +19583,16 @@ case "${host}" in
 esac
 
 
+if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
+                    cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
+
+
+            GNU_SOURCE_FLAG="-D_GNU_SOURCE"
+    CFLAGS="$GNU_SOURCE_FLAG $CFLAGS"
+fi
+
 if test "x$USE_AIX" = "x1"; then
             if test "x$XLCXX" = "xyes"; then
         CXXFLAGS="-qunique $CXXFLAGS"
@@ -25597,7 +25607,7 @@ _ACEOF
 
 
 if test "x$SUNCXX" = xyes; then
-    CXXFLAGS="-features=tmplife $CXXFLAGS"
+    CXXFLAGS="-features=tmplife $GNU_SOURCE_FLAG $CXXFLAGS"
 fi
 
 if test "x$SUNCC" = xyes; then
@@ -27379,84 +27389,6 @@ echo "$as_me: not updating unwritable cache $cache_file" >&6;}
 fi
 rm -f confcache
 
-if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
-    { echo "$as_me:$LINENO: checking for glibc 2.1 or later" >&5
-echo $ECHO_N "checking for glibc 2.1 or later... $ECHO_C" >&6; }
-if test "${wx_cv_lib_glibc21+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <features.h>
-int
-main ()
-{
-
-                #if (__GLIBC__ < 2) || (__GLIBC_MINOR__ < 1)
-                not glibc 2.1
-                #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-                wx_cv_lib_glibc21=yes
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-                wx_cv_lib_glibc21=no
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_lib_glibc21" >&5
-echo "${ECHO_T}$wx_cv_lib_glibc21" >&6; }
-    if test "$wx_cv_lib_glibc21" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxHAVE_GLIBC2 1
-_ACEOF
-
-    fi
-fi
-
-if test "x$wx_cv_lib_glibc21" = "xyes"; then
-    if test "$wxUSE_UNICODE" = "yes" -o "$wxUSE_THREADS" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define _GNU_SOURCE 1
-_ACEOF
-
-    fi
-fi
-
 have_cos=0
 have_floor=0
 
@@ -50444,6 +50376,7 @@ if test "$wxUSE_TREELISTCTRL" = "yes"; then
 _ACEOF
 
     USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelist"
 fi
 
 if test "$wxUSE_POPUPWIN" = "yes"; then

configure.in

@@ -1384,6 +1384,19 @@ dnl ------------------------------------------------------------------------
 dnl Platform specific tests
 dnl ------------------------------------------------------------------------
 
+if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
+    dnl While g++ predefines _GNU_SOURCE by default, gcc does not, so do it
+    dnl explicitly to ensure that the tests done below using C compiler
+    dnl succeed, otherwise things like pthread_mutexattr_settype() (and many
+    dnl others) wouldn't be detected.
+    AC_DEFINE(_GNU_SOURCE)
+
+    dnl For non-g++ compilers (including gcc, as mentioned above) we need to
+    dnl add this flag explicitly when building our own code later too.
+    GNU_SOURCE_FLAG="-D_GNU_SOURCE"
+    CFLAGS="$GNU_SOURCE_FLAG $CFLAGS"
+fi
+
 if test "x$USE_AIX" = "x1"; then
     dnl xlC needs -qunique under AIX so that one source file can be
     dnl compiled to multiple object files and safely linked together.
@@ -1896,7 +1909,7 @@ WX_CPP_EXPLICIT
 dnl With Sun CC, temporaries have block scope by default. This flag is needed
 dnl to get the expression scope behaviour that conforms to the standard.
 if test "x$SUNCXX" = xyes; then
-    CXXFLAGS="-features=tmplife $CXXFLAGS"
+    CXXFLAGS="-features=tmplife $GNU_SOURCE_FLAG $CXXFLAGS"
 fi
 
 dnl Sun X11 headers are (still, in 2005!) non-ANSI and the best they could do
@@ -2390,45 +2403,6 @@ dnl ------------------------------------------------------------------------
 dnl flush the cache because checking for libraries below might abort
 AC_CACHE_SAVE
 
-dnl check for glibc version
-dnl
-dnl VZ: I have no idea why had this check been there originally, but now
-dnl     we could probably do without it by just always adding _GNU_SOURCE
-if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
-    AC_CACHE_CHECK([for glibc 2.1 or later], wx_cv_lib_glibc21,[
-        AC_TRY_COMPILE([#include <features.h>],
-            [
-                #if (__GLIBC__ < 2) || (__GLIBC_MINOR__ < 1)
-                not glibc 2.1
-                #endif
-            ],
-            [
-                wx_cv_lib_glibc21=yes
-            ],
-            [
-                wx_cv_lib_glibc21=no
-            ]
-        )
-    ])
-    if test "$wx_cv_lib_glibc21" = "yes"; then
-        AC_DEFINE(wxHAVE_GLIBC2)
-    fi
-fi
-
-dnl we may need _GNU_SOURCE for 2 things:
-dnl
-dnl  1. to get PTHREAD_MUTEX_RECURSIVE with glibc 2.1+ (strictly speaking we
-dnl  only need _XOPEN_SOURCE=500 but just defining this disables _BSD_SOURCE
-dnl  which breaks libtiff compilation, so it is simpler to just define
-dnl  _GNU_SOURCE to get everything)
-dnl
-dnl  2. for Unicode functions
-if test "x$wx_cv_lib_glibc21" = "xyes"; then
-    if test "$wxUSE_UNICODE" = "yes" -o "$wxUSE_THREADS" = "yes"; then
-        AC_DEFINE(_GNU_SOURCE)
-    fi
-fi
-
 dnl Only add the -lm library if floating point functions cannot be used
 dnl without it.  This check is important on cygwin because of the bizarre
 dnl way that they have organized functions into libraries.  On cygwin, both
@@ -7191,6 +7165,7 @@ fi
 if test "$wxUSE_TREELISTCTRL" = "yes"; then
     AC_DEFINE(wxUSE_TREELISTCTRL)
     USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelist"
 fi
 
 if test "$wxUSE_POPUPWIN" = "yes"; then

docs/changes.txt

@@ -445,7 +445,7 @@ Major new features in this release
   was added.
 
 
-2.9.3:
+2.9.3: (released 2011-12-14)
 ------
 
 INCOMPATIBLE CHANGES SINCE 2.9.2
@@ -465,6 +465,7 @@ All:
   wxGetUTCTimeMillis() returning what this function used to return.
 - Added wxCriticalSection::TryEnter() (Catalin Raceanu).
 - Add support for OpenBSD to wxDialUpManager (brad0).
+- Added wxEXEC_HIDE_CONSOLE flag.
 
 All (GUI):
 
@@ -509,6 +510,7 @@ OSX:
   for OS X 10.6.
 - Added wxApp::MacOpenFiles and deprecated wxApp::MacOpenFile.
 - Implement wxEVT_CHAR_HOOK event generation in wxOSX/Cocoa.
+- Implemented wxComboBox::Popup() and Dismiss() in wxOSX/Cocoa (joostn).
 
 GTK:
 

docs/doxygen/Doxyfile_html

@@ -14,4 +14,5 @@
 
 GENERATE_HTML          = YES
 SEARCHENGINE           = YES
+SERVER_BASED_SEARCH    = NO
 

docs/doxygen/Doxyfile_inc

@@ -13,6 +13,8 @@
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = wxWidgets
 PROJECT_NUMBER         = 2.9.3
+PROJECT_BRIEF          =
+PROJECT_LOGO           = logo.png
 OUTPUT_DIRECTORY       = out
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
@@ -321,16 +323,24 @@ IGNORE_PREFIX          = wx
 GENERATE_HTML          = NO # Only change in format output configs
 HTML_OUTPUT            = html
 HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = htmlheader.inc
-HTML_FOOTER            = htmlfooter.inc
-HTML_STYLESHEET        =
+HTML_HEADER            = custom_header.html
+HTML_FOOTER            = custom_footer.html
+HTML_STYLESHEET        = custom_stylesheet.css
+HTML_EXTRA_FILES       = jquery-1.3.2.min.js
+HTML_COLORSTYLE_HUE    =
+HTML_COLORSTYLE_SAT    = 255
+HTML_COLORSTYLE_GAMMA  = 100
+HTML_TIMESTAMP         = YES
 HTML_ALIGN_MEMBERS     = YES
 HTML_DYNAMIC_SECTIONS  = YES
 DISABLE_INDEX          = NO
 ENUM_VALUES_PER_LINE   = 1
-GENERATE_TREEVIEW      = NONE
+GENERATE_TREEVIEW      = NO
+USE_INLINE_TREES       = NO
 TREEVIEW_WIDTH         = 250
+EXT_LINKS_IN_WINDOW    = YES
 FORMULA_FONTSIZE       = 10
+FORMULA_TRANSPARENT    = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the CHM output

docs/doxygen/custom_footer.html

@@ -0,0 +1,21 @@
+<!--BEGIN GENERATE_TREEVIEW-->
+    <li class="footer">
+    	Page generated on $datetime by <!--[Doxygen 1.7.6+] $generatedby -->
+    	<a href="http://www.doxygen.org/index.html" target="_new">Doxygen</a> $doxygenversion</li>
+   </ul>
+ </div>
+<!--END GENERATE_TREEVIEW-->
+<!--BEGIN !GENERATE_TREEVIEW-->
+<hr class="footer"/>
+<address class="footer">
+	<small>
+		Page generated on $datetime by <!--[Doxygen 1.7.6+] $generatedby -->
+		<a href="http://www.doxygen.org/index.html" target="_new">Doxygen</a> $doxygenversion
+	</small>
+</address>
+<!--END !GENERATE_TREEVIEW-->
+
+<script src="wxwidgets.js" type="text/javascript"></script>
+
+</body>
+</html>

docs/doxygen/custom_header.html

@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
+<!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
+<link href="$relpath$tabs.css" rel="stylesheet" type="text/css"/>
+<link href="$relpath$custom_stylesheet.css" rel="stylesheet" type="text/css" />
+<script type="text/javascript" src="jquery-1.3.2.min.js"></script>
+$treeview
+$search
+$mathjax
+</head>
+<body>
+<div id="top"><!-- do not remove this div! -->
+
+<!--BEGIN TITLEAREA-->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0" style="width: 100%;">
+ <tbody>
+ <tr>
+  <!--BEGIN PROJECT_LOGO-->
+  <td id="projectlogo"><a href="http://www.wxwidgets.org/" target="_new"><img alt="Logo" src="$relpath$$projectlogo"/></a></td>
+  <!--END PROJECT_LOGO-->
+  <td style="padding: 0.5em; text-align: right;">
+   <!--BEGIN PROJECT_NUMBER--><span id="projectnumber">Version: $projectnumber</span><!--END PROJECT_NUMBER-->
+  </td>
+  <!--BEGIN DISABLE_INDEX-->
+   <!--BEGIN SEARCHENGINE-->
+   <td>$searchbox</td>
+   <!--END SEARCHENGINE-->
+  <!--END DISABLE_INDEX-->
+ </tr>
+ </tbody>
+</table>
+</div>
+<!--END TITLEAREA-->

docs/doxygen/htmlfooter.inc

@@ -1,25 +0,0 @@
-<!-- ******************************************************* -->
-<!--             Standard wxWidgets footer                   -->
-
-<!-- NOTE: <br/> must go inside <p> but <hr/> must go outside -->
-<p><br/></p><hr/>
-
-<table width="100%" border="0">
-<tr>
-    <td align="left">
-        <a href="http://www.wxwidgets.org" style="margin-left: 0px">
-            <img src="powered-by-wxwidgets.png" alt="wxWidgets logo" border="0"/>
-        </a>
-    </td>
-    <td valign="middle" align="center"><p class="footer">Page generated <tt>$datetime</tt> by <a href="http://www.doxygen.org">Doxygen</a> $doxygenversion</p></td>
-    <td valign="middle" align="right"><p>[ <a href="#top" class="top">top</a> ]</p></td>
-</tr>
-</table>
-
-<script src="wxwidgets.js" type="text/javascript"></script>
-
-</body>
-</html>
-
-<!-- ***************************************************** -->
-<!--         End of wxWidgets standard footer              -->

docs/doxygen/htmlheader.inc

@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<!-- ****************************************************** -->
-<!--            Standard wxWidgets header                   -->
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-    <title>$title</title>
-    <meta name="author" content="wxWidgets team"/>
-    <meta name="created" content="$datetime"/>
-    <meta name="keywords" content="wxWidgets"/>
-    <link href="wxwidgets.css" rel="stylesheet" type="text/css"/>
-    <link href="wxtabs.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-
-
-<!--          End of wxWidgets standard header           -->
-<!-- *************************************************** -->
-

docs/doxygen/mainpages/manual.h

@@ -9,10 +9,10 @@
 
 /**
 
-@mainpage Reference manual
+@mainpage Documentation
 @author Julian Smart, Robert Roebling, Vadim Zeitlin, Robin Dunn,
         Stefan Csomor, Francesco Montorsi, Bryan Petty, et al
-@date July, 2011
+@date December, 2011
 
 @image html main_wxlogo.png
 

docs/doxygen/overviews/eventhandling.h

@@ -141,7 +141,7 @@ private:
     // obligation to do that; this one is an event handler too:
     void DoTest(wxCommandEvent& event);
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE()
 };
 @endcode
 
@@ -225,7 +225,7 @@ events.
 
 The possibilities of handling events in this way are rather different.
 Let us start by looking at the syntax: the first obvious difference is that you
-need not use DECLARE_EVENT_TABLE() nor BEGIN_EVENT_TABLE() and the
+need not use wxDECLARE_EVENT_TABLE() nor wxBEGIN_EVENT_TABLE() and the
 associated macros. Instead, in any place in your code, but usually in
 the code of the class defining the handler itself (and definitely not in the
 global scope as with the event tables), call its Bind<>() method like this:
@@ -621,16 +621,16 @@ wxDECLARE_EVENT(MY_EVENT, wxCommandEvent);
 wxDEFINE_EVENT(MY_EVENT, wxCommandEvent);
 
 // example of code handling the event with event tables
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU    (wxID_EXIT, MyFrame::OnExit)
     ...
     EVT_COMMAND (ID_MY_WINDOW, MY_EVENT, MyFrame::OnMyEvent)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void MyFrame::OnMyEvent(wxCommandEvent& event)
 {
     // do something
-    wxString text = event.GetText();
+    wxString text = event.GetString();
 }
 
 // example of code handling the event with Bind<>():
@@ -646,7 +646,7 @@ void MyWindow::SendEvent()
     event.SetEventObject(this);
 
     // Give it some contents
-    event.SetText("Hello");
+    event.SetString("Hello");
 
     // Do send it
     ProcessWindowEvent(event);
@@ -711,9 +711,9 @@ typedef void (wxEvtHandler::*MyPlotEventFunction)(MyPlotEvent&);
 
 // example of code handling the event (you will use one of these methods, not
 // both, of course):
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_PLOT(ID_MY_WINDOW, MyFrame::OnPlot)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 MyFrame::MyFrame()
 {

docs/doxygen/regen.bat

@@ -24,11 +24,6 @@ copy images\wxmsw\*.png out\html\wxmsw 2>&1 >NUL
 copy images\wxmac\*.png out\html\wxmac 2>&1 >NUL
 copy wxwidgets.js out\html 2>&1 >NUL
 
-REM these CSS are not automatically copied by Doxygen because they're
-REM included by our custom html header...
-copy wxwidgets.css out\html 2>&1 >NUL
-copy wxtabs.css out\html 2>&1 >NUL
-
 REM set cfgfile variable to the right doxyfile to use,
 REM using MS broken batch scripting
 setlocal enableextensions

docs/doxygen/regen.sh

@@ -38,11 +38,6 @@ cp images/wxgtk/*png out/html/wxgtk
 cp images/generic/*png out/html/generic
 cp wxwidgets.js out/html
 
-# these CSS are not automatically copied by Doxygen because they're
-# included by our custom html header...
-cp wxwidgets.css out/html
-cp wxtabs.css out/html
-
 # which configuration should we use?
 if [[ -z "$1" ]]; then
     cfgfile="Doxyfile_all"
@@ -146,10 +141,8 @@ fi
 # more readable
 currpath=`pwd`/
 interfacepath=`cd ../../interface && pwd`/
-cat doxygen.log | sed -e "s|$currpath||g" -e "s|$interfacepath||g" >temp
-
-# Doxygen warnings are not completely sorted for filename; enforce correct sorting:
-cat temp | sort >doxygen.log
+cat doxygen.log | sed -e "s|$currpath||g" -e "s|$interfacepath||g" > temp
+cat temp > doxygen.log
 rm temp
 
 # return to the original folder from which this script was launched

docs/doxygen/wxtabs.css

@@ -1,217 +0,0 @@
-/*****************************************************************************
-** Name:        wxtabs.css
-** Purpose:     The wxWidgets documentation CSS
-** Author:      Doxygen team
-** RCS-ID:      $Id$
-** Licence:     wxWindows licence
-*****************************************************************************/
-
-/*
-  Doxygen classic tabs styles, based on http://www.alistapart.com/articles/slidingdoors 
-*/
-
-DIV.tabs
-{
-   float            : left;
-   width            : 100%;
-   background       : url("tab_b.gif") repeat-x bottom;
-   margin-bottom    : 4px;
-}
-
-DIV.tabs UL
-{
-   margin           : 0px;
-   padding-left     : 10px;
-   list-style       : none;
-}
-
-DIV.tabs LI, DIV.tabs FORM
-{
-   display          : inline;
-   margin           : 0px;
-   padding          : 0px;
-}
-
-DIV.tabs FORM
-{
-   float            : right;
-}
-
-DIV.tabs A
-{
-   float            : left;
-   background       : url("tab_r.gif") no-repeat right top;
-   border-bottom    : 1px solid #84B0C7;
-   font-size        : 80%;
-   font-weight      : bold;
-   text-decoration  : none;
-}
-
-DIV.tabs A:hover
-{
-   background-position: 100% -150px;
-}
-
-DIV.tabs A:link, DIV.tabs A:visited,
-DIV.tabs A:active, DIV.tabs A:hover
-{
-       color: #1A419D;
-}
-
-DIV.tabs SPAN
-{
-   float            : left;
-   display          : block;
-   background       : url("tab_l.gif") no-repeat left top;
-   padding          : 5px 9px;
-   white-space      : nowrap;
-}
-
-DIV.tabs INPUT
-{
-   float            : right;
-   display          : inline;
-   font-size        : 1em;
-}
-
-DIV.tabs TD
-{
-   font-size        : 80%;
-   font-weight      : bold;
-   text-decoration  : none;
-}
-
-
-
-/* Commented Backslash Hack hides rule from IE5-Mac \*/
-DIV.tabs SPAN {float : none;}
-/* End IE5-Mac hack */
-
-DIV.tabs A:hover SPAN
-{
-   background-position: 0% -150px;
-}
-
-DIV.tabs LI.current A
-{
-   background-position: 100% -150px;
-   border-width     : 0px;
-}
-
-DIV.tabs LI.current SPAN
-{
-   background-position: 0% -150px;
-   padding-bottom   : 6px;
-}
-
-DIV.navpath
-{
-   background       : none;
-   border           : none;
-   border-bottom    : 1px solid #84B0C7;
-   text-align       : center;
-   margin           : 2px;
-   padding          : 2px;
-}
-
-
-/*
-   NOTE: since v. 1.7.0 Doxygen uses new style names for some tabs... and in particular uses "tabs2" for
-         the CSS style names of the "Class List, Class Index, Class Hierarchy, Class Members" tabs.
-         For now we keep for "tabs2" tabs the same style used with other ones.
-*/
-
-
-DIV.tabs2
-{
-   float            : left;
-   width            : 100%;
-   background       : url("tab_b.gif") repeat-x bottom;
-   margin-bottom    : 4px;
-}
-
-DIV.tabs2 UL
-{
-   margin           : 0px;
-   padding-left     : 10px;
-   list-style       : none;
-}
-
-DIV.tabs2 LI, DIV.tabs2 FORM
-{
-   display          : inline;
-   margin           : 0px;
-   padding          : 0px;
-}
-
-DIV.tabs2 FORM
-{
-   float            : right;
-}
-
-DIV.tabs2 A
-{
-   float            : left;
-   background       : url("tab_r.gif") no-repeat right top;
-   border-bottom    : 1px solid #84B0C7;
-   font-size        : 80%;
-   font-weight      : bold;
-   text-decoration  : none;
-}
-
-DIV.tabs2 A:hover
-{
-   background-position: 100% -150px;
-}
-
-DIV.tabs2 A:link, DIV.tabs2 A:visited,
-DIV.tabs2 A:active, DIV.tabs2 A:hover
-{
-       color: #1A419D;
-}
-
-DIV.tabs2 SPAN
-{
-   float            : left;
-   display          : block;
-   background       : url("tab_l.gif") no-repeat left top;
-   padding          : 5px 9px;
-   white-space      : nowrap;
-}
-
-DIV.tabs2 INPUT
-{
-   float            : right;
-   display          : inline;
-   font-size        : 1em;
-}
-
-DIV.tabs2 TD
-{
-   font-size        : 80%;
-   font-weight      : bold;
-   text-decoration  : none;
-}
-
-
-
-/* Commented Backslash Hack hides rule from IE5-Mac \*/
-DIV.tabs2 SPAN {float : none;}
-/* End IE5-Mac hack */
-
-DIV.tabs2 A:hover SPAN
-{
-   background-position: 0% -150px;
-}
-
-DIV.tabs2 LI.current A
-{
-   background-position: 100% -150px;
-   border-width     : 0px;
-}
-
-DIV.tabs2 LI.current SPAN
-{
-   background-position: 0% -150px;
-   padding-bottom   : 6px;
-}

docs/doxygen/wxwidgets.css

@@ -1,494 +0,0 @@
-/*****************************************************************************
-** Name:        wxwidgets.css
-** Purpose:     The wxWidgets documentation CSS; a customized version of
-**              the standard Doxygen CSS
-** Author:      Doxygen team
-** RCS-ID:      $Id$
-** Licence:     wxWindows licence
-*****************************************************************************/
-
-
-/*
-  Doxygen classic styles
-  ======================
-*/
-
-BODY,H1,H2,H3,H4,H5,H6,P,CENTER,TD,TH,UL,DL,DIV {
-    font-family: Geneva, Arial, Helvetica, sans-serif;
-}
-BODY,TD {
-    font-size: 90%;
-}
-H1 {
-    text-align: center;
-    font-size: 160%;
-    border-top: 1em;
-}
-H2 {
-    font-size: 120%;
-    padding-top: 1em;
-    border-top: 3px solid #AAA;
-}
-H3 {
-    text-align: center;
-    font-size: 100%;
-}
-CAPTION {
-    font-weight: bold
-}
-DIV.qindex {
-    width: 100%;
-    background-color: #e8eef2;
-    border: 1px solid #84b0c7;
-    text-align: center;
-    margin: 2px;
-    padding: 2px;
-    line-height: 140%;
-}
-DIV.navpath {
-    width: 100%;
-    background-color: #e8eef2;
-    border: 1px solid #84b0c7;
-    text-align: center;
-    margin: 2px;
-    padding: 2px;
-    line-height: 140%;
-}
-DIV.navtab {
-    background-color: #e8eef2;
-    border: 1px solid #84b0c7;
-    text-align: center;
-    margin: 2px;
-    margin-right: 15px;
-    padding: 2px;
-}
-TD.navtab {
-    font-size: 70%;
-}
-A.qindex {
-    text-decoration: none;
-    font-weight: bold;
-    color: #1A419D;
-}
-A.qindex:visited {
-    text-decoration: none;
-    font-weight: bold;
-    color: #1A419D
-}
-A.qindex:hover {
-    text-decoration: none;
-    background-color: #ddddff;
-}
-A.qindexHL {
-    text-decoration: none;
-    font-weight: bold;
-    background-color: #6666cc;
-    color: #ffffff;
-    border: 1px double #9295C2;
-}
-A.qindexHL:hover {
-    text-decoration: none;
-    background-color: #6666cc;
-    color: #ffffff;
-}
-A.qindexHL:visited {
-    text-decoration: none;
-    background-color: #6666cc;
-    color: #ffffff
-}
-A.el {
-    text-decoration: none;
-    font-weight: bold
-}
-A.elRef {
-    font-weight: bold
-}
-A.code:link {
-    text-decoration: none;
-    font-weight: normal;
-    color: #0000FF
-}
-A.code:visited {
-    text-decoration: none;
-    font-weight: normal;
-    color: #0000FF
-}
-A.codeRef:link {
-    font-weight: normal;
-    color: #0000FF
-}
-A.codeRef:visited {
-    font-weight: normal;
-    color: #0000FF
-}
-A:hover {
-    text-decoration: none;
-    background-color: #f2f2ff
-}
-DL.el {
-    margin-left: -1cm
-}
-.fragment {
-    font-family: monospace, fixed;
-    font-size: 95%;
-}
-PRE.fragment {
-    border: 1px solid #CCCCCC;
-    background-color: #f5f5f5;
-    margin: 4px 8px 4px 2px;
-    padding: 4px 6px;
-}
-DIV.ah {
-    background-color: black;
-    font-weight: bold;
-    color: #ffffff;
-    margin-bottom: 3px;
-    margin-top: 3px
-}
-
-DIV.groupHeader {
-    margin-left: 16px;
-    margin-top: 12px;
-    margin-bottom: 6px;
-    font-weight: bold;
-}
-DIV.groupText {
-    margin-left: 16px;
-    font-style: italic;
-    font-size: 90%
-}
-BODY {
-    background: white;
-    color: black;
-    margin-right: 20px;
-    margin-left: 20px;
-}
-TD.indexkey {
-    background-color: #e8eef2;
-    font-weight: bold;
-    padding: 2px 10px;
-    margin: 2px 0px;
-    border: 1px solid #CCCCCC;
-}
-TD.indexvalue {
-    background-color: #e8eef2;
-    font-style: italic;
-    padding: 2px 10px;
-    margin: 2px 0px;
-    border: 1px solid #CCCCCC;
-}
-TR.memlist {
-    background-color: #f0f0f0;
-}
-P.formulaDsp {
-    text-align: center;
-}
-IMG.formulaDsp {
-}
-IMG.formulaInl {
-    vertical-align: middle;
-}
-SPAN.keyword       { color: #008000 }
-SPAN.keywordtype   { color: #604020 }
-SPAN.keywordflow   { color: #e08000 }
-SPAN.comment       { color: #800000 }
-SPAN.preprocessor  { color: #806020 }
-SPAN.stringliteral { color: #002080 }
-SPAN.charliteral   { color: #008080 }
-SPAN.vhdldigit     { color: #ff00ff }
-SPAN.vhdlchar      { color: #000000 }
-SPAN.vhdlkeyword   { color: #700070 }
-SPAN.vhdllogic     { color: #ff0000 }
-
-/* Doxygen Member Description Style 1.5.7 */
-
-.mdescLeft, .mdescRight,
-.memItemLeft, .memItemRight,
-.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
-    background-color: #FAFAFA;
-    border: none;
-    margin: 4px;
-    padding: 1px 0 0 8px;
-}
-
-.mdescLeft, .mdescRight {
-    padding: 0px 8px 4px 8px;
-    color: #555;
-}
-
-.memItemLeft, .memItemRight, .memTemplParams {
-    border-top: 1px solid #ccc;
-}
-
-.memTemplParams {
-    color: #606060;
-}
-
-/*******************************************/
-
-TD.tiny {
-    font-size: 75%;
-}
-a {
-    color: #1A41A8;
-}
-a:visited {
-    color: #2A3798;
-}
-.dirtab {
-    padding: 4px;
-    border-collapse: collapse;
-    border: 1px solid #84b0c7;
-}
-TH.dirtab {
-    background: #e8eef2;
-    font-weight: bold;
-}
-HR {
-/*
-    height: 3px;
-    margin-top: 1.5em;
-    margin-bottom: 1.5em;
-*/
-    height: 0px;
-    margin: 0;
-    border: 0px;
-}
-
-/* Style for detailed member documentation */
-
-.memtemplate {
-    font-size: 80%;
-    color: #606060;
-    font-weight: normal;
-    margin-left: 3px;
-}
-
-.memnav {
-    background-color: #e8eef2;
-    border: 1px solid #84b0c7;
-    text-align: center;
-    margin: 2px;
-    margin-right: 15px;
-    padding: 2px;
-}
-
-.memitem {
-    padding: 0;
-}
-
-.memname {
-    white-space: nowrap;
-    font-weight: bold;
-    padding: 2px 2px;
-}
-
-.memproto, .memdoc {
-    border: 1px solid #84b0c7;
-}
-
-.memproto {
-    padding: 0;
-    background-color: #d5e1e8;
-    font-weight: bold;
-    -webkit-border-top-left-radius: 8px;
-    -webkit-border-top-right-radius: 8px;
-    -moz-border-radius-topleft: 8px;
-    -moz-border-radius-topright: 8px;
-}
-
-.memdoc {
-    padding: 5px 8px;
-    background-color: #eef3f5;
-    border-top-width: 0;
-    -webkit-border-bottom-left-radius: 8px;
-    -webkit-border-bottom-right-radius: 8px;
-    -moz-border-radius-bottomleft: 8px;
-    -moz-border-radius-bottomright: 8px;
-}
-
-.memdoc p, .memdoc dl, .memdoc ul {
-    margin: 6px 0;
-}
-
-.paramkey {
-    text-align: right;
-}
-.paramtype {
-    white-space: nowrap;
-}
-.paramname {
-    color: #602020;
-    white-space: nowrap;
-}
-.paramname em {
-    font-style: normal;
-}
-
-/* End Styling for detailed member documentation */
-
-/* for the tree view */
-
-.ftvtree {
-    font-family: sans-serif;
-    margin:0.5em;
-}
-.directory {
-    font-size: 9pt;
-    font-weight: bold;
-}
-.directory h3 {
-    margin: 0px;
-    margin-top: 1em;
-    font-size: 11pt;
-}
-.directory > h3 {
-    margin-top: 0;
-}
-.directory p {
-    margin: 0px;
-    white-space: nowrap;
-}
-.directory div {
-    display: none;
-    margin: 0px;
-}
-.directory img {
-    vertical-align: -30%;
-}
-
-/* these are for tree view when not used as main index */
-
-.directory-alt {
-    font-size: 100%;
-    font-weight: bold;
-}
-
-.directory-alt h3 {
-    margin: 0px;
-    margin-top: 1em;
-    font-size: 11pt;
-}
-
-.directory-alt > h3 {
-    margin-top: 0;
-}
-
-.directory-alt p {
-    margin: 0px;
-    white-space: nowrap;
-}
-
-.directory-alt div {
-    display: none;
-    margin: 0px;
-}
-
-.directory-alt img {
-    vertical-align: -30%;
-}
-
-
-
-/*
-  wxWidgets docs specific styles
-  ==============================
-*/
-
-H2 > A.anchor {
-    text-decoration: none;
-    background-color: none;
-    color: black;
-}
-
-H3 > A.anchor {
-    text-decoration: none;
-    background-color: none;
-    color: black;
-}
-
-H4 > A.anchor {
-    text-decoration: none;
-    background-color: none;
-    color: black;
-}
-
-IMG {
-    margin: 20px;
-}
-
-IMG.logo {
-    float: right;
-    margin: 20px;
-}
-
-IMG.appearance {
-    margin: 20px;
-}
-
-.dynheader IMG {
-    margin: 0px;
-}
-
-TABLE.appearance {
-    width: 100%;
-    text-align: center;
-    font-style: italic;
-    font-size: 90%;
-    /*font-weight: bold;*/
-}
-
-TD.green { color: green; }
-TD.orange { color: #ff8000; }
-TD.red { color: red; }
-
-SPAN.literal {
-    text-decoration: none;
-    font-weight: bold;
-    font-family: monospace, fixed;
-}
-
-/* we make all the following <span> tags render the text just like
-  the standard Doxygen @remarks, @see tags do, to obtain a uniform
-  look and feel */
-SPAN.itemdef, SPAN.lib, SPAN.category, SPAN.stdobj, SPAN.styles, SPAN.events, SPAN.flags, SPAN.appearance, SPAN.impl, SPAN.avail {
-    font-weight: bold;
-    line-height: 130%;
-}
-
-SPAN.style, SPAN.event, SPAN.flag {
-    font-weight: bold;
-    color: #880000;
-}
-
-DIV.styleDesc, DIV.eventDesc, DIV.flagDesc {
-    margin-left: 3%;
-    margin-bottom: 1ex;
-}
-
-DIV.eventHandler {
-    margin: 1em;
-    text-indent: 3%;
-}
-
-DIV.eventHandler SPAN {
-    padding: 5px;
-    background-color: #eeeeee;
-    font-family: monospace, fixed;
-}
-
-/* Doxygen defaults the top navigation tabs to a small, bold font,
-  so we reset it here to a larger, normal font. */
-DIV.navigation A SPAN {
-    font-size: 100%;
-    font-weight: normal;
-}
-
-LI {
-    line-height: 115%;
-}
-
-CODE {
-    font-size: 110%;
-    color: #444444;
-}

docs/doxygen/wxwidgets.js

@@ -31,55 +31,17 @@ function setCookie(c_name,value,expiredays)
   ((expiredays==null) ? '' : ';expires='+exdate.toGMTString());
 }
 
-// Reimplementation of changeDisplayState
-function mychangeDisplayState( e )
-{
-  var num=this.id.replace(/[^[0-9]/g,'');
-  var button=this.firstChild;
-  var sectionDiv=document.getElementById('dynsection'+num);
-  if (sectionDiv.style.display=='none'||sectionDiv.style.display==''){
-    sectionDiv.style.display='block';
-    button.src='open.gif';
-  }else{
-    sectionDiv.style.display='none';
-    button.src='closed.gif';
+$(function() {
+
+  var display = getCookie('sectionDiv.style.display');
+  if ( display == '' || display == 'block' ) {
+    $('div.dynheader').each(function() { toggleVisibility(this); });
+    setCookie('sectionDiv.style.display', 'block');
   }
 
-  setCookie( 'sectionDiv.style.display', sectionDiv.style.display );
+  $('div.dynheader').click(function() {
+    var display = $('#' + $(this).attr('id') + '-content').css('display');
+    setCookie('sectionDiv.style.display', display);
+  });
 
-}
-
-window.onload = function myinitDynSections()
-{
-  var divs=document.getElementsByTagName('div');
-  var sectionCounter=1;
-  for(var i=0;i<divs.length-1;i++){
-    if(divs[i].className=='dynheader'&&divs[i+1].className=='dynsection'){
-      var header=divs[i];
-      var section=divs[i+1];
-      var button=header.firstChild;
-      if (button!='IMG'){
-        divs[i].insertBefore(document.createTextNode(' '),divs[i].firstChild);
-        button=document.createElement('img');
-        divs[i].insertBefore(button,divs[i].firstChild);
-      }
-      header.style.cursor='pointer';
-      header.onclick=mychangeDisplayState;
-      header.id='dynheader'+sectionCounter;
-      section.id='dynsection'+sectionCounter;
-
-      var display = getCookie( 'sectionDiv.style.display' );
-      if ( display == '' || display == 'block' ){
-        section.style.display='block'; // default
-        button.src='open.gif';
-      }else{
-        section.style.display='none';
-        button.src='closed.gif';
-      }
-      setCookie( 'sectionDiv.style.display', section.style.display );
-
-      section.style.marginLeft='14px';
-      sectionCounter++;
-    }
-  }
-}
+});

docs/readme.txt

@@ -1,4 +1,4 @@
-               wxWidgets 2.9.2 Release Notes
+               wxWidgets 2.9.3 Release Notes
                =============================
 
 Welcome to the latest release of wxWidgets, a free cross-platform C++
@@ -16,11 +16,11 @@ thread handling, and so on. You can learn more about wxWidgets at
 
 wxWidgets sources are available for download from
 
-        https://sourceforge.net/projects/wxwindows/files/2.9.2/
+        https://sourceforge.net/projects/wxwindows/files/2.9.3/
 
 or
 
-        ftp://ftp.wxwidgets.org/pub/2.9.2/
+        ftp://ftp.wxwidgets.org/pub/2.9.3/
 
 Please see the "Files" section below for the description of various
 files available at these locations.
@@ -29,10 +29,10 @@ files available at these locations.
 A detailed reference manual including in-depth overviews for various
 topics is supplied in various formats and can be accessed online at
 
-        http://docs.wxwidgets.org/2.9.2/
+        http://docs.wxwidgets.org/2.9.3/
 
 
-Note about naming: while 2.9.2 is called a "development" release,
+Note about naming: while 2.9.3 is called a "development" release,
 this only means that API is not guaranteed to remain unchanged in the
 subsequent 2.9.x releases (although it is still likely that it will),
 unlike in the stable 2.8.x branch. We believe the current version is
@@ -160,7 +160,7 @@ Documentation
 -------------
 
 wxWidgets documentation is available online at
-http://docs.wxwidgets.org/2.9.2/ and can also be downloaded in HTML
+http://docs.wxwidgets.org/2.9.3/ and can also be downloaded in HTML
 format. To generate documentation in other formats (PDF, CHM, ...)
 please use the scripts in docs/doxygen directory.
 
@@ -200,4 +200,4 @@ web site.
 
 Have fun!
 
-The wxWidgets Team, July 2011
+The wxWidgets Team, December 2011

docs/tech/tn0011.txt

@@ -20,14 +20,17 @@
    *.spec
    build/osx/wxvers.xcconfig
    docs/changes.txt
+   docs/readme.txt (date needs manual editing)  [NOT UPDATED AUTOMATICALLY]
    docs/doxygen/Doxyfile_inc (PROJECT_NUMBER)
    docs/doxygen/latexdocstart.inc
-   docs/doxygen/mainpages/manual.h (just date)
+   docs/doxygen/mainpages/manual.h (just date)  [NOT UPDATED AUTOMATICALLY]
    docs/msw/install.txt {major release only}
    include/wx/version.h
    include/wx/osx/config_xcode.h
    samples/Info.plist
    samples/docview/Info.plist
+   samples/minimal/Info_carbon.plist
+   samples/minimal/Info_cocoa.plist
    samples/minimal/borland_ide.cpp {major release only}
 
    Do not forget to rebake everything after updating version.bkl!

include/wx/combo.h

@@ -560,7 +560,8 @@ protected:
 
     // Standard textctrl positioning routine. Just give it platform-dependant
     // textctrl coordinate adjustment.
-    virtual void PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdjust );
+    virtual void PositionTextCtrl( int textCtrlXAdjust = 0,
+                                   int textCtrlYAdjust = 0);
 
     // event handlers
     void OnSizeEvent( wxSizeEvent& event );

include/wx/custombgwin.h

@@ -22,6 +22,9 @@ public:
     // Trivial default ctor.
     wxCustomBackgroundWindowBase() { }
 
+    // Also a trivial but virtual -- to suppress g++ warnings -- dtor.
+    virtual ~wxCustomBackgroundWindowBase() { }
+
     // Use the given bitmap to tile the background of this window. This bitmap
     // will show through any transparent children.
     //

include/wx/event.h

@@ -1707,6 +1707,15 @@ public:
     // Get Y position
     wxCoord GetY() const { return m_y; }
 
+    // Can be called from wxEVT_CHAR_HOOK handler to allow generation of normal
+    // key events even though the event had been handled (by default they would
+    // not be generated in this case).
+    void DoAllowNextEvent() { m_allowNext = true; }
+
+    // Return the value of the "allow next" flag, for internal use only.
+    bool IsNextEventAllowed() const { return m_allowNext; }
+
+
     virtual wxEvent *Clone() const { return new wxKeyEvent(*this); }
     virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; }
 
@@ -1750,6 +1759,8 @@ private:
     {
         if ( m_eventType == wxEVT_CHAR_HOOK )
             m_propagationLevel = wxEVENT_PROPAGATE_MAX;
+
+        m_allowNext = false;
     }
 
     // Copy only the event data present in this class, this is used by
@@ -1768,6 +1779,11 @@ private:
 #endif
     }
 
+    // If this flag is true, the normal key events should still be generated
+    // even if wxEVT_CHAR_HOOK had been handled. By default it is false as
+    // handling wxEVT_CHAR_HOOK suppresses all the subsequent events.
+    bool m_allowNext;
+
     DECLARE_DYNAMIC_CLASS(wxKeyEvent)
 };
 

include/wx/features.h

@@ -108,8 +108,16 @@
    If this is defined, wxEvtHandler::Bind<>() is available (not all compilers
    have the required template support for this and in particular under Windows
    where only g++ and MSVC >= 7 currently support it.
+
+   Recent Sun CC versions support this but perhaps older ones can compile this
+   code too, adjust the version check if this is the case (unfortunately we
+   can't easily test for the things used in wx/event.h in configure so we have
+   to maintain these checks manually). The same applies to xlC 7: perhaps
+   earlier versions can compile this code too but they were not tested.
  */
-#if wxCHECK_GCC_VERSION(3, 2) || wxCHECK_VISUALC_VERSION(7)
+#if wxCHECK_GCC_VERSION(3, 2) || wxCHECK_VISUALC_VERSION(7) \
+        || (defined(__SUNCC__) && __SUNCC__ >= 0x5100) \
+        || (defined(__xlC__) && __xlC__ >= 0x700)
     #define wxHAS_EVENT_BIND
 #endif
 

include/wx/gbsizer.h

@@ -115,26 +115,26 @@ public:
     wxGBSizerItem( int width,
                    int height,
                    const wxGBPosition& pos,
-                   const wxGBSpan& span,
-                   int flag,
-                   int border,
-                   wxObject* userData);
+                   const wxGBSpan& span=wxDefaultSpan,
+                   int flag=0,
+                   int border=0,
+                   wxObject* userData=NULL);
 
     // window
     wxGBSizerItem( wxWindow *window,
                    const wxGBPosition& pos,
-                   const wxGBSpan& span,
-                   int flag,
-                   int border,
-                   wxObject* userData );
+                   const wxGBSpan& span=wxDefaultSpan,
+                   int flag=0,
+                   int border=0,
+                   wxObject* userData=NULL );
 
     // subsizer
     wxGBSizerItem( wxSizer *sizer,
                    const wxGBPosition& pos,
-                   const wxGBSpan& span,
-                   int flag,
-                   int border,
-                   wxObject* userData );
+                   const wxGBSpan& span=wxDefaultSpan,
+                   int flag=0,
+                   int border=0,
+                   wxObject* userData=NULL );
 
     // default ctor
     wxGBSizerItem();

include/wx/generic/progdlgg.h

@@ -27,6 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindowDisabler;
 class WXDLLIMPEXP_CORE wxGenericProgressDialog : public wxDialog
 {
 public:
+    wxGenericProgressDialog();
     wxGenericProgressDialog(const wxString& title, const wxString& message,
                             int maximum = 100,
                             wxWindow *parent = NULL,
@@ -34,6 +35,12 @@ public:
 
     virtual ~wxGenericProgressDialog();
 
+    bool Create(const wxString& title,
+                const wxString& message,
+                int maximum = 100,
+                wxWindow *parent = NULL,
+                int style = wxPD_APP_MODAL | wxPD_AUTO_HIDE);
+
     virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL);
     virtual bool Pulse(const wxString& newmsg = wxEmptyString, bool *skip = NULL);
 
@@ -67,15 +74,6 @@ public:
     };
 
 protected:
-    // This ctor is used by the native MSW implementation only.
-    wxGenericProgressDialog(wxWindow *parent, int style);
-
-    void Create(const wxString& title,
-                const wxString& message,
-                int maximum,
-                wxWindow *parent,
-                int style);
-
     // Update just the m_maximum field, this is used by public SetRange() but,
     // unlike it, doesn't update the controls state. This makes it useful for
     // both this class and its derived classes that don't use m_gauge to
@@ -95,7 +93,7 @@ protected:
 
     // Return the progress dialog style. Prefer to use HasPDFlag() if possible.
     int GetPDStyle() const { return m_pdStyle; }
-
+    void SetPDStyle(int pdStyle) { m_pdStyle = pdStyle; }
 
     // Updates estimated times from a given progress bar value and stores the
     // results in provided arguments.
@@ -151,7 +149,7 @@ private:
     static void SetTimeLabel(unsigned long val, wxStaticText *label);
 
     // common part of all ctors
-    void Init(wxWindow *parent, int style);
+    void Init();
 
     // create the label with given text and another one to show the time nearby
     // as the next windows in the sizer, returns the created control

include/wx/msw/button.h

@@ -77,6 +77,9 @@ private:
         m_authNeeded = false;
     }
 
+    void OnCharHook(wxKeyEvent& event);
+
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton);
 };
 

include/wx/osx/cocoa/private/textimpl.h

@@ -105,6 +105,9 @@ public :
     virtual wxString GetStringAtIndex(int pos) const;
 
     virtual int FindString(const wxString& text) const;
+    virtual void Popup();
+    virtual void Dismiss();
+
 private:
     NSComboBox* m_comboBox;
 };

include/wx/osx/combobox.h

@@ -139,6 +139,10 @@ class WXDLLIMPEXP_CORE wxComboBox :
     virtual wxTextWidgetImpl* GetTextPeer() const;
 #endif // wxOSX_USE_CARBON
 
+#if wxOSX_USE_COCOA
+    virtual void Popup();
+    virtual void Dismiss();
+#endif // wxOSX_USE_COCOA
 
 
     // osx specific event handling common for all osx-ports

include/wx/osx/core/private.h

@@ -690,6 +690,8 @@ public :
     virtual void RemoveItem(int WXUNUSED(pos)) {}
 
     virtual void Clear() {}
+    virtual void Popup() {}
+    virtual void Dismiss() {}
 
     virtual wxString GetStringAtIndex(int WXUNUSED(pos)) const { return wxEmptyString; }
 

include/wx/platform.h

@@ -14,10 +14,6 @@
 #ifndef _WX_PLATFORM_H_
 #define _WX_PLATFORM_H_
 
-/* GUI build by default */
-#if !defined(wxUSE_GUI)
-#   define wxUSE_GUI 1
-#endif /* !defined(wxUSE_GUI) */
 
 
 /*
@@ -37,128 +33,14 @@
 #    include <TargetConditionals.h>
 #    include <AvailabilityMacros.h>
 #    include "wx/osx/config_xcode.h"
-#endif
-
-/*
- Handle Darwin gcc universal compilation.  Don't do this in an Apple-
- specific case since no sane compiler should be defining either
- __BIG_ENDIAN__ or __LITTLE_ENDIAN__ unless it really is generating
- code that will be hosted on a machine with the appropriate endianness.
- If a compiler defines neither, assume the user or configure set
- WORDS_BIGENDIAN appropriately.
- */
-#if defined(__BIG_ENDIAN__)
-#    undef WORDS_BIGENDIAN
-#    define WORDS_BIGENDIAN 1
-#elif defined(__LITTLE_ENDIAN__)
-#    undef WORDS_BIGENDIAN
-#elif defined(__WXMAC__) && !defined(WORDS_BIGENDIAN)
-/*  According to Stefan even ancient Mac compilers defined __BIG_ENDIAN__ */
-#    warning "Compiling wxMac with probably wrong endianness"
-#endif
-/* also the 32/64 bit universal builds must be handled accordingly */
-#ifdef __DARWIN__
-#    ifdef __LP64__
-#        undef SIZEOF_VOID_P
-#        undef SIZEOF_LONG
-#        undef SIZEOF_SIZE_T
-#        define SIZEOF_VOID_P 8
-#        define SIZEOF_LONG 8
-#        define SIZEOF_SIZE_T 8
-#    else
-#        undef SIZEOF_VOID_P
-#        undef SIZEOF_LONG
-#        undef SIZEOF_SIZE_T
-#        define SIZEOF_VOID_P 4
-#        define SIZEOF_LONG 4
-#        define SIZEOF_SIZE_T 4
+#    ifndef __WXOSX__
+#        define __WXOSX__ 1
 #    endif
-#endif
-
-/*
- Define various OS X symbols before including wx/chkconf.h which uses them.
- 
- __WXOSX_MAC__ means Mac OS X, non embedded
- __WXOSX_IPHONE__ means OS X iPhone
- */
-
-/*
- Normally all of __WXOSX_XXX__, __WXOSX__ and __WXMAC__ are defined by
- configure but ensure that we also define them if configure was not used for
- whatever reason.
- 
- The primary symbol remains __WXOSX_XXX__ one, __WXOSX__ exists to allow
- checking for any OS X port (Carbon and Cocoa) and __WXMAC__ is an old name
- for it.
- */
-#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__) \
-|| (defined(__DARWIN__) && !wxUSE_GUI)
-#   ifndef __WXOSX__
-#       define __WXOSX__ 1
-#   endif
-#   ifndef __WXMAC__
-#       define __WXMAC__ 1
-#   endif
-#endif
-
-#ifdef __WXOSX__
-/* setup precise defines according to sdk used */
-#   include <TargetConditionals.h>
-#   if defined(__WXOSX_IPHONE__)
-#       if !( defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE )
-#           error "incorrect SDK for an iPhone build"
-#       endif
-#   else
-#       if wxUSE_GUI && !(defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__))
-#           error "one of __WXOSX_IPHONE__, __WXOSX_CARBON__ or __WXOSX_COCOA__ must be defined for the GUI build"
-#       endif
-#       if !( defined(TARGET_OS_MAC) && TARGET_OS_MAC )
-#           error "incorrect SDK for a Mac OS X build"
-#       endif
-#       define __WXOSX_MAC__ 1
-#   endif
-#endif
-
-#ifdef __WXOSX_MAC__
-#    if defined(__MACH__)
-#        include <AvailabilityMacros.h>
-#        ifndef MAC_OS_X_VERSION_10_4
-#           define MAC_OS_X_VERSION_10_4 1040
-#        endif
-#        ifndef MAC_OS_X_VERSION_10_5
-#           define MAC_OS_X_VERSION_10_5 1050
-#        endif
-#        ifndef MAC_OS_X_VERSION_10_6
-#           define MAC_OS_X_VERSION_10_6 1060
-#        endif
-#    else
-#        error "only mach-o configurations are supported"
+#    ifndef __WXMAC__
+#        define __WXMAC__ 1
 #    endif
 #endif
 
-/*
- __WXOSX_OR_COCOA__ is a common define to wxOSX (Carbon or Cocoa) and wxCocoa ports under OS X.
- 
- DO NOT use this define in base library code.  Although wxMac has its own
- private base library (and thus __WXOSX_OR_COCOA__,__WXMAC__ and related defines are
- valid there), wxCocoa shares its library with other ports like wxGTK and wxX11.
- 
- To keep wx authors from screwing this up, only enable __WXOSX_OR_COCOA__ for wxCocoa when
- not compiling the base library.  We determine this by first checking if
- wxUSE_BASE is not defined.  If it is not defined, then we're not buildling
- the base library, and possibly not building wx at all (but actually building
- user code that's using wx). If it is defined then we must check to make sure
- it is not true.  If it is true, we're building base.
- 
- If you want it in the common darwin base library then use __DARWIN__.  You
- can use any Darwin-available libraries like CoreFoundation but please avoid
- using OS X libraries like Carbon or CoreServices.
- 
- */
-#if defined(__WXOSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))
-#   define __WXOSX_OR_COCOA__ 1
-#endif
-
 /*
    first define Windows symbols if they're not defined on the command line: we
    can autodetect everything we need if _WIN32 is defined
@@ -740,6 +622,125 @@
     #define wxCHECK_SUNCC_VERSION(maj, min) (0)
 #endif
 
+/*
+    Handle Darwin gcc universal compilation.  Don't do this in an Apple-
+    specific case since no sane compiler should be defining either
+    __BIG_ENDIAN__ or __LITTLE_ENDIAN__ unless it really is generating
+    code that will be hosted on a machine with the appropriate endianness.
+    If a compiler defines neither, assume the user or configure set
+    WORDS_BIGENDIAN appropriately.
+ */
+#if defined(__BIG_ENDIAN__)
+#    undef WORDS_BIGENDIAN
+#    define WORDS_BIGENDIAN 1
+#elif defined(__LITTLE_ENDIAN__)
+#    undef WORDS_BIGENDIAN
+#elif defined(__WXMAC__) && !defined(WORDS_BIGENDIAN)
+/*  According to Stefan even ancient Mac compilers defined __BIG_ENDIAN__ */
+#    warning "Compiling wxMac with probably wrong endianness"
+#endif
+/* also the 32/64 bit universal builds must be handled accordingly */
+#ifdef __DARWIN__
+#    ifdef __LP64__
+#        undef SIZEOF_VOID_P
+#        undef SIZEOF_LONG
+#        undef SIZEOF_SIZE_T
+#        define SIZEOF_VOID_P 8
+#        define SIZEOF_LONG 8
+#        define SIZEOF_SIZE_T 8
+#    else
+#        undef SIZEOF_VOID_P
+#        undef SIZEOF_LONG
+#        undef SIZEOF_SIZE_T
+#        define SIZEOF_VOID_P 4
+#        define SIZEOF_LONG 4
+#        define SIZEOF_SIZE_T 4
+#    endif
+#endif
+
+/*
+    Define various OS X symbols before including wx/chkconf.h which uses them.
+
+    __WXOSX_MAC__ means Mac OS X, non embedded
+    __WXOSX_IPHONE__ means OS X iPhone
+ */
+
+/*
+    Normally all of __WXOSX_XXX__, __WXOSX__ and __WXMAC__ are defined by
+    configure but ensure that we also define them if configure was not used for
+    whatever reason.
+
+    The primary symbol remains __WXOSX_XXX__ one, __WXOSX__ exists to allow
+    checking for any OS X port (Carbon and Cocoa) and __WXMAC__ is an old name
+    for it.
+ */
+#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__) \
+        || (defined(__DARWIN__) && !wxUSE_GUI)
+#   ifndef __WXOSX__
+#       define __WXOSX__ 1
+#   endif
+#   ifndef __WXMAC__
+#       define __WXMAC__ 1
+#   endif
+#endif
+
+#ifdef __WXOSX__
+/* setup precise defines according to sdk used */
+#   include <TargetConditionals.h>
+#   if defined(__WXOSX_IPHONE__)
+#       if !( defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE )
+#           error "incorrect SDK for an iPhone build"
+#       endif
+#   else
+#       if wxUSE_GUI && !(defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__))
+#           error "one of __WXOSX_IPHONE__, __WXOSX_CARBON__ or __WXOSX_COCOA__ must be defined for the GUI build"
+#       endif
+#       if !( defined(TARGET_OS_MAC) && TARGET_OS_MAC )
+#           error "incorrect SDK for a Mac OS X build"
+#       endif
+#       define __WXOSX_MAC__ 1
+#   endif
+#endif
+
+#ifdef __WXOSX_MAC__
+#    if defined(__MACH__)
+#        include <AvailabilityMacros.h>
+#        ifndef MAC_OS_X_VERSION_10_4
+#           define MAC_OS_X_VERSION_10_4 1040
+#        endif
+#        ifndef MAC_OS_X_VERSION_10_5
+#           define MAC_OS_X_VERSION_10_5 1050
+#        endif
+#        ifndef MAC_OS_X_VERSION_10_6
+#           define MAC_OS_X_VERSION_10_6 1060
+#        endif
+#    else
+#        error "only mach-o configurations are supported"
+#    endif
+#endif
+
+/*
+    __WXOSX_OR_COCOA__ is a common define to wxOSX (Carbon or Cocoa) and wxCocoa ports under OS X.
+
+    DO NOT use this define in base library code.  Although wxMac has its own
+    private base library (and thus __WXOSX_OR_COCOA__,__WXMAC__ and related defines are
+    valid there), wxCocoa shares its library with other ports like wxGTK and wxX11.
+
+    To keep wx authors from screwing this up, only enable __WXOSX_OR_COCOA__ for wxCocoa when
+    not compiling the base library.  We determine this by first checking if
+    wxUSE_BASE is not defined.  If it is not defined, then we're not buildling
+    the base library, and possibly not building wx at all (but actually building
+    user code that's using wx). If it is defined then we must check to make sure
+    it is not true.  If it is true, we're building base.
+
+    If you want it in the common darwin base library then use __DARWIN__.  You
+    can use any Darwin-available libraries like CoreFoundation but please avoid
+    using OS X libraries like Carbon or CoreServices.
+
+ */
+#if defined(__WXOSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))
+#   define __WXOSX_OR_COCOA__ 1
+#endif
 
 /*
    check the consistency of the settings in setup.h: note that this must be

include/wx/popupwin.h

@@ -132,10 +132,9 @@ protected:
     // get alerted when child gets deleted from under us
     void OnDestroy(wxWindowDestroyEvent& event);
 
-    // wxOSX/Carbon doesn't generate mouse capture loss events currently so
-    // poll for the capture loss ourselves.
-#if defined(__WXMAC__) && wxOSX_USE_CARBON
-    // check if the mouse needs captured or released
+#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_CARBON)
+    // Check if the mouse needs to be captured or released: we must release
+    // when it's inside our window if we want the embedded controls to work.
     void OnIdle(wxIdleEvent& event);
 #endif
 

include/wx/sizer.h

@@ -251,10 +251,10 @@ class WXDLLIMPEXP_CORE wxSizerItem : public wxObject
 public:
     // window
     wxSizerItem( wxWindow *window,
-                 int proportion,
-                 int flag,
-                 int border,
-                 wxObject* userData );
+                 int proportion=0,
+                 int flag=0,
+                 int border=0,
+                 wxObject* userData=NULL );
 
     // window with flags
     wxSizerItem(wxWindow *window, const wxSizerFlags& flags)
@@ -266,10 +266,10 @@ public:
 
     // subsizer
     wxSizerItem( wxSizer *sizer,
-                 int proportion,
-                 int flag,
-                 int border,
-                 wxObject* userData );
+                 int proportion=0,
+                 int flag=0,
+                 int border=0,
+                 wxObject* userData=NULL );
 
     // sizer with flags
     wxSizerItem(wxSizer *sizer, const wxSizerFlags& flags)
@@ -282,10 +282,10 @@ public:
     // spacer
     wxSizerItem( int width,
                  int height,
-                 int proportion,
-                 int flag,
-                 int border,
-                 wxObject* userData);
+                 int proportion=0,
+                 int flag=0,
+                 int border=0,
+                 wxObject* userData=NULL);
 
     // spacer with flags
     wxSizerItem(int width, int height, const wxSizerFlags& flags)

include/wx/utils.h

@@ -334,7 +334,11 @@ enum
 
     // under Windows, don't hide the child even if it's IO is redirected (this
     // is done by default)
-    wxEXEC_NOHIDE   = 2,
+    wxEXEC_SHOW_CONSOLE   = 2,
+
+    // deprecated synonym for wxEXEC_SHOW_CONSOLE, use the new name as it's
+    // more clear
+    wxEXEC_NOHIDE = wxEXEC_SHOW_CONSOLE,
 
     // under Unix, if the process is the group leader then passing wxKILL_CHILDREN to wxKill
     // kills all children as well as pid
@@ -350,6 +354,10 @@ enum
     // until the child process finishes
     wxEXEC_NOEVENTS = 16,
 
+    // under Windows, hide the console of the child process if it has one, even
+    // if its IO is not redirected
+    wxEXEC_HIDE_CONSOLE = 32,
+
     // convenient synonym for flags given system()-like behaviour
     wxEXEC_BLOCK = wxEXEC_SYNC | wxEXEC_NOEVENTS
 };

interface/wx/combobox.h

@@ -285,10 +285,11 @@ public:
     /**
         Shows the list box portion of the combo box.
 
-        Currently only implemented in wxMSW and wxGTK.
+        Currently this method is implemented in wxMSW, wxGTK and wxOSX/Cocoa.
 
         Notice that calling this function will generate a
-        @c wxEVT_COMMAND_COMBOBOX_DROPDOWN event.
+        @c wxEVT_COMMAND_COMBOBOX_DROPDOWN event except under wxOSX where
+        generation of this event is not supported at all.
 
         @since 2.9.1
     */
@@ -297,15 +298,16 @@ public:
     /**
         Hides the list box portion of the combo box.
 
-        Currently only implemented in wxMSW and wxGTK.
+        Currently this method is implemented in wxMSW, wxGTK and wxOSX/Cocoa.
 
         Notice that calling this function will generate a
-        @c wxEVT_COMMAND_COMBOBOX_CLOSEUP event.
+        @c wxEVT_COMMAND_COMBOBOX_CLOSEUP event except under wxOSX where
+        generation of this event is not supported at all.
 
         @since 2.9.1
     */
     virtual void Dismiss();
-    
+
     virtual int GetSelection() const;
     virtual void GetSelection(long *from, long *to) const;
     virtual void SetSelection(int n);

interface/wx/dataview.h

@@ -742,9 +742,9 @@ wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_DROP;
     @event{EVT_DATAVIEW_ITEM_ACTIVATED(id, func)}
            Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED event.
     @event{EVT_DATAVIEW_ITEM_START_EDITING(id, func)}
-           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED event. This
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING event. This
            event can be vetoed in order to prevent editing on an item by item
-           basis. Still experimental.
+           basis.
     @event{EVT_DATAVIEW_ITEM_EDITING_STARTED(id, func)}
            Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED event.
     @event{EVT_DATAVIEW_ITEM_EDITING_DONE(id, func)}

interface/wx/event.h

@@ -1373,13 +1373,19 @@ enum wxKeyCategoryFlags
         events and so gives the parent window an opportunity to modify the
         keyboard handling of its children, e.g. it is used internally by
         wxWidgets in some ports to intercept pressing Esc key in any child of a
-        dialog to close the dialog itself when it's pressed. If the event is
-        handled, i.e. the handler doesn't call wxEvent::Skip(), neither @c
-        wxEVT_KEY_DOWN nor @c wxEVT_CHAR events will be generated (although @c
-        wxEVT_KEY_UP still will be). Notice that this event is not generated
-        when the mouse is captured as it is considered that the window which
-        has the capture should receive all the keyboard events too without
-        allowing its parent wxTopLevelWindow to interfere with their processing.
+        dialog to close the dialog itself when it's pressed. By default, if
+        this event is handled, i.e. the handler doesn't call wxEvent::Skip(),
+        neither @c wxEVT_KEY_DOWN nor @c wxEVT_CHAR events will be generated
+        (although @c wxEVT_KEY_UP still will be), i.e. it replaces the normal
+        key events. However by calling the special DoAllowNextEvent() method
+        you can handle @c wxEVT_CHAR_HOOK and still allow normal events
+        generation. This is something that is rarely useful but can be required
+        if you need to prevent a parent @c wxEVT_CHAR_HOOK handler from running
+        without suppressing the normal key events. Finally notice that this
+        event is not generated when the mouse is captured as it is considered
+        that the window which has the capture should receive all the keyboard
+        events too without allowing its parent wxTopLevelWindow to interfere
+        with their processing.
     @endEventTable
 
     @see wxKeyboardState
@@ -1522,6 +1528,34 @@ public:
         Returns the Y position (in client coordinates) of the event.
     */
     wxCoord GetY() const;
+
+    /**
+        Allow normal key events generation.
+
+        Can be called from @c wxEVT_CHAR_HOOK handler to indicate that the
+        generation of normal events should @em not be suppressed, as it happens
+        by default when this event is handled.
+
+        The intended use of this method is to allow some window object to
+        prevent @c wxEVT_CHAR_HOOK handler in its parent window from running by
+        defining its own handler for this event. Without calling this method,
+        this would result in not generating @c wxEVT_KEY_DOWN nor @c wxEVT_CHAR
+        events at all but by calling it you can ensure that these events would
+        still be generated, even if @c wxEVT_CHAR_HOOK event was handled.
+
+        @since 2.9.3
+     */
+    void DoAllowNextEvent();
+
+    /**
+        Returns @true if DoAllowNextEvent() had been called, @false by default.
+
+        This method is used by wxWidgets itself to determine whether the normal
+        key events should be generated after @c wxEVT_CHAR_HOOK processing.
+
+        @since 2.9.3
+     */
+    bool IsNextEventAllowed() const;
 };
 
 
@@ -2852,12 +2886,8 @@ public:
     To intercept this event, use the EVT_ERASE_BACKGROUND macro in an event table
     definition.
 
-    You must call wxEraseEvent::GetDC and use the returned device context if it is
-    non-@NULL. If it is @NULL, create your own temporary wxClientDC object.
-
-    @remarks
-        Use the device context returned by GetDC to draw on, don't create
-        a wxPaintDC in the event handler.
+    You must use the device context returned by GetDC() to draw on, don't create
+    a wxPaintDC in the event handler.
 
     @beginEventTable{wxEraseEvent}
     @event{EVT_ERASE_BACKGROUND(func)}
@@ -2879,6 +2909,8 @@ public:
 
     /**
         Returns the device context associated with the erase event to draw on.
+
+        The returned pointer is never @NULL.
     */
     wxDC* GetDC() const;
 };

interface/wx/fileconf.h

@@ -27,9 +27,21 @@
 class wxFileConfig : public wxConfigBase
 {
 public:
+    /**
+        Constructor allowing to choose the file names to use.
 
-    // New constructor: one size fits all. Specify wxCONFIG_USE_LOCAL_FILE or
-    // wxCONFIG_USE_GLOBAL_FILE to say which files should be used.
+        If @a localFilename and/or @a globalFilename are explicitly specified,
+        they are used as the names of the user and system-wide configuration
+        files (the latter is only read by the program while the former is read
+        from and written to). Otherwise the behaviour depends on @a style
+        parameter. If it includes ::wxCONFIG_USE_LOCAL_FILE, then the local
+        file name is constructed from the information in @a appName and @a
+        vendorName arguments in a system-dependent way. If
+        ::wxCONFIG_USE_GLOBAL_FILE is not specified at all (and @a
+        globalFilename is empty) then the system-wide file is not used at all.
+        Otherwise its name and path are also constructed in the way appropriate
+        for the current platform from the application and vendor names.
+     */
     wxFileConfig(const wxString& appName = wxEmptyString,
                const wxString& vendorName = wxEmptyString,
                const wxString& localFilename = wxEmptyString,

interface/wx/gbsizer.h

@@ -231,20 +231,20 @@ public:
         Construct a sizer item for tracking a spacer.
     */
     wxGBSizerItem(int width, int height, const wxGBPosition& pos,
-                  const wxGBSpan& span, int flag, int border,
-                  wxObject* userData);
+                  const wxGBSpan& span=wxDefaultSpan, int flag=0, int border=0,
+                  wxObject* userData=NULL);
     /**
         Construct a sizer item for tracking a window.
     */
     wxGBSizerItem(wxWindow* window, const wxGBPosition& pos,
-                  const wxGBSpan& span, int flag, int border,
-                  wxObject* userData);
+                  const wxGBSpan& span=wxDefaultSpan, int flag=0, int border=0,
+                  wxObject* userData=NULL);
     /**
         Construct a sizer item for tracking a subsizer.
     */
     wxGBSizerItem(wxSizer* sizer, const wxGBPosition& pos,
-                  const wxGBSpan& span, int flag, int border,
-                  wxObject* userData);
+                  const wxGBSpan& span=wxDefaultSpan, int flag=0, int border=0,
+                  wxObject* userData=NULL);
 
     /**
         Get the row and column of the endpoint of this item.
@@ -291,6 +291,10 @@ public:
         is successful and after the next Layout the item will be resized.
     */
     bool SetSpan(const wxGBSpan& span);
+
+    
+    wxGridBagSizer* GetGBSizer() const;
+    void SetGBSizer(wxGridBagSizer* sizer);
 };
 
 
@@ -348,3 +352,5 @@ public:
     bool operator==(const wxGBSpan& o) const;
 };
 
+
+const wxGBSpan wxDefaultSpan;

interface/wx/scrolwin.h

@@ -103,6 +103,34 @@ enum wxScrollbarVisibility
            Uses a backing pixmap to speed refreshes. Motif only.
     @endStyleTable
 
+
+    @beginEventEmissionTable{wxScrollWinEvent}
+    @event{EVT_SCROLLWIN(func)}
+        Process all scroll events.
+    @event{EVT_SCROLLWIN_TOP(func)}
+        Process @c wxEVT_SCROLLWIN_TOP scroll-to-top events.
+    @event{EVT_SCROLLWIN_BOTTOM(func)}
+        Process @c wxEVT_SCROLLWIN_BOTTOM scroll-to-bottom events.
+    @event{EVT_SCROLLWIN_LINEUP(func)}
+        Process @c wxEVT_SCROLLWIN_LINEUP line up events.
+    @event{EVT_SCROLLWIN_LINEDOWN(func)}
+        Process @c wxEVT_SCROLLWIN_LINEDOWN line down events.
+    @event{EVT_SCROLLWIN_PAGEUP(func)}
+        Process @c wxEVT_SCROLLWIN_PAGEUP page up events.
+    @event{EVT_SCROLLWIN_PAGEDOWN(func)}
+        Process @c wxEVT_SCROLLWIN_PAGEDOWN page down events.
+    @event{EVT_SCROLLWIN_THUMBTRACK(func)}
+        Process @c wxEVT_SCROLLWIN_THUMBTRACK thumbtrack events
+        (frequent events sent as the user drags the thumbtrack).
+    @event{EVT_SCROLLWIN_THUMBRELEASE(func)}
+        Process @c wxEVT_SCROLLWIN_THUMBRELEASE thumb release events.
+    @endEventTable
+
+    @note
+        Don't confuse wxScrollWinEvents generated by this class with
+        wxScrollEvent objects generated by wxScrollBar and wxSlider.
+
+
     @remarks
     Use wxScrolled for applications where the user scrolls by a fixed amount,
     and where a 'page' can be interpreted to be the current visible portion of

interface/wx/sizer.h

@@ -1007,17 +1007,17 @@ public:
     /**
         Construct a sizer item for tracking a spacer.
     */
-    wxSizerItem(int width, int height, int proportion, int flag,
-                int border, wxObject* userData);
+    wxSizerItem(int width, int height, int proportion=0, int flag=0,
+                int border=0, wxObject* userData=NULL);
 
     //@{
     /**
         Construct a sizer item for tracking a window.
     */
     wxSizerItem(wxWindow* window, const wxSizerFlags& flags);
-    wxSizerItem(wxWindow* window, int proportion, int flag,
-                int border,
-                wxObject* userData);
+    wxSizerItem(wxWindow* window, int proportion=0, int flag=0,
+                int border=0,
+                wxObject* userData=NULL);
     //@}
 
     //@{
@@ -1025,9 +1025,9 @@ public:
         Construct a sizer item for tracking a subsizer.
     */
     wxSizerItem(wxSizer* sizer, const wxSizerFlags& flags);
-    wxSizerItem(wxSizer* sizer, int proportion, int flag,
-                int border,
-                wxObject* userData);
+    wxSizerItem(wxSizer* sizer, int proportion=0, int flag=0,
+                int border=0,
+                wxObject* userData=NULL);
     //@}
 
     /**

interface/wx/stopwatch.h

@@ -61,6 +61,10 @@ public:
 
     /**
         (Re)starts the stop watch with a given initial value.
+
+        The stopwatch will always be running after calling Start(), even if
+        Pause() had been called before and even if it had been called multiple
+        times.
     */
     void Start(long milliseconds = 0);
 

interface/wx/utils.h

@@ -816,6 +816,80 @@ struct wxExecuteEnv
     wxEnvVariableHashMap env;
 };
 
+/**
+    Bit flags that can be used with wxExecute().
+ */
+enum
+{
+    /**
+        Execute the process asynchronously.
+
+        Notice that, due to its value, this is the default.
+     */
+    wxEXEC_ASYNC    = 0,
+
+    /**
+        Execute the process synchronously.
+     */
+    wxEXEC_SYNC     = 1,
+
+    /**
+        Always show the child process console under MSW.
+
+        The child console is hidden by default if the child IO is redirected,
+        this flag allows to change this and show it nevertheless.
+
+        This flag is ignored under the other platforms.
+     */
+    wxEXEC_SHOW_CONSOLE   = 2,
+
+    /**
+        Make the new process a group leader.
+
+        Under Unix, if the process is the group leader then passing
+        wxKILL_CHILDREN to wxKill() kills all children as well as pid.
+
+        This flag is currently ignored under MSW.
+     */
+    wxEXEC_MAKE_GROUP_LEADER = 4,
+
+    /**
+        Don't disable the program UI while running the child synchronously.
+
+        By default synchronous execution disables all program windows to avoid
+        that the user interacts with the program while the child process is
+        running, you can use this flag to prevent this from happening.
+
+        This flag can only be used with ::wxEXEC_SYNC.
+     */
+    wxEXEC_NODISABLE = 8,
+
+    /**
+        Don't dispatch events while the child process is executed.
+
+        By default, the event loop is run while waiting for synchronous
+        execution to complete and this flag can be used to simply block the
+        main process until the child process finishes
+
+        This flag can only be used with ::wxEXEC_SYNC.
+     */
+    wxEXEC_NOEVENTS = 16,
+
+    /**
+        Hide child process console under MSW.
+
+        Under MSW, hide the console of the child process if it has one,
+        even if its IO is not redirected.
+
+        This flag is ignored under the other platforms.
+     */
+    wxEXEC_HIDE_CONSOLE = 32,
+
+    /**
+        Convenient synonym for flags given system()-like behaviour.
+     */
+    wxEXEC_BLOCK = wxEXEC_SYNC | wxEXEC_NOEVENTS
+};
 /**
     Executes another program in Unix or Windows.
 
@@ -847,12 +921,15 @@ struct wxExecuteEnv
     wxProcess::OnTerminate() will be called when the process finishes.
     Specifying this parameter also allows you to redirect the standard input
     and/or output of the process being launched by calling
-    wxProcess::Redirect(). If the child process IO is redirected, under Windows
-    the process window is not shown by default (this avoids having to flush an
-    unnecessary console for the processes which don't create any windows
-    anyhow) but a @c wxEXEC_NOHIDE flag can be used to prevent this from
-    happening, i.e. with this flag the child process window will be shown
-    normally.
+    wxProcess::Redirect().
+
+    Under Windows, when launching a console process its console is shown by
+    default but hidden if its IO is redirected. Both of these default
+    behaviours may be overridden: if ::wxEXEC_HIDE_CONSOLE is specified, the
+    console will never be shown. If ::wxEXEC_SHOW_CONSOLE is used, the console
+    will be shown even if the child process IO is redirected. Neither of these
+    flags affect non-console Windows applications or does anything under the
+    other systems.
 
     Under Unix the flag @c wxEXEC_MAKE_GROUP_LEADER may be used to ensure that
     the new process is a group leader (this will create a new session if
@@ -876,9 +953,9 @@ struct wxExecuteEnv
         string, i.e. "emacs file.txt".
     @param flags
         Must include either wxEXEC_ASYNC or wxEXEC_SYNC and can also include
-        wxEXEC_NOHIDE, wxEXEC_MAKE_GROUP_LEADER (in either case) or
-        wxEXEC_NODISABLE and wxEXEC_NOEVENTS or wxEXEC_BLOCK, which is equal to
-        their combination, in wxEXEC_SYNC case.
+        wxEXEC_SHOW_CONSOLE, wxEXEC_HIDE_CONSOLE, wxEXEC_MAKE_GROUP_LEADER (in
+        either case) or wxEXEC_NODISABLE and wxEXEC_NOEVENTS or wxEXEC_BLOCK,
+        which is equal to their combination, in wxEXEC_SYNC case.
     @param callback
         An optional pointer to wxProcess.
     @param env
@@ -914,10 +991,7 @@ long wxExecute(const wxString& command, int flags = wxEXEC_ASYNC,
         additional ones are the command parameters and the array must be
         terminated with a @NULL pointer.
     @param flags
-        Must include either wxEXEC_ASYNC or wxEXEC_SYNC and can also include
-        wxEXEC_NOHIDE, wxEXEC_MAKE_GROUP_LEADER (in either case) or
-        wxEXEC_NODISABLE and wxEXEC_NOEVENTS or wxEXEC_BLOCK, which is equal to
-        their combination, in wxEXEC_SYNC case.
+        Same as for wxExecute(const wxString&,int,wxProcess*) overload.
     @param callback
         An optional pointer to wxProcess.
     @param env
@@ -959,9 +1033,7 @@ long wxExecute(wchar_t** argv, int flags = wxEXEC_ASYNC,
     @param output
         The string array where the stdout of the executed process is saved.
     @param flags
-        May include wxEXEC_NOHIDE, wxEXEC_MAKE_GROUP_LEADER (in either case) or
-        wxEXEC_NODISABLE and wxEXEC_NOEVENTS or wxEXEC_BLOCK, which is equal to
-        their combination. wxEXEC_SYNC is always implicitly added to the flags.
+        Combination of flags to which ::wxEXEC_SYNC is always implicitly added.
     @param env
         An optional pointer to additional parameters for the child process,
         such as its initial working directory and environment variables. This
@@ -997,9 +1069,7 @@ long wxExecute(const wxString& command, wxArrayString& output, int flags = 0,
     @param errors
         The string array where the stderr of the executed process is saved.
     @param flags
-        May include wxEXEC_NOHIDE, wxEXEC_MAKE_GROUP_LEADER (in either case) or
-        wxEXEC_NODISABLE and wxEXEC_NOEVENTS or wxEXEC_BLOCK, which is equal to
-        their combination. wxEXEC_SYNC is always implicitly added to the flags.
+        Combination of flags to which ::wxEXEC_SYNC is always implicitly added.
     @param env
         An optional pointer to additional parameters for the child process,
         such as its initial working directory and environment variables. This

interface/wx/window.h

@@ -1697,13 +1697,18 @@ public:
 
     /**
         Sets the background colour of the window.
+
+        Notice that as with SetForegroundColour(), setting the background
+        colour of a native control may not affect the entire control and could
+        be not supported at all depending on the control and platform.
+
         Please see InheritAttributes() for explanation of the difference between
         this method and SetOwnBackgroundColour().
 
         @param colour
             The colour to be used as the background colour; pass
             wxNullColour to reset to the default colour.
-            Note that you may want to use wxSystemSettings::GetColour() to retrieve 
+            Note that you may want to use wxSystemSettings::GetColour() to retrieve
             a suitable colour to use rather than setting an hard-coded one.
 
         @remarks The background colour is usually painted by the default
@@ -1780,6 +1785,13 @@ public:
 
     /**
         Sets the foreground colour of the window.
+
+        The meaning of foreground colour varies according to the window class;
+        it may be the text colour or other colour, or it may not be used at
+        all. Additionally, not all native controls support changing their
+        foreground colour so this method may change their colour only partially
+        or even not at all.
+
         Please see InheritAttributes() for explanation of the difference between
         this method and SetOwnForegroundColour().
 
@@ -1787,9 +1799,6 @@ public:
             The colour to be used as the foreground colour; pass
             wxNullColour to reset to the default colour.
 
-        @remarks The meaning of foreground colour varies according to the window class;
-                 it may be the text colour or other colour, or it may not be used at all.
-
         @return @true if the colour was really changed, @false if it was already set
                 to this colour and nothing was done.
 

misc/scripts/inc_release

@@ -86,6 +86,11 @@ run_sed build/osx/wxvers.xcconfig \
 run_sed build/tools/bld_chm_exe.bat \
     "/^SET WXW_VER=/s/$ver_for_sed/$ver_string_new/"
 
+run_sed docs/readme.txt \
+    "/wxWidgets /s/$ver_for_sed/$ver_string_new/" \
+    "/\//s/$ver_for_sed/$ver_string_new/" \
+    "/naming: while/s/$ver_for_sed/$ver_string_new/" 
+
 run_sed docs/doxygen/Doxyfile_inc \
     "/^PROJECT_NUMBER/s/$ver_for_sed/$ver_string_new/"
 

samples/exec/exec.cpp

@@ -108,7 +108,6 @@ public:
     void OnEndBusyCursor(wxCommandEvent& event);
 
     void OnSyncExec(wxCommandEvent& event);
-    void OnSyncNoEventsExec(wxCommandEvent& event);
     void OnAsyncExec(wxCommandEvent& event);
     void OnShell(wxCommandEvent& event);
     void OnExecWithRedirect(wxCommandEvent& event);
@@ -141,6 +140,8 @@ private:
                     const wxArrayString& output,
                     const wxString& title);
 
+    int GetExecFlags() const;
+
     void DoAsyncExec(const wxString& cmd);
 
     void AddAsyncProcess(MyProcess *process) { m_allAsync.push_back(process); }
@@ -313,7 +314,6 @@ enum
     Exec_BeginBusyCursor,
     Exec_EndBusyCursor,
     Exec_SyncExec = 200,
-    Exec_SyncNoEventsExec,
     Exec_AsyncExec,
     Exec_Shell,
     Exec_POpen,
@@ -324,6 +324,9 @@ enum
     Exec_DDERequest,
     Exec_Redirect,
     Exec_Pipe,
+    Exec_Flags_HideConsole,
+    Exec_Flags_ShowConsole,
+    Exec_Flags_NoEvents,
     Exec_About = wxID_ABOUT,
 
     // control ids
@@ -350,7 +353,6 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Exec_EndBusyCursor,  MyFrame::OnEndBusyCursor)
 
     EVT_MENU(Exec_SyncExec, MyFrame::OnSyncExec)
-    EVT_MENU(Exec_SyncNoEventsExec, MyFrame::OnSyncNoEventsExec)
     EVT_MENU(Exec_AsyncExec, MyFrame::OnAsyncExec)
     EVT_MENU(Exec_Shell, MyFrame::OnShell)
     EVT_MENU(Exec_Redirect, MyFrame::OnExecWithRedirect)
@@ -457,11 +459,17 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuFile->AppendSeparator();
     menuFile->Append(Exec_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
 
+    wxMenu *flagsMenu = new wxMenu;
+    flagsMenu->AppendCheckItem(Exec_Flags_HideConsole, "Always &hide console");
+    flagsMenu->AppendCheckItem(Exec_Flags_ShowConsole, "Always &show console");
+    flagsMenu->AppendCheckItem(Exec_Flags_NoEvents, "Disable &events",
+                               "This flag is valid for sync execution only");
+
     wxMenu *execMenu = new wxMenu;
+    execMenu->AppendSubMenu(flagsMenu, "Execution flags");
+    execMenu->AppendSeparator();
     execMenu->Append(Exec_SyncExec, wxT("Sync &execution...\tCtrl-E"),
                      wxT("Launch a program and return when it terminates"));
-    execMenu->Append(Exec_SyncNoEventsExec, wxT("Sync execution and &block...\tCtrl-B"),
-                     wxT("Launch a program and block until it terminates"));
     execMenu->Append(Exec_AsyncExec, wxT("&Async execution...\tCtrl-A"),
                      wxT("Launch a program and return immediately"));
     execMenu->Append(Exec_Shell, wxT("Execute &shell command...\tCtrl-S"),
@@ -812,10 +820,26 @@ static bool QueryExec(wxString& cmd, wxExecuteEnv& env)
 // event handlers: exec menu
 // ----------------------------------------------------------------------------
 
+int MyFrame::GetExecFlags() const
+{
+    wxMenuBar* const mbar = GetMenuBar();
+
+    int flags = 0;
+
+    if ( mbar->IsChecked(Exec_Flags_HideConsole) )
+        flags |= wxEXEC_HIDE_CONSOLE;
+    if ( mbar->IsChecked(Exec_Flags_ShowConsole) )
+        flags |= wxEXEC_SHOW_CONSOLE;
+    if ( mbar->IsChecked(Exec_Flags_NoEvents) )
+        flags |= wxEXEC_NOEVENTS;
+
+    return flags;
+}
+
 void MyFrame::DoAsyncExec(const wxString& cmd)
 {
     MyProcess * const process = new MyProcess(this, cmd);
-    m_pidLast = wxExecute(cmd, wxEXEC_ASYNC, process);
+    m_pidLast = wxExecute(cmd, wxEXEC_ASYNC | GetExecFlags(), process);
     if ( !m_pidLast )
     {
         wxLogError(wxT("Execution of '%s' failed."), cmd.c_str());
@@ -843,26 +867,7 @@ void MyFrame::OnSyncExec(wxCommandEvent& WXUNUSED(event))
 
     wxLogStatus( wxT("'%s' is running please wait..."), cmd.c_str() );
 
-    int code = wxExecute(cmd, wxEXEC_SYNC, NULL, &env);
-
-    wxLogStatus(wxT("Process '%s' terminated with exit code %d."),
-        cmd.c_str(), code);
-
-    m_cmdLast = cmd;
-}
-
-void MyFrame::OnSyncNoEventsExec(wxCommandEvent& WXUNUSED(event))
-{
-    wxString cmd = wxGetTextFromUser(wxT("Enter the command: "),
-                                     DIALOG_TITLE,
-                                     m_cmdLast);
-
-    if ( !cmd )
-        return;
-
-    wxLogStatus( wxT("'%s' is running please wait..."), cmd.c_str() );
-
-    int code = wxExecute(cmd, wxEXEC_BLOCK);
+    int code = wxExecute(cmd, wxEXEC_SYNC | GetExecFlags(), NULL, &env);
 
     wxLogStatus(wxT("Process '%s' terminated with exit code %d."),
         cmd.c_str(), code);

samples/uiaction/uiaction.cpp

@@ -52,7 +52,8 @@
 enum
 {
     // menu items
-    RunSimulation = 1
+    RunSimulation = 1,
+    SimulateText
 };
 
 // ----------------------------------------------------------------------------
@@ -77,6 +78,7 @@ public:
 
     void OnButtonPressed(wxCommandEvent& event);
     void OnRunSimulation(wxCommandEvent& event);
+    void OnSimulateText(wxCommandEvent& event);
     void OnExit(wxCommandEvent& WXUNUSED(event)) { Close(); }
 
 private:
@@ -89,6 +91,7 @@ private:
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_BUTTON(wxID_ANY, MyFrame::OnButtonPressed)
     EVT_MENU(RunSimulation, MyFrame::OnRunSimulation)
+    EVT_MENU(SimulateText, MyFrame::OnSimulateText)
     EVT_MENU(wxID_EXIT, MyFrame::OnExit)
 END_EVENT_TABLE()
 
@@ -137,7 +140,11 @@ MyFrame::MyFrame(const wxString& title)
     wxMenu *fileMenu = new wxMenu;
 
     fileMenu->Append(wxID_NEW, "&New File...", "Open a new file");
-    fileMenu->Append(RunSimulation, "&Run Simulation...", "Run the UI action simulation");
+    fileMenu->Append(RunSimulation, "&Run Simulation",
+                     "Run predefined UI action simulation");
+    fileMenu->Append(SimulateText, "Simulate &text input...",
+                     "Enter text to simulate");
+    fileMenu->AppendSeparator();
 
     fileMenu->Append(wxID_EXIT, "E&xit\tAlt-X", "Quit this program");
 
@@ -189,6 +196,26 @@ void MyFrame::OnRunSimulation(wxCommandEvent& WXUNUSED(event))
 
 }
 
+void MyFrame::OnSimulateText(wxCommandEvent& WXUNUSED(event))
+{
+    static wxString s_text;
+    const wxString text = wxGetTextFromUser
+                          (
+                            "Enter text to simulate: ",
+                            "wxUIActionSimulator wxWidgets Sample",
+                            s_text,
+                            this
+                          );
+    if ( text.empty() )
+        return;
+
+    s_text = text;
+
+    wxUIActionSimulator sim;
+    m_text->SetFocus();
+    sim.Text(s_text);
+}
+
 void MyFrame::OnButtonPressed(wxCommandEvent& WXUNUSED(event))
 {
     m_text->AppendText("Button pressed.\n");

setup.h.in

@@ -818,10 +818,6 @@
  * Use the Hildon 2.0 framework
  */
 #define wxUSE_LIBHILDON2 0
-/*
- * Have glibc2
- */
-#define wxHAVE_GLIBC2 0
 /*
  * Use libXpm
  */

setup.h_vms

@@ -862,10 +862,6 @@ typedef pid_t GPid;
 
 #define wxUSE_DC_TRANSFORM_MATRIX 1
 
-/*
- * Have glibc2
- */
-#define wxHAVE_GLIBC2 0
 /*
  * Use libXpm
  */

src/common/datavcmn.cpp

@@ -451,15 +451,12 @@ void wxDataViewIndexListModel::RowDeleted( unsigned int row )
     m_ordered = false;
 
     wxDataViewItem item( m_hash[row] );
-    /* wxDataViewModel:: */ ItemDeleted( wxDataViewItem(0), item );
     m_hash.RemoveAt( row );
+    /* wxDataViewModel:: */ ItemDeleted( wxDataViewItem(0), item );
 }
 
 void wxDataViewIndexListModel::RowsDeleted( const wxArrayInt &rows )
 {
-    wxArrayInt sorted = rows;
-    sorted.Sort( my_sort );
-
     m_ordered = false;
 
     wxDataViewItemArray array;
@@ -469,10 +466,13 @@ void wxDataViewIndexListModel::RowsDeleted( const wxArrayInt &rows )
             wxDataViewItem item( m_hash[rows[i]] );
             array.Add( item );
     }
-    /* wxDataViewModel:: */ ItemsDeleted( wxDataViewItem(0), array );
 
+    wxArrayInt sorted = rows;
+    sorted.Sort( my_sort );
     for (i = 0; i < sorted.GetCount(); i++)
            m_hash.RemoveAt( sorted[i] );
+
+    /* wxDataViewModel:: */ ItemsDeleted( wxDataViewItem(0), array );
 }
 
 void wxDataViewIndexListModel::RowChanged( unsigned int row )
@@ -672,6 +672,8 @@ wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype,
 
 wxDataViewRendererBase::~wxDataViewRendererBase()
 {
+    if ( m_editorCtrl )
+        DestroyEditControl();
 }
 
 wxDataViewCtrl* wxDataViewRendererBase::GetView() const

src/common/dcgraph.cpp

@@ -382,7 +382,10 @@ void wxGCDCImpl::SetTextForeground( const wxColour &col )
 {
     wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::SetTextForeground - invalid DC") );
 
-    if ( col != m_textForegroundColour )
+    // don't set m_textForegroundColour to an invalid colour as we'd crash
+    // later then (we use m_textForegroundColour.GetColor() without checking
+    // in a few places)
+    if ( col.IsOk() && col != m_textForegroundColour )
     {
         m_textForegroundColour = col;
         m_graphicContext->SetFont( m_font, m_textForegroundColour );

src/common/descrip.mms

@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 10 November 2011                                                     *
+# Date : 6 December 2011                                                     *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -224,7 +224,7 @@ OBJECTS3=listctrlcmn.obj,socketiohandler.obj,fdiodispatcher.obj,\
 		statbmpcmn.obj,dirctrlcmn.obj,gridcmn.obj,odcombocmn.obj,\
 		spinbtncmn.obj,scrolbarcmn.obj,colourdata.obj,fontdata.obj,\
 		valnum.obj,numformatter.obj,markupparser.obj,\
-		affinematrix2d.obj,richtooltipcmn.obj,persist.obj
+		affinematrix2d.obj,richtooltipcmn.obj,persist.obj,time.obj
 
 OBJECTS_MOTIF=radiocmn.obj,combocmn.obj
 
@@ -428,7 +428,7 @@ SOURCES = \
 		bmpbtncmn.cpp,checklstcmn.cpp,statbmpcmn.cpp,dirctrlcmn.cpp,\
 		gridcmn.cpp,odcombocmn.cpp,spinbtncmn.cpp,scrolbarcmn.cpp,\
 		colourdata.cpp,fontdata.cpp affinematrix2d.cpp\
-		richtooltipcmn.cpp persist.cpp
+		richtooltipcmn.cpp persist.cpp time.cpp
 
 all : $(SOURCES)
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -712,3 +712,4 @@ markupparser.obj : markupparser.cpp
 affinematrix2d.obj : affinematrix2d.cpp
 richtooltipcmn.obj : richtooltipcmn.cpp
 persist.obj : persist.cpp
+time.obj : time.cpp

src/common/filefn.cpp

@@ -1185,6 +1185,7 @@ wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite)
     return true;
   }
   // Give up
+  wxLogSysError(_("File '%s' couldn't be renamed '%s'"), file1, file2);
   return false;
 }
 
@@ -1205,7 +1206,10 @@ bool wxRemoveFile(const wxString& file)
 #else
     int res = unlink(file.fn_str());
 #endif
-
+    if ( res )
+    {
+        wxLogSysError(_("File '%s' couldn't be removed"), file);
+    }
     return res == 0;
 }
 
@@ -1537,6 +1541,7 @@ wxString wxGetCwd()
 
 bool wxSetWorkingDirectory(const wxString& d)
 {
+    bool success = false;
 #if defined(__OS2__)
     if (d[1] == ':')
     {
@@ -1546,18 +1551,17 @@ bool wxSetWorkingDirectory(const wxString& d)
     if (d.length() == 2)
         return true;
     }
-    return (::DosSetCurrentDir(d.c_str()) == 0);
+    success = (::DosSetCurrentDir(d.c_str()) == 0);
 #elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
-    return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
+    success = (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
 #elif defined(__WINDOWS__)
 
 #ifdef __WIN32__
 #ifdef __WXWINCE__
     // No equivalent in WinCE
     wxUnusedVar(d);
-    return false;
 #else
-    return (bool)(SetCurrentDirectory(d.fn_str()) != 0);
+    success = (SetCurrentDirectory(d.fn_str()) != 0);
 #endif
 #else
     // Must change drive, too.
@@ -1578,12 +1582,15 @@ bool wxSetWorkingDirectory(const wxString& d)
             _dos_setdrive(driveNo, &noDrives);
         }
     }
-    bool success = (chdir(WXSTRINGCAST d) == 0);
+    success = (chdir(WXSTRINGCAST d) == 0);
+#endif
 
+#endif
+    if ( !success )
+    {
+       wxLogSysError(_("Could not set current working directory"));
+    }
     return success;
-#endif
-
-#endif
 }
 
 // Get the OS directory if appropriate (such as the Windows directory).

src/common/popupcmn.cpp

@@ -116,7 +116,7 @@ BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow)
-#if defined(__WXMAC__) && wxOSX_USE_CARBON
+#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_CARBON)
     EVT_IDLE(wxPopupTransientWindow::OnIdle)
 #endif
 END_EVENT_TABLE()
@@ -426,7 +426,7 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event))
     return false;
 }
 
-#if defined(__WXMAC__) && wxOSX_USE_CARBON
+#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_CARBON)
 void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
 {
     event.Skip();

src/common/stopwatch.cpp

@@ -125,6 +125,10 @@ wxLongLong wxStopWatch::GetClockFreq() const
 
 void wxStopWatch::Start(long t0)
 {
+    // Calling Start() makes the stop watch run however many times it was
+    // paused before.
+    m_pauseCount = 0;
+
     DoStart();
 
     m_t0 -= (wxLongLong(t0)*GetClockFreq())/MILLISECONDS_PER_SECOND;

src/common/uiactioncmn.cpp

@@ -83,43 +83,43 @@ bool wxUIActionSimulator::Char(int keycode, int modifiers)
     switch(keycode)
     {
     case '0':
-        keycode = WXK_NUMPAD0;
+        keycode = '0';
         break;
     case '1':
-        keycode = WXK_NUMPAD1;
+        keycode = '1';
         break;
     case '2':
-        keycode = WXK_NUMPAD2;
+        keycode = '2';
         break;
     case '3':
-        keycode = WXK_NUMPAD3;
+        keycode = '3';
         break;
     case '4':
-        keycode = WXK_NUMPAD4;
+        keycode = '4';
         break;
     case '5':
-        keycode = WXK_NUMPAD5;
+        keycode = '5';
         break;
     case '6':
-        keycode = WXK_NUMPAD6;
+        keycode = '6';
         break;
     case '7':
-        keycode = WXK_NUMPAD7;
+        keycode = '7';
         break;
     case '8':
-        keycode = WXK_NUMPAD8;
+        keycode = '8';
         break;
     case '9':
-        keycode = WXK_NUMPAD9;
+        keycode = '9';
         break;
     case '+':
-        keycode = WXK_NUMPAD_ADD;
+        keycode = '+';
         break;
     case '-':
-        keycode = WXK_NUMPAD_SUBTRACT;
+        keycode = '-';
         break;
     case '.':
-        keycode = WXK_NUMPAD_DECIMAL;
+        keycode = '.';
         break;
     default:
         break;

src/common/utilscmn.cpp

@@ -583,8 +583,17 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map)
 
     // Both POSIX and Single UNIX Specification say that this variable must
     // exist but not that it must be declared anywhere and, indeed, it's not
-    // declared in several common systems (some BSDs, Solaris with native CC).
+    // declared in several common systems (some BSDs, Solaris with native CC)
+    // so we (re)declare it ourselves to deal with these cases. However we do
+    // not do this under MSW where there can be DLL-related complications, i.e.
+    // the variable might be DLL-imported or not. Luckily we don't have to
+    // worry about this as all MSW compilers do seem to define it in their
+    // standard headers anyhow so we can just rely on already having the
+    // correct declaration. And if this turns out to be wrong, we can always
+    // add a configure test checking whether it is declared later.
+#ifndef __WXMSW__
     extern char **environ;
+#endif // !__WXMSW__
 
     char **env = environ;
 #endif

src/common/webview.cpp

@@ -18,9 +18,13 @@
 
 #include "wx/webview.h"
 
+#if defined(__WXOSX_COCOA__) || defined(__WXOSX_CARBON__)
 #include "wx/osx/webview_webkit.h"
+#elif defined(__WXGTK__)
 #include "wx/gtk/webview_webkit.h"
+#elif defined(__WXMSW__)
 #include "wx/msw/webview_ie.h"
+#endif
 
 // DLL options compatibility check:
 #include "wx/app.h"

src/generic/combog.cpp

@@ -46,7 +46,6 @@
 // meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp
 #define TEXTCTRLXADJUST                 0
 
-#define TEXTCTRLYADJUST                 0
 #define TEXTXADJUST                     0 // how much is read-only text's x adjusted
 #define DEFAULT_DROPBUTTON_WIDTH        19
 
@@ -56,7 +55,6 @@
 // meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp
 #define TEXTCTRLXADJUST                 2
 
-#define TEXTCTRLYADJUST                 3
 #define TEXTXADJUST                     0 // how much is read-only text's x adjusted
 #define DEFAULT_DROPBUTTON_WIDTH        17
 
@@ -66,7 +64,6 @@
 // meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp
 #define TEXTCTRLXADJUST                 -1
 
-#define TEXTCTRLYADJUST                 0
 #define TEXTXADJUST                     1 // how much is read-only text's x adjusted
 #define DEFAULT_DROPBUTTON_WIDTH        23
 
@@ -76,7 +73,6 @@
 // meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp
 #define TEXTCTRLXADJUST                 0
 
-#define TEXTCTRLYADJUST                 0
 #define TEXTXADJUST                     0 // how much is read-only text's x adjusted
 #define DEFAULT_DROPBUTTON_WIDTH        22
 
@@ -86,7 +82,6 @@
 // meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp
 #define TEXTCTRLXADJUST                 0
 
-#define TEXTCTRLYADJUST                 0
 #define TEXTXADJUST                     0 // how much is read-only text's x adjusted
 #define DEFAULT_DROPBUTTON_WIDTH        19
 
@@ -235,7 +230,7 @@ void wxGenericComboCtrl::OnResize()
 #endif
 
     // Move textctrl, if any, accordingly
-    PositionTextCtrl( TEXTCTRLXADJUST, TEXTCTRLYADJUST );
+    PositionTextCtrl( TEXTCTRLXADJUST );
 }
 
 void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )

src/generic/datavgen.cpp

@@ -2433,7 +2433,7 @@ void wxDataViewMainWindow::ScrollTo( int rows, int column )
     int x, y;
     m_owner->GetScrollPixelsPerUnit( &x, &y );
     int sy = GetLineStart( rows )/y;
-    int sx = 0;
+    int sx = -1;
     if( column != -1 )
     {
         wxRect rect = GetClientRect();
@@ -3775,6 +3775,8 @@ bool wxDataViewMainWindow::TryAdvanceCurrentColumn(wxDataViewTreeNode *node, boo
     if ( idx >= (int)GetOwner()->GetColumnCount() )
         return false;
 
+    GetOwner()->EnsureVisible(m_currentRow, idx);
+
     if ( idx < 1 )
     {
         // We are going to the left of the second column. Reset to whole-row

src/generic/descrip.mms

@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 10 November 2011                                                    *
+# Date : 6 December 2011                                                     *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -94,7 +94,7 @@ OBJECTS = \
 		grideditors.obj,vlbox.obj,vscroll.obj,stattextg.obj,\
 		editlbox.obj,datavgen.obj,dbgrptg.obj,dragimgg.obj,\
 		richmsgdlgg.obj,commandlinkbuttong.obj,spinctlg.obj,\
-		markuptext.obj,bannerwindow.obj,timectrl.obj,richtooltip.obj,\
+		markuptext.obj,bannerwindow.obj,timectrl.obj,richtooltipg.obj,\
 		statbmpg.obj
 
 SOURCES = \
@@ -167,7 +167,7 @@ SOURCES = \
 		,headerctrlg.cpp,grideditors.cpp,stattextg.cpp,editlbox.cpp,\
 		datavgen.cpp,dbgrptg.cpp,dragimgg.cpp,richmsgdlgg.cpp,\
 		commandlinkbuttong.cpp,spinctlg.cpp markuptext.cpp \
-		bannerwindow.cpp timectrl.cpp richtooltip.cpp statbmpg.cpp
+		bannerwindow.cpp timectrl.cpp richtooltipg.cpp statbmpg.cpp
 
 .ifdef __WXMOTIF__
 OBJECTS0=statusbr.obj,statline.obj,notebook.obj,spinctlg.obj,collpaneg.obj,\
@@ -306,5 +306,5 @@ spinctlg.obj : spinctlg.cpp
 markuptext.obj : markuptext.cpp
 bannerwindow.obj : bannerwindow.cpp
 timectrl.obj : timectrl.cpp
-richtooltip.obj : richtooltip.cpp
+richtooltipg.obj : richtooltipg.cpp
 statbmpg.obj : statbmpg.cpp

src/generic/grideditors.cpp

@@ -1445,6 +1445,14 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
 
     Combo()->SetFocus();
 
+#ifdef __WXOSX_COCOA__
+    // This is a work around for the combobox being simply dismissed when a
+    // choice is made in it under OS X. The bug is almost certainly due to a
+    // problem in focus events generation logic but it's not obvious to fix and
+    // for now this at least allows to use wxGrid.
+    Combo()->Popup();
+#endif
+
     if (evtHandler)
     {
         // When dropping down the menu, a kill focus event

src/generic/listctrl.cpp

@@ -4820,6 +4820,10 @@ bool wxGenericListCtrl::DeleteColumn( int col )
     // if we don't have the header any longer, we need to relayout the window
     // if ( !GetColumnCount() )
 
+
+    // Ensure that the non-existent columns are really removed from display.
+    Refresh();
+
     return true;
 }
 

src/generic/progdlgg.cpp

@@ -87,7 +87,7 @@ wxIMPLEMENT_CLASS(wxProgressDialog, wxDialog)
 // wxGenericProgressDialog creation
 // ----------------------------------------------------------------------------
 
-void wxGenericProgressDialog::Init(wxWindow *parent, int style)
+void wxGenericProgressDialog::Init()
 {
     // we may disappear at any moment, let the others know about it
     SetExtraStyle(GetExtraStyle() | wxWS_EX_TRANSIENT);
@@ -95,9 +95,8 @@ void wxGenericProgressDialog::Init(wxWindow *parent, int style)
     // Initialize all our members that we always use (even when we don't
     // create a valid window in this class).
 
-    m_pdStyle = style;
-
-    m_parentTop = wxGetTopLevelParent(parent);
+    m_pdStyle = 0;
+    m_parentTop = NULL;
 
     m_gauge = NULL;
     m_msg = NULL;
@@ -129,10 +128,10 @@ void wxGenericProgressDialog::Init(wxWindow *parent, int style)
     m_tempEventLoop = NULL;
 }
 
-wxGenericProgressDialog::wxGenericProgressDialog(wxWindow *parent, int style)
+wxGenericProgressDialog::wxGenericProgressDialog()
                        : wxDialog()
 {
-    Init(parent, style);
+    Init();
 }
 
 wxGenericProgressDialog::wxGenericProgressDialog(const wxString& title,
@@ -142,24 +141,25 @@ wxGenericProgressDialog::wxGenericProgressDialog(const wxString& title,
                                                  int style)
                        : wxDialog()
 {
-    Init(parent, style);
+    Init();
 
     Create( title, message, maximum, parent, style );
 }
 
-void wxGenericProgressDialog::Create( const wxString& title,
+bool wxGenericProgressDialog::Create( const wxString& title,
                                       const wxString& message,
                                       int maximum,
                                       wxWindow *parent,
                                       int style )
 {
-    // Notice that GetParentForModalDialog() needs the dialog window style, not
-    // our wxProgressDialog-specific style.
+    m_parentTop = wxGetTopLevelParent(parent);
+    m_pdStyle = style;
+
     wxWindow* const
         realParent = GetParentForModalDialog(parent, GetWindowStyle());
-    wxDialog::Create(realParent, wxID_ANY, title);
 
-    SetTitle( title );
+    if (!wxDialog::Create(realParent, wxID_ANY, title))
+        return false;
 
     SetMaximum(maximum);
 
@@ -309,6 +309,7 @@ void wxGenericProgressDialog::Create( const wxString& title,
     }
 
     Update();
+    return true;
 }
 
 void wxGenericProgressDialog::UpdateTimeEstimates(int value,

src/generic/richtooltipg.cpp

@@ -170,7 +170,7 @@ public:
         Layout();
     }
 
-    void SetBackground(wxColour colStart, wxColour colEnd)
+    void SetBackgroundColours(wxColour colStart, wxColour colEnd)
     {
         if ( !colStart.IsOk() )
         {
@@ -651,7 +651,7 @@ void wxRichToolTipGenericImpl::ShowFor(wxWindow* win)
                                             m_titleFont
                                           );
 
-    popup->SetBackground(m_colStart, m_colEnd);
+    popup->SetBackgroundColours(m_colStart, m_colEnd);
 
     popup->DoShow();
 

src/gtk/menu.cpp

@@ -878,7 +878,21 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
         return NULL;
 
     GtkWidget * const mitem = item->GetMenuItem();
-    gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), NULL);
+    if (!gtk_check_version(2,12,0))
+    {
+        // gtk_menu_item_remove_submenu() is deprecated since 2.12, but
+        // gtk_menu_item_set_submenu() can now be used with NULL submenu now so
+        // just do use it.
+        gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), NULL);
+    }
+    else // GTK+ < 2.12
+    {
+        // In 2.10 calling gtk_menu_item_set_submenu() with NULL submenu
+        // results in critical GTK+ error messages so use the old function
+        // instead.
+        gtk_menu_item_remove_submenu(GTK_MENU_ITEM(mitem));
+    }
+
     gtk_widget_destroy(mitem);
     item->SetMenuItem(NULL);
 

src/gtk/print.cpp

@@ -2149,8 +2149,8 @@ void wxGtkPrinterDCImpl::DoGetTextExtent(const wxString& string, wxCoord *width,
     {
         // scale the font and apply it
         PangoFontDescription *desc = theFont->GetNativeFontInfo()->description;
-        float size = pango_font_description_get_size(desc);
-        size = size * GetFontPointSizeAdjustment(72.0);
+        oldSize = pango_font_description_get_size(desc);
+        const float size = oldSize * GetFontPointSizeAdjustment(72.0);
         pango_font_description_set_size(desc, (gint)size);
 
         pango_layout_set_font_description(m_layout, desc);

src/gtk/window.cpp

@@ -31,6 +31,7 @@
 #include "wx/tooltip.h"
 #include "wx/caret.h"
 #include "wx/fontutil.h"
+#include "wx/scopeguard.h"
 #include "wx/sysopt.h"
 
 #include <ctype.h>
@@ -337,18 +338,6 @@ parent_set(GtkWidget* widget, GtkWidget* old_parent, wxWindow* win)
 // "key_press_event" from any window
 //-----------------------------------------------------------------------------
 
-// These are used when transforming Ctrl-alpha to ascii values 1-26
-inline bool wxIsLowerChar(int code)
-{
-    return (code >= 'a' && code <= 'z' );
-}
-
-inline bool wxIsUpperChar(int code)
-{
-    return (code >= 'A' && code <= 'Z' );
-}
-
-
 // set WXTRACE to this to see the key event codes on the console
 #define TRACE_KEYS  wxT("keyevent")
 
@@ -841,13 +830,49 @@ bool SendCharHookEvent(const wxKeyEvent& event, wxWindow *win)
     if ( !g_captureWindow )
     {
         wxKeyEvent eventCharHook(wxEVT_CHAR_HOOK, event);
-        if ( win->HandleWindowEvent(eventCharHook) )
+        if ( win->HandleWindowEvent(eventCharHook)
+                && !event.IsNextEventAllowed() )
             return true;
     }
 
     return false;
 }
 
+// Adjust wxEVT_CHAR event key code fields. This function takes care of two
+// conventions:
+// (a) Ctrl-letter key presses generate key codes in range 1..26
+// (b) Unicode key codes are same as key codes for the codes in 1..255 range
+void AdjustCharEventKeyCodes(wxKeyEvent& event)
+{
+    const int code = event.m_keyCode;
+
+    // Check for (a) above.
+    if ( event.ControlDown() )
+    {
+        // We intentionally don't use isupper/lower() here, we really need
+        // ASCII letters only as it doesn't make sense to translate any other
+        // ones into this range which has only 26 slots.
+        if ( code >= 'a' && code <= 'z' )
+            event.m_keyCode = code - 'a' + 1;
+        else if ( code >= 'A' && code <= 'Z' )
+            event.m_keyCode = code - 'A' + 1;
+
+#if wxUSE_UNICODE
+        // Adjust the Unicode equivalent in the same way too.
+        if ( event.m_keyCode != code )
+            event.m_uniChar = event.m_keyCode;
+#endif // wxUSE_UNICODE
+    }
+
+#if wxUSE_UNICODE
+    // Check for (b) from above.
+    //
+    // FIXME: Should we do it for key codes up to 255?
+    if ( !event.m_uniChar && code < WXK_DELETE )
+        event.m_uniChar = code;
+#endif // wxUSE_UNICODE
+}
+
 } // anonymous namespace
 
 extern "C" {
@@ -963,19 +988,7 @@ gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget),
 
             eventChar.m_keyCode = key_code;
 
-            // To conform to the docs we need to translate Ctrl-alpha
-            // characters to values in the range 1-26.
-            if ( eventChar.ControlDown() &&
-                 ( wxIsLowerChar(key_code) || wxIsUpperChar(key_code) ))
-            {
-                if ( wxIsLowerChar(key_code) )
-                    eventChar.m_keyCode = key_code - 'a' + 1;
-                if ( wxIsUpperChar(key_code) )
-                    eventChar.m_keyCode = key_code - 'A' + 1;
-#if wxUSE_UNICODE
-                eventChar.m_uniChar = event.m_keyCode;
-#endif
-            }
+            AdjustCharEventKeyCodes(eventChar);
 
             ret = win->HandleWindowEvent(eventChar);
         }
@@ -1020,21 +1033,7 @@ gtk_wxwindow_commit_cb (GtkIMContext * WXUNUSED(context),
         event.m_keyCode = (char)*pstr;
 #endif  // wxUSE_UNICODE
 
-        // To conform to the docs we need to translate Ctrl-alpha
-        // characters to values in the range 1-26.
-        if ( event.ControlDown() &&
-             ( wxIsLowerChar(*pstr) || wxIsUpperChar(*pstr) ))
-        {
-            if ( wxIsLowerChar(*pstr) )
-                event.m_keyCode = *pstr - 'a' + 1;
-            if ( wxIsUpperChar(*pstr) )
-                event.m_keyCode = *pstr - 'A' + 1;
-
-            event.m_keyCode = *pstr - 'a' + 1;
-#if wxUSE_UNICODE
-            event.m_uniChar = event.m_keyCode;
-#endif
-        }
+        AdjustCharEventKeyCodes(event);
 
         window->HandleWindowEvent(event);
     }
@@ -3567,28 +3566,31 @@ bool wxWindowGTK::ScrollPages(int pages)
 void wxWindowGTK::Refresh(bool WXUNUSED(eraseBackground),
                           const wxRect *rect)
 {
-    if (m_widget == NULL || !gtk_widget_get_mapped(m_widget))
-        return;
-
     if (m_wxwindow)
     {
-        GdkWindow* window = gtk_widget_get_window(m_wxwindow);
-        if (rect)
+        if (gtk_widget_get_mapped(m_wxwindow))
         {
-            GdkRectangle r = { rect->x, rect->y, rect->width, rect->height };
-            if (GetLayoutDirection() == wxLayout_RightToLeft)
-                r.x = gdk_window_get_width(window) - r.x - rect->width;
-            gdk_window_invalidate_rect(window, &r, true);
+            GdkWindow* window = gtk_widget_get_window(m_wxwindow);
+            if (rect)
+            {
+                GdkRectangle r = { rect->x, rect->y, rect->width, rect->height };
+                if (GetLayoutDirection() == wxLayout_RightToLeft)
+                    r.x = gdk_window_get_width(window) - r.x - rect->width;
+                gdk_window_invalidate_rect(window, &r, true);
+            }
+            else
+                gdk_window_invalidate_rect(window, NULL, true);
         }
-        else
-            gdk_window_invalidate_rect(window, NULL, true);
     }
-    else
+    else if (m_widget)
     {
-        if (rect)
-            gtk_widget_queue_draw_area(m_widget, rect->x, rect->y, rect->width, rect->height);
-        else
-            gtk_widget_queue_draw(m_widget);
+        if (gtk_widget_get_mapped(m_widget))
+        {
+            if (rect)
+                gtk_widget_queue_draw_area(m_widget, rect->x, rect->y, rect->width, rect->height);
+            else
+                gtk_widget_queue_draw(m_widget);
+        }
     }
 }
 
@@ -4018,6 +4020,14 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
 {
     wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") );
 
+    // For compatibility with other ports, pretend that the window showing the
+    // menu has focus while the menu is shown. This is needed because the popup
+    // menu actually steals the focus from the window it's associated it in
+    // wxGTK unlike, say, wxMSW.
+    wxWindowGTK* const oldPendingFocus = gs_pendingFocus;
+    gs_pendingFocus = this;
+    wxON_BLOCK_EXIT_SET( gs_pendingFocus, oldPendingFocus );
+
     menu->UpdateUI();
 
     wxPoint pos;

src/msw/button.cpp

@@ -62,6 +62,10 @@
 // macros
 // ----------------------------------------------------------------------------
 
+BEGIN_EVENT_TABLE(wxButton, wxButtonBase)
+    EVT_CHAR_HOOK(wxButton::OnCharHook)
+END_EVENT_TABLE()
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -370,6 +374,25 @@ void wxButton::Command(wxCommandEvent & event)
 // event/message handlers
 // ----------------------------------------------------------------------------
 
+void wxButton::OnCharHook(wxKeyEvent& event)
+{
+    // We want to ensure that the button always processes Enter key events
+    // itself, even if it's inside some control that normally takes over them
+    // (this happens when the button is part of an in-place editor control for
+    // example).
+    if ( event.GetKeyCode() == WXK_RETURN )
+    {
+        // We should ensure that subsequent key events are still generated even
+        // if we did handle EVT_CHAR_HOOK (normally this would suppress their
+        // generation).
+        event.DoAllowNextEvent();
+    }
+    else
+    {
+        event.Skip();
+    }
+}
+
 bool wxButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 {
     bool processed = false;

src/msw/combo.cpp

@@ -117,9 +117,6 @@
 #define NATIVE_TEXT_INDENT_XP       4
 #define NATIVE_TEXT_INDENT_CLASSIC  2
 
-#define TEXTCTRLYADJUST_XP          3
-#define TEXTCTRLYADJUST_CLASSIC     3
-
 #define COMBOBOX_ANIMATION_RESOLUTION   10
 
 #define COMBOBOX_ANIMATION_DURATION     200  // In milliseconds
@@ -229,26 +226,13 @@ void wxComboCtrl::OnResize()
     //
     // Recalculates button and textctrl areas
 
-    int textCtrlYAdjust;
-
-#if wxUSE_UXTHEME
-    if ( wxUxThemeEngine::GetIfActive() )
-    {
-        textCtrlYAdjust = TEXTCTRLYADJUST_XP;
-    }
-    else
-#endif
-    {
-        textCtrlYAdjust = TEXTCTRLYADJUST_CLASSIC;
-    }
-
     // Technically Classic Windows style combo has more narrow button,
     // but the native renderer doesn't paint it well like that.
     int btnWidth = 17;
     CalculateAreas(btnWidth);
 
     // Position textctrl using standard routine
-    PositionTextCtrl(0, textCtrlYAdjust);
+    PositionTextCtrl();
 }
 
 // Draws non-XP GUI dotted line around the focus area

src/msw/dde.cpp

@@ -593,6 +593,10 @@ wxDDEConnection::DoExecute(const void *data, size_t size, wxIPCFormat format)
         realSize = conv->ToWChar((wchar_t *)realData, realSize, text, len);
         if ( realSize == wxCONV_FAILED )
             return false;
+
+        // We need to pass the size of the buffer to DdeClientTransaction() and
+        // not the length of the string.
+        realSize *= sizeof(wchar_t);
     }
 #else // !wxUSE_UNICODE
     if ( format == wxIPC_UNICODETEXT )
@@ -635,7 +639,7 @@ wxDDEConnection::DoExecute(const void *data, size_t size, wxIPCFormat format)
 
     DWORD result;
     bool ok = DdeClientTransaction(realData,
-                                   realSize*sizeof(wxChar),
+                                   realSize,
                                    GetHConv(),
                                    NULL,
                                    // MSDN: if the transaction specified by

src/msw/progdlg.cpp

@@ -307,7 +307,7 @@ wxProgressDialog::wxProgressDialog( const wxString& title,
                                     int maximum,
                                     wxWindow *parent,
                                     int style )
-    : wxGenericProgressDialog(parent, style),
+    : wxGenericProgressDialog(),
       m_taskDialogRunner(NULL),
       m_sharedData(NULL),
       m_message(message),
@@ -317,6 +317,7 @@ wxProgressDialog::wxProgressDialog( const wxString& title,
     if ( HasNativeTaskDialog() )
     {
         SetParent(GetParentForModalDialog(parent, GetWindowStyle()));
+        SetPDStyle(style);
         SetMaximum(maximum);
 
         Show();

src/msw/utilsexc.cpp

@@ -755,15 +755,6 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
         si.hStdOutput = pipeOut[wxPipe::Write];
         si.hStdError = pipeErr[wxPipe::Write];
 
-        // when the std IO is redirected, we don't show the (console) process
-        // window by default, but this can be overridden by the caller by
-        // specifying wxEXEC_NOHIDE flag
-        if ( !(flags & wxEXEC_NOHIDE) )
-        {
-            si.dwFlags |= STARTF_USESHOWWINDOW;
-            si.wShowWindow = SW_HIDE;
-        }
-
         // we must duplicate the handle to the write side of stdin pipe to make
         // it non inheritable: indeed, we must close the writing end of pipeIn
         // before launching the child process as otherwise this handle will be
@@ -788,6 +779,17 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
     }
 #endif // wxUSE_STREAMS
 
+    // The default logic for showing the console is to show it only if the IO
+    // is not redirected however wxEXEC_{SHOW,HIDE}_CONSOLE flags can be
+    // explicitly specified to change it.
+    if ( (flags & wxEXEC_HIDE_CONSOLE) ||
+            (redirect && !(flags & wxEXEC_SHOW_CONSOLE)) )
+    {
+        si.dwFlags |= STARTF_USESHOWWINDOW;
+        si.wShowWindow = SW_HIDE;
+    }
+
+
     PROCESS_INFORMATION pi;
     DWORD dwFlags = CREATE_SUSPENDED;
 

src/msw/window.cpp

@@ -6644,8 +6644,11 @@ wxKeyboardHook(int nCode, WORD wParam, DWORD lParam)
 
                 if ( handler && handler->ProcessEvent(event) )
                 {
-                    // processed
-                    return 1;
+                    if ( !event.IsNextEventAllowed() )
+                    {
+                        // Stop processing of this event.
+                        return 1;
+                    }
                 }
             }
         }

src/osx/carbon/app.cpp

@@ -807,7 +807,37 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         {
             // remove this argument
             --argc;
-            memmove(argv + 1, argv + 2, argc * sizeof(char *));
+            memmove(argv + 1, argv + 2, argc * sizeof(wxChar*));
+        }
+    }
+
+    /*
+     Cocoa supports -Key value options which set the user defaults key "Key"
+     to the value "value"  Some of them are very handy for debugging like
+     -NSShowAllViews YES.  Cocoa picks these up from the real argv so
+     our removal of them from the wx copy of it does not affect Cocoa's
+     ability to see them.
+     
+     We basically just assume that any "-NS" option and its following
+     argument needs to be removed from argv.  We hope that user code does
+     not expect to see -NS options and indeed it's probably a safe bet
+     since most user code accepting options is probably using the
+     double-dash GNU-style syntax.
+     */
+    for(int i=1; i < argc; ++i)
+    {
+        static const wxChar *ARG_NS = wxT("-NS");
+        if( wxStrncmp(argv[i], ARG_NS, wxStrlen(ARG_NS)) == 0 )
+        {
+            // Only eat this option if it has an argument
+            if( (i + 1) < argc )
+            {
+                memmove(argv + i, argv + i + 2, (argc-i-1)*sizeof(wxChar*));
+                argc -= 2;
+                // drop back one position so the next run through the loop
+                // reprocesses the argument at our current index.
+                --i;
+            }
         }
     }
 
@@ -1620,7 +1650,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
     {
         wxKeyEvent eventCharHook(wxEVT_CHAR_HOOK, event);
         handled = focus->HandleWindowEvent( eventCharHook );
-        if ( handled && eventCharHook.GetSkipped() )
+        if ( handled && eventCharHook.IsNextEventAllowed() )
             handled = false ;
     }
 

src/osx/cocoa/combobox.mm

@@ -165,6 +165,18 @@ int wxNSComboBoxControl::FindString(const wxString& text) const
     return result;
 }
 
+void wxNSComboBoxControl::Popup()
+{
+    id ax = NSAccessibilityUnignoredDescendant(m_comboBox);
+    [ax accessibilitySetValue: [NSNumber numberWithBool: YES] forAttribute: NSAccessibilityExpandedAttribute];
+}
+
+void wxNSComboBoxControl::Dismiss()
+{
+    id ax = NSAccessibilityUnignoredDescendant(m_comboBox);
+    [ax accessibilitySetValue: [NSNumber numberWithBool: NO] forAttribute: NSAccessibilityExpandedAttribute];
+}
+
 wxWidgetImplType* wxWidgetImpl::CreateComboBox( wxComboBox* wxpeer, 
                                     wxWindowMac* WXUNUSED(parent), 
                                     wxWindowID WXUNUSED(id), 

src/osx/cocoa/dataview.mm

@@ -156,11 +156,46 @@ inline wxDataViewItem wxDataViewItemFromMaybeNilItem(id item)
 {
 }
 
+    // Get the identifier we use for the specified column. This should be used
+    // for finding columns from identifier only, to initialize the identifier
+    // of a new column use initWithColumnPointer below instead.
+    +(NSString*) identifierForColumnPointer:(const wxDataViewColumn*)column;
+
+    // Initialize the column with the given pointer to the associated
+    // wxDataViewColumn. This pointer can later be retrieved using
+    // getColumnPointer.
+    -(id) initWithColumnPointer:(const wxDataViewColumn*)column;
+
+    // Retrieve the associated column.
+    -(wxDataViewColumn*) getColumnPointer;
+
     -(id) dataCellForRow:(NSInteger)row;
 @end
 
 @implementation wxDVCNSTableColumn
 
++(NSString*) identifierForColumnPointer:(const wxDataViewColumn*)column
+{
+    // Starting from OS X 10.7 the column identifier must be an NSString and
+    // not just some arbitrary object, so we serialize the pointer into the
+    // string. Notice the use of NSInteger which is big enough to store a
+    // pointer in both 32 and 64 bit builds.
+    return [NSString stringWithFormat:@"%lu", reinterpret_cast<NSUInteger>(column)];
+}
+
+-(id) initWithColumnPointer:(const wxDataViewColumn*)column
+{
+    [self initWithIdentifier: [wxDVCNSTableColumn identifierForColumnPointer:column]];
+    return self;
+}
+
+-(wxDataViewColumn*) getColumnPointer
+{
+    // The case to NSString is needed for OS X < 10.7.
+    return reinterpret_cast<wxDataViewColumn*>(
+            [static_cast<NSString*>([self identifier]) integerValue]);
+}
+
 -(id) dataCellForRow:(NSInteger)row
 {
     // what we want to do here is to simply return nil for the cells which
@@ -168,13 +203,7 @@ inline wxDataViewItem wxDataViewItemFromMaybeNilItem(id item)
     // or progress cells in the columns using the corresponding types even for
     // the container rows which is wrong
 
-    // half of the problem is just finding the objects we need from the column
-    // pointer which is itself stashed inside wxPointerObject which we use as
-    // our identifier
-    const wxDataViewColumn * const
-        dvCol = static_cast<wxDataViewColumn *>(
-                    [(wxPointerObject *)[self identifier] pointer]
-                );
+    const wxDataViewColumn * const dvCol = [self getColumnPointer];
 
     const wxDataViewCtrl * const dvc = dvCol->GetOwner();
     const wxCocoaDataViewControl * const
@@ -316,10 +345,7 @@ NSTableColumn* CreateNativeColumn(const wxDataViewColumn *column)
     wxCHECK_MSG( renderer, NULL, "column should have a renderer" );
 
     wxDVCNSTableColumn * const nativeColumn(
-        [[wxDVCNSTableColumn alloc] initWithIdentifier:
-            [[[wxPointerObject alloc] initWithPointer:
-                const_cast<wxDataViewColumn*>(column)]
-             autorelease]]
+        [[wxDVCNSTableColumn alloc] initWithColumnPointer: column]
     );
 
     // setting the size related parameters:
@@ -664,7 +690,8 @@ outlineView:(NSOutlineView*)outlineView
 
     wxCHECK_MSG( model, nil, "Valid model in data source does not exist." );
 
-    wxDataViewColumn* col(static_cast<wxDataViewColumn*>([[tableColumn identifier] pointer]));
+    wxDataViewColumn* const
+        col([static_cast<wxDVCNSTableColumn*>(tableColumn) getColumnPointer]);
     const unsigned colIdx = col->GetModelColumn();
 
     wxDataViewItem dataViewItem(wxDataViewItemFromItem(item));
@@ -687,7 +714,8 @@ outlineView:(NSOutlineView*)outlineView
 {
     wxUnusedVar(outlineView);
 
-    wxDataViewColumn* col(static_cast<wxDataViewColumn*>([[tableColumn identifier] pointer]));
+    wxDataViewColumn* const
+        col([static_cast<wxDVCNSTableColumn*>(tableColumn) getColumnPointer]);
 
     col->GetRenderer()->
         OSXOnCellChanged(object, wxDataViewItemFromItem(item), col->GetModelColumn());
@@ -1624,7 +1652,8 @@ outlineView:(NSOutlineView*)outlineView
 //
 -(void) outlineView:(NSOutlineView*)outlineView mouseDownInHeaderOfTableColumn:(NSTableColumn*)tableColumn
 {
-    wxDataViewColumn* const col(static_cast<wxDataViewColumn*>([[tableColumn identifier] pointer]));
+    wxDataViewColumn* const
+        col([static_cast<wxDVCNSTableColumn*>(tableColumn) getColumnPointer]);
 
     wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
@@ -1719,11 +1748,8 @@ outlineView:(NSOutlineView*)outlineView
     wxDataViewCtrl * const dvc = implementation->GetDataViewCtrl();
     wxDataViewModel * const model = dvc->GetModel();
 
-    wxDataViewColumn * const
-        dvCol(static_cast<wxDataViewColumn*>(
-                    [[tableColumn identifier] pointer]
-                    )
-             );
+    wxDataViewColumn* const
+        dvCol([static_cast<wxDVCNSTableColumn*>(tableColumn) getColumnPointer]);
     const unsigned colIdx = dvCol->GetModelColumn();
 
     wxDataViewItem dvItem(wxDataViewItemFromItem(item));
@@ -1760,7 +1786,10 @@ outlineView:(NSOutlineView*)outlineView
 {
     int const newColumnPosition = [[[notification userInfo] objectForKey:@"NSNewColumn"] intValue];
 
-    wxDataViewColumn* const col(static_cast<wxDataViewColumn*>([[[[self tableColumns] objectAtIndex:newColumnPosition] identifier] pointer]));
+    NSTableColumn*
+        tableColumn = [[self tableColumns] objectAtIndex:newColumnPosition];
+    wxDataViewColumn* const
+        col([static_cast<wxDVCNSTableColumn*>(tableColumn) getColumnPointer]);
 
     wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
@@ -1827,9 +1856,10 @@ outlineView:(NSOutlineView*)outlineView
     currentlyEditedColumn = [self editedColumn];
     currentlyEditedRow = [self editedRow];
 
-    wxDataViewColumn* const col =
-        static_cast<wxDataViewColumn*>(
-                [[[[self tableColumns] objectAtIndex:currentlyEditedColumn] identifier] pointer]);
+    NSTableColumn*
+        tableColumn = [[self tableColumns] objectAtIndex:currentlyEditedColumn];
+    wxDataViewColumn* const
+        col([static_cast<wxDVCNSTableColumn*>(tableColumn) getColumnPointer]);
 
     wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
@@ -1865,9 +1895,10 @@ outlineView:(NSOutlineView*)outlineView
     // been sent the last edited column/row are valid:
     if ( currentlyEditedColumn != -1 && currentlyEditedRow != -1 )
     {
-        wxDataViewColumn* const col =
-            static_cast<wxDataViewColumn*>(
-                    [[[[self tableColumns] objectAtIndex:currentlyEditedColumn] identifier] pointer]);
+        NSTableColumn*
+            tableColumn = [[self tableColumns] objectAtIndex:currentlyEditedColumn];
+        wxDataViewColumn* const
+            col([static_cast<wxDVCNSTableColumn*>(tableColumn) getColumnPointer]);
 
         wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
@@ -1969,7 +2000,7 @@ bool wxCocoaDataViewControl::DeleteColumn(wxDataViewColumn* columnPtr)
         [m_OutlineView setOutlineTableColumn:nil]; // due to a bug this does not work
     [m_OutlineView removeTableColumn:columnPtr->GetNativeData()->GetNativeColumnPtr()]; // due to a confirmed bug #6555162 the deletion does not work for
     // outline table columns (... and there is no workaround)
-    return (([m_OutlineView columnWithIdentifier:[[[wxPointerObject alloc] initWithPointer:columnPtr] autorelease]]) == -1);
+    return (([m_OutlineView columnWithIdentifier:[wxDVCNSTableColumn identifierForColumnPointer:columnPtr]]) == -1);
 }
 
 void wxCocoaDataViewControl::DoSetExpanderColumn(const wxDataViewColumn *columnPtr)
@@ -1979,12 +2010,13 @@ void wxCocoaDataViewControl::DoSetExpanderColumn(const wxDataViewColumn *columnP
 
 wxDataViewColumn* wxCocoaDataViewControl::GetColumn(unsigned int pos) const
 {
-    return static_cast<wxDataViewColumn*>([[[[m_OutlineView tableColumns] objectAtIndex:pos] identifier] pointer]);
+    NSTableColumn* tableColumn = [[m_OutlineView tableColumns] objectAtIndex:pos];
+    return [static_cast<wxDVCNSTableColumn*>(tableColumn) getColumnPointer];
 }
 
 int wxCocoaDataViewControl::GetColumnPosition(const wxDataViewColumn *columnPtr) const
 {
-    return [m_OutlineView columnWithIdentifier:[[[wxPointerObject alloc] initWithPointer:const_cast<wxDataViewColumn*>(columnPtr)] autorelease]];
+    return [m_OutlineView columnWithIdentifier:[wxDVCNSTableColumn identifierForColumnPointer:columnPtr]];
 }
 
 bool wxCocoaDataViewControl::InsertColumn(unsigned int pos, wxDataViewColumn* columnPtr)
@@ -2328,7 +2360,7 @@ wxDataViewColumn* wxCocoaDataViewControl::GetSortingColumn() const
 
     for (UInt32 i=0; i<noOfColumns; ++i)
         if ([[columns objectAtIndex:i] sortDescriptorPrototype] != nil)
-            return static_cast<wxDataViewColumn*>([[[columns objectAtIndex:i] identifier] pointer]);
+            return GetColumn(i);
     return NULL;
 }
 
@@ -2363,7 +2395,7 @@ void wxCocoaDataViewControl::HitTest(const wxPoint& point, wxDataViewItem& item,
     indexRow    = [m_OutlineView rowAtPoint:   nativePoint];
     if ((indexColumn >= 0) && (indexRow >= 0))
     {
-        columnPtr = static_cast<wxDataViewColumn*>([[[[m_OutlineView tableColumns] objectAtIndex:indexColumn] identifier] pointer]);
+        columnPtr = GetColumn(indexColumn);
         item      = wxDataViewItem([[m_OutlineView itemAtRow:indexRow] pointer]);
     }
     else

src/osx/cocoa/evtloop.mm

@@ -311,7 +311,7 @@ void wxModalEventLoop::DoRun()
 
 void wxModalEventLoop::DoStop()
 {
-    [NSApp stopModal];
+    [NSApp abortModal];
 }
 
 void wxGUIEventLoop::BeginModalSession( wxWindow* modalWindow )

src/osx/cocoa/gauge.mm

@@ -75,7 +75,7 @@ public :
     void GetLayoutInset(int &left , int &top , int &right, int &bottom) const
     {
         left = top = right = bottom = 0;
-        NSControlSize size = size = [(wxNSProgressIndicator*)m_osxView controlSize];
+        NSControlSize size = [(wxNSProgressIndicator*)m_osxView controlSize];
 
         switch( size )
         {

src/osx/cocoa/textctrl.mm

@@ -325,7 +325,7 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
 }
 
 - (NSArray *)control:(NSControl *)control textView:(NSTextView *)textView completions:(NSArray *)words
- forPartialWordRange:(NSRange)charRange indexOfSelectedItem:(int*)index
+ forPartialWordRange:(NSRange)charRange indexOfSelectedItem:(NSInteger*)index
 {
     NSMutableArray* matches = NULL;
 

src/osx/cocoa/toolbar.mm

@@ -192,6 +192,10 @@ public:
         if ( IsButton() )
             [(NSButton*)m_controlHandle setTitle:l.AsNSString()];
 
+        if ( m_controlHandle )
+        {
+            [m_controlHandle setToolTip:sh.AsNSString()];
+        }
     }
 
     void Action()
@@ -1100,8 +1104,15 @@ bool wxToolBar::Realize()
                     NSString *nsItemId;
                     if (tool->GetStyle() == wxTOOL_STYLE_SEPARATOR)
                     {
-                        nsItemId = tool->IsStretchable() ? NSToolbarFlexibleSpaceItemIdentifier
-                        : NSToolbarSeparatorItemIdentifier;
+                        if ( tool->IsStretchable() )
+                            nsItemId = NSToolbarFlexibleSpaceItemIdentifier;
+                        else 
+                        {
+                            if ( UMAGetSystemVersion() < 0x1070 )
+                                nsItemId = NSToolbarSeparatorItemIdentifier;
+                            else
+                                nsItemId = NSToolbarSpaceItemIdentifier;
+                        }
                     }
                     else
                     {
@@ -1350,8 +1361,18 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
 #if wxOSX_USE_NATIVE_TOOLBAR
                 if (m_macToolbar != NULL)
                 {
-                    NSString * nsItemId = tool->IsStretchable() ? NSToolbarFlexibleSpaceItemIdentifier
-                                                         : NSToolbarSeparatorItemIdentifier;
+                    NSString * nsItemId = nil;
+                    
+                    if ( tool->IsStretchable() )
+                        nsItemId = NSToolbarFlexibleSpaceItemIdentifier;
+                    else 
+                    {
+                        if ( UMAGetSystemVersion() < 0x1070 )
+                            nsItemId = NSToolbarSeparatorItemIdentifier;
+                        else
+                            nsItemId = NSToolbarSpaceItemIdentifier;
+                    }
+
                     NSToolbarItem* item = [[NSToolbarItem alloc] initWithItemIdentifier:nsItemId];
                     tool->SetToolbarItemRef( item );
                 }

src/osx/cocoa/window.mm

@@ -2306,7 +2306,8 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
     if ( wxevent.GetEventType() == wxEVT_KEY_DOWN )
     {
         wxKeyEvent eventHook(wxEVT_CHAR_HOOK, wxevent);
-        if ( GetWXPeer()->OSXHandleKeyEvent(eventHook) )
+        if ( GetWXPeer()->OSXHandleKeyEvent(eventHook)
+                && !eventHook.IsNextEventAllowed() )
             return true;
     }
 

src/osx/combobox_osx.cpp

@@ -215,4 +215,14 @@ wxComboWidgetImpl* wxComboBox::GetComboPeer() const
     return dynamic_cast<wxComboWidgetImpl*> (GetPeer());
 }
 
+void wxComboBox::Popup()
+{
+    GetComboPeer()->Popup();
+}
+
+void wxComboBox::Dismiss()
+{
+    GetComboPeer()->Dismiss();
+}
+
 #endif // wxUSE_COMBOBOX && wxOSX_USE_COCOA