This commit was manufactured by cvs2svn to create tag 'WX_2_8_0'.

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

Makefile.in

@@ -2157,7 +2157,6 @@ COND_TOOLKIT_MAC_GUI_HDR =  \
 	wx/mac/sound.h \
 	wx/mac/spinbutt.h \
 	wx/mac/spinctrl.h \
-	wx/mac/srchctrl.h \
 	wx/mac/statbmp.h \
 	wx/mac/statbox.h \
 	wx/mac/statline.h \
@@ -2231,9 +2230,6 @@ COND_TOOLKIT_MAC_GUI_HDR =  \
 	wx/mac/carbon/printdlg.h \
 	wx/mac/carbon/printmac.h \
 	wx/mac/carbon/private.h \
-	wx/mac/carbon/private/mactext.h \
-	wx/mac/carbon/private/overlay.h \
-	wx/mac/carbon/private/print.h \
 	wx/mac/carbon/radiobox.h \
 	wx/mac/carbon/radiobut.h \
 	wx/mac/carbon/region.h \
@@ -2241,7 +2237,6 @@ COND_TOOLKIT_MAC_GUI_HDR =  \
 	wx/mac/carbon/slider.h \
 	wx/mac/carbon/spinbutt.h \
 	wx/mac/carbon/spinctrl.h \
-	wx/mac/carbon/srchctrl.h \
 	wx/mac/carbon/statbmp.h \
 	wx/mac/carbon/statbox.h \
 	wx/mac/carbon/statline.h \
@@ -2876,7 +2871,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/generic/scrolwin.h \
 	wx/generic/spinctlg.h \
 	wx/generic/splitter.h \
-	wx/generic/srchctlg.h \
 	wx/generic/textdlgg.h \
 	wx/generic/timer.h \
 	wx/generic/treectlg.h \
@@ -2994,7 +2988,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/spinbutt.h \
 	wx/spinctrl.h \
 	wx/splitter.h \
-	wx/srchctrl.h \
 	wx/statline.h \
 	wx/tab.h \
 	wx/tabctrl.h \
@@ -3103,7 +3096,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/aui/aui.h \
 	wx/richtext/richtextctrl.h \
 	wx/richtext/richtextbuffer.h \
-	wx/richtext/richtexthtml.h \
 	wx/richtext/richtextstyles.h \
 	wx/richtext/richtextxml.h \
 	wx/richtext/richtextformatdlg.h \
@@ -3505,7 +3497,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
 	monodll_rgncmn.o \
 	monodll_settcmn.o \
 	monodll_sizer.o \
-	monodll_srchcmn.o \
 	monodll_statbar.o \
 	monodll_stockitem.o \
 	monodll_tbarbase.o \
@@ -3541,7 +3532,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
 	monodll_selstore.o \
 	monodll_spinctlg.o \
 	monodll_splitter.o \
-	monodll_srchctlg.o \
 	monodll_textdlgg.o \
 	monodll_tipwin.o \
 	monodll_toolbkg.o \
@@ -3680,7 +3670,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
 	monodll_rgncmn.o \
 	monodll_settcmn.o \
 	monodll_sizer.o \
-	monodll_srchcmn.o \
 	monodll_statbar.o \
 	monodll_stockitem.o \
 	monodll_tbarbase.o \
@@ -3716,7 +3705,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
 	monodll_selstore.o \
 	monodll_spinctlg.o \
 	monodll_splitter.o \
-	monodll_srchctlg.o \
 	monodll_textdlgg.o \
 	monodll_tipwin.o \
 	monodll_toolbkg.o \
@@ -3729,7 +3717,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
 @COND_TOOLKIT_COCOA@	monodll_gsockosx.o monodll_hid.o monodll_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_fontmgrcmn.o \
-	monodll_socketevtdispatch.o \
 	monodll_caret.o \
 	monodll_colour.o \
 	monodll_icon.o \
@@ -3994,7 +3981,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_fontutil.o \
 	monodll_utilsx11.o \
 	monodll_displayx11.o \
-	monodll_socketevtdispatch.o \
 	monodll_icon.o \
 	monodll_timer.o \
 	monodll_app.o \
@@ -4011,6 +3997,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_dcscreen.o \
 	monodll_evtloop.o \
 	monodll_font.o \
+	monodll_gsockx11.o \
 	monodll_minifram.o \
 	monodll_nanox.o \
 	monodll_palette.o \
@@ -4276,7 +4263,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS =  \
 	monodll_slider.o \
 	monodll_spinbutt.o \
 	monodll_spinctrl.o \
-	monodll_srchctrl.o \
 	monodll_statbmp.o \
 	monodll_statbox.o \
 	monodll_statbrma.o \
@@ -4562,7 +4548,6 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS =  \
 @COND_TOOLKIT_COCOA@	monodll_gsockosx.o monodll_hid.o monodll_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_fontmgrcmn.o \
-	monodll_socketevtdispatch.o \
 	monodll_caret.o \
 	monodll_colour.o \
 	monodll_icon.o \
@@ -4827,7 +4812,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_fontutil.o \
 	monodll_utilsx11.o \
 	monodll_displayx11.o \
-	monodll_socketevtdispatch.o \
 	monodll_icon.o \
 	monodll_timer.o \
 	monodll_app.o \
@@ -4844,6 +4828,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_dcscreen.o \
 	monodll_evtloop.o \
 	monodll_font.o \
+	monodll_gsockx11.o \
 	monodll_minifram.o \
 	monodll_nanox.o \
 	monodll_palette.o \
@@ -5286,7 +5271,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
 	monolib_rgncmn.o \
 	monolib_settcmn.o \
 	monolib_sizer.o \
-	monolib_srchcmn.o \
 	monolib_statbar.o \
 	monolib_stockitem.o \
 	monolib_tbarbase.o \
@@ -5322,7 +5306,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
 	monolib_selstore.o \
 	monolib_spinctlg.o \
 	monolib_splitter.o \
-	monolib_srchctlg.o \
 	monolib_textdlgg.o \
 	monolib_tipwin.o \
 	monolib_toolbkg.o \
@@ -5461,7 +5444,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
 	monolib_rgncmn.o \
 	monolib_settcmn.o \
 	monolib_sizer.o \
-	monolib_srchcmn.o \
 	monolib_statbar.o \
 	monolib_stockitem.o \
 	monolib_tbarbase.o \
@@ -5497,7 +5479,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
 	monolib_selstore.o \
 	monolib_spinctlg.o \
 	monolib_splitter.o \
-	monolib_srchctlg.o \
 	monolib_textdlgg.o \
 	monolib_tipwin.o \
 	monolib_toolbkg.o \
@@ -5510,7 +5491,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_COCOA@	monolib_gsockosx.o monolib_hid.o monolib_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_fontmgrcmn.o \
-	monolib_socketevtdispatch.o \
 	monolib_caret.o \
 	monolib_colour.o \
 	monolib_icon.o \
@@ -5776,7 +5756,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_fontutil.o \
 	monolib_utilsx11.o \
 	monolib_displayx11.o \
-	monolib_socketevtdispatch.o \
 	monolib_icon.o \
 	monolib_timer.o \
 	monolib_app.o \
@@ -5793,6 +5772,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_dcscreen.o \
 	monolib_evtloop.o \
 	monolib_font.o \
+	monolib_gsockx11.o \
 	monolib_minifram.o \
 	monolib_nanox.o \
 	monolib_palette.o \
@@ -6058,7 +6038,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 =  \
 	monolib_slider.o \
 	monolib_spinbutt.o \
 	monolib_spinctrl.o \
-	monolib_srchctrl.o \
 	monolib_statbmp.o \
 	monolib_statbox.o \
 	monolib_statbrma.o \
@@ -6344,7 +6323,6 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_COCOA@	monolib_gsockosx.o monolib_hid.o monolib_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_fontmgrcmn.o \
-	monolib_socketevtdispatch.o \
 	monolib_caret.o \
 	monolib_colour.o \
 	monolib_icon.o \
@@ -6610,7 +6588,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_fontutil.o \
 	monolib_utilsx11.o \
 	monolib_displayx11.o \
-	monolib_socketevtdispatch.o \
 	monolib_icon.o \
 	monolib_timer.o \
 	monolib_app.o \
@@ -6627,6 +6604,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_dcscreen.o \
 	monolib_evtloop.o \
 	monolib_font.o \
+	monolib_gsockx11.o \
 	monolib_minifram.o \
 	monolib_nanox.o \
 	monolib_palette.o \
@@ -7297,7 +7275,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
 	coredll_rgncmn.o \
 	coredll_settcmn.o \
 	coredll_sizer.o \
-	coredll_srchcmn.o \
 	coredll_statbar.o \
 	coredll_stockitem.o \
 	coredll_tbarbase.o \
@@ -7333,7 +7310,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
 	coredll_selstore.o \
 	coredll_spinctlg.o \
 	coredll_splitter.o \
-	coredll_srchctlg.o \
 	coredll_textdlgg.o \
 	coredll_tipwin.o \
 	coredll_toolbkg.o \
@@ -7472,7 +7448,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
 	coredll_rgncmn.o \
 	coredll_settcmn.o \
 	coredll_sizer.o \
-	coredll_srchcmn.o \
 	coredll_statbar.o \
 	coredll_stockitem.o \
 	coredll_tbarbase.o \
@@ -7508,7 +7483,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
 	coredll_selstore.o \
 	coredll_spinctlg.o \
 	coredll_splitter.o \
-	coredll_srchctlg.o \
 	coredll_textdlgg.o \
 	coredll_tipwin.o \
 	coredll_toolbkg.o \
@@ -7521,7 +7495,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
 @COND_TOOLKIT_COCOA@	coredll_gsockosx.o coredll_hid.o coredll_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_fontmgrcmn.o \
-	coredll_socketevtdispatch.o \
 	coredll_caret.o \
 	coredll_colour.o \
 	coredll_icon.o \
@@ -7787,7 +7760,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_fontutil.o \
 	coredll_utilsx11.o \
 	coredll_displayx11.o \
-	coredll_socketevtdispatch.o \
 	coredll_icon.o \
 	coredll_timer.o \
 	coredll_app.o \
@@ -7804,6 +7776,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_dcscreen.o \
 	coredll_evtloop.o \
 	coredll_font.o \
+	coredll_gsockx11.o \
 	coredll_minifram.o \
 	coredll_nanox.o \
 	coredll_palette.o \
@@ -8069,7 +8042,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 =  \
 	coredll_slider.o \
 	coredll_spinbutt.o \
 	coredll_spinctrl.o \
-	coredll_srchctrl.o \
 	coredll_statbmp.o \
 	coredll_statbox.o \
 	coredll_statbrma.o \
@@ -8355,7 +8327,6 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 =  \
 @COND_TOOLKIT_COCOA@	coredll_gsockosx.o coredll_hid.o coredll_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_fontmgrcmn.o \
-	coredll_socketevtdispatch.o \
 	coredll_caret.o \
 	coredll_colour.o \
 	coredll_icon.o \
@@ -8621,7 +8592,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_fontutil.o \
 	coredll_utilsx11.o \
 	coredll_displayx11.o \
-	coredll_socketevtdispatch.o \
 	coredll_icon.o \
 	coredll_timer.o \
 	coredll_app.o \
@@ -8638,6 +8608,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_dcscreen.o \
 	coredll_evtloop.o \
 	coredll_font.o \
+	coredll_gsockx11.o \
 	coredll_minifram.o \
 	coredll_nanox.o \
 	coredll_palette.o \
@@ -8752,7 +8723,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
 	corelib_rgncmn.o \
 	corelib_settcmn.o \
 	corelib_sizer.o \
-	corelib_srchcmn.o \
 	corelib_statbar.o \
 	corelib_stockitem.o \
 	corelib_tbarbase.o \
@@ -8788,7 +8758,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
 	corelib_selstore.o \
 	corelib_spinctlg.o \
 	corelib_splitter.o \
-	corelib_srchctlg.o \
 	corelib_textdlgg.o \
 	corelib_tipwin.o \
 	corelib_toolbkg.o \
@@ -8927,7 +8896,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
 	corelib_rgncmn.o \
 	corelib_settcmn.o \
 	corelib_sizer.o \
-	corelib_srchcmn.o \
 	corelib_statbar.o \
 	corelib_stockitem.o \
 	corelib_tbarbase.o \
@@ -8963,7 +8931,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
 	corelib_selstore.o \
 	corelib_spinctlg.o \
 	corelib_splitter.o \
-	corelib_srchctlg.o \
 	corelib_textdlgg.o \
 	corelib_tipwin.o \
 	corelib_toolbkg.o \
@@ -8976,7 +8943,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
 @COND_TOOLKIT_COCOA@	corelib_gsockosx.o corelib_hid.o corelib_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_fontmgrcmn.o \
-	corelib_socketevtdispatch.o \
 	corelib_caret.o \
 	corelib_colour.o \
 	corelib_icon.o \
@@ -9242,7 +9208,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_fontutil.o \
 	corelib_utilsx11.o \
 	corelib_displayx11.o \
-	corelib_socketevtdispatch.o \
 	corelib_icon.o \
 	corelib_timer.o \
 	corelib_app.o \
@@ -9259,6 +9224,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_dcscreen.o \
 	corelib_evtloop.o \
 	corelib_font.o \
+	corelib_gsockx11.o \
 	corelib_minifram.o \
 	corelib_nanox.o \
 	corelib_palette.o \
@@ -9524,7 +9490,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 =  \
 	corelib_slider.o \
 	corelib_spinbutt.o \
 	corelib_spinctrl.o \
-	corelib_srchctrl.o \
 	corelib_statbmp.o \
 	corelib_statbox.o \
 	corelib_statbrma.o \
@@ -9810,7 +9775,6 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 =  \
 @COND_TOOLKIT_COCOA@	corelib_gsockosx.o corelib_hid.o corelib_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_fontmgrcmn.o \
-	corelib_socketevtdispatch.o \
 	corelib_caret.o \
 	corelib_colour.o \
 	corelib_icon.o \
@@ -10076,7 +10040,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_fontutil.o \
 	corelib_utilsx11.o \
 	corelib_displayx11.o \
-	corelib_socketevtdispatch.o \
 	corelib_icon.o \
 	corelib_timer.o \
 	corelib_app.o \
@@ -10093,6 +10056,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_dcscreen.o \
 	corelib_evtloop.o \
 	corelib_font.o \
+	corelib_gsockx11.o \
 	corelib_minifram.o \
 	corelib_nanox.o \
 	corelib_palette.o \
@@ -12888,9 +12852,6 @@ monodll_notebmac.o: $(srcdir)/src/mac/carbon/notebmac.cpp $(MONODLL_ODEP)
 monodll_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
 
-monodll_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp
-
 monodll_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
 
@@ -14820,11 +14781,8 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1@monodll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp
 
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/gsockx11.cpp
 
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_nanox.o: $(srcdir)/src/x11/nanox.c $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/x11/nanox.c
@@ -16266,9 +16224,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@monodll_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
 
-@COND_USE_GUI_1@monodll_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
-
 @COND_USE_GUI_1@monodll_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
 
@@ -16374,9 +16329,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@monodll_splitter.o: $(srcdir)/src/generic/splitter.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
 
-@COND_USE_GUI_1@monodll_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp
-
 @COND_USE_GUI_1@monodll_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
 
@@ -17007,9 +16959,6 @@ monolib_notebmac.o: $(srcdir)/src/mac/carbon/notebmac.cpp $(MONOLIB_ODEP)
 monolib_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
 
-monolib_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp
-
 monolib_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
 
@@ -18939,11 +18888,8 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp
 
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/gsockx11.cpp
 
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_nanox.o: $(srcdir)/src/x11/nanox.c $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/x11/nanox.c
@@ -20385,9 +20331,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@monolib_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
 
-@COND_USE_GUI_1@monolib_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
-
 @COND_USE_GUI_1@monolib_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
 
@@ -20493,9 +20436,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@monolib_splitter.o: $(srcdir)/src/generic/splitter.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
 
-@COND_USE_GUI_1@monolib_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp
-
 @COND_USE_GUI_1@monolib_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
 
@@ -22125,9 +22065,6 @@ coredll_notebmac.o: $(srcdir)/src/mac/carbon/notebmac.cpp $(COREDLL_ODEP)
 coredll_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
 
-coredll_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(COREDLL_ODEP)
-	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp
-
 coredll_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
 
@@ -23439,11 +23376,8 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp
 
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/gsockx11.cpp
 
 @COND_TOOLKIT_X11_USE_GUI_1@coredll_nanox.o: $(srcdir)/src/x11/nanox.c $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/x11/nanox.c
@@ -24849,9 +24783,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@coredll_sizer.o: $(srcdir)/src/common/sizer.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
 
-@COND_USE_GUI_1@coredll_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
-
 @COND_USE_GUI_1@coredll_statbar.o: $(srcdir)/src/common/statbar.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
 
@@ -24957,9 +24888,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@coredll_splitter.o: $(srcdir)/src/generic/splitter.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
 
-@COND_USE_GUI_1@coredll_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp
-
 @COND_USE_GUI_1@coredll_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
 
@@ -25080,9 +25008,6 @@ corelib_notebmac.o: $(srcdir)/src/mac/carbon/notebmac.cpp $(CORELIB_ODEP)
 corelib_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
 
-corelib_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(CORELIB_ODEP)
-	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp
-
 corelib_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
 
@@ -26394,11 +26319,8 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp
 
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/gsockx11.cpp
 
 @COND_TOOLKIT_X11_USE_GUI_1@corelib_nanox.o: $(srcdir)/src/x11/nanox.c $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/x11/nanox.c
@@ -27804,9 +27726,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@corelib_sizer.o: $(srcdir)/src/common/sizer.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
 
-@COND_USE_GUI_1@corelib_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
-
 @COND_USE_GUI_1@corelib_statbar.o: $(srcdir)/src/common/statbar.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
 
@@ -27912,9 +27831,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@corelib_splitter.o: $(srcdir)/src/generic/splitter.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
 
-@COND_USE_GUI_1@corelib_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp
-
 @COND_USE_GUI_1@corelib_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
 

build/bakefiles/files.bkl

@@ -638,7 +638,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/rgncmn.cpp
     src/common/settcmn.cpp
     src/common/sizer.cpp
-    src/common/srchcmn.cpp
     src/common/statbar.cpp
     src/common/stockitem.cpp
     src/common/tbarbase.cpp
@@ -674,7 +673,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/selstore.cpp
     src/generic/spinctlg.cpp
     src/generic/splitter.cpp
-    src/generic/srchctlg.cpp
     src/generic/textdlgg.cpp
     src/generic/tipwin.cpp
     src/generic/toolbkg.cpp
@@ -738,7 +736,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/scrolwin.h
     wx/generic/spinctlg.h
     wx/generic/splitter.h
-    wx/generic/srchctlg.h
     wx/generic/textdlgg.h
     wx/generic/timer.h
     wx/generic/treectlg.h
@@ -857,7 +854,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/spinbutt.h
     wx/spinctrl.h
     wx/splitter.h
-    wx/srchctrl.h
     wx/statline.h
     wx/tab.h
     wx/tabctrl.h
@@ -1399,7 +1395,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="X11_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
-    src/common/socketevtdispatch.cpp
     src/generic/icon.cpp
     src/generic/timer.cpp
     src/x11/app.cpp
@@ -1416,6 +1411,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/x11/dcscreen.cpp
     src/x11/evtloop.cpp
     src/x11/font.cpp
+    src/x11/gsockx11.cpp
     src/x11/minifram.cpp
     src/x11/nanox.c
     src/x11/palette.cpp
@@ -1818,7 +1814,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="DFB_LOWLEVEL_SRC" hints="files">
     src/common/fontmgrcmn.cpp
-    src/common/socketevtdispatch.cpp
     src/generic/caret.cpp
     src/generic/colour.cpp
     src/generic/icon.cpp
@@ -2140,7 +2135,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/carbon/slider.cpp
     src/mac/carbon/spinbutt.cpp
     src/mac/carbon/spinctrl.cpp
-    src/mac/carbon/srchctrl.cpp
     src/mac/carbon/statbmp.cpp
     src/mac/carbon/statbox.cpp
     src/mac/carbon/statbrma.cpp
@@ -2233,7 +2227,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/sound.h
     wx/mac/spinbutt.h
     wx/mac/spinctrl.h
-    wx/mac/srchctrl.h
     wx/mac/statbmp.h
     wx/mac/statbox.h
     wx/mac/statline.h
@@ -2310,9 +2303,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/carbon/printdlg.h
     wx/mac/carbon/printmac.h
     wx/mac/carbon/private.h
-    wx/mac/carbon/private/mactext.h
-    wx/mac/carbon/private/overlay.h
-    wx/mac/carbon/private/print.h
     wx/mac/carbon/radiobox.h
     wx/mac/carbon/radiobut.h
     wx/mac/carbon/region.h
@@ -2320,7 +2310,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/carbon/slider.h
     wx/mac/carbon/spinbutt.h
     wx/mac/carbon/spinctrl.h
-    wx/mac/carbon/srchctrl.h
     wx/mac/carbon/statbmp.h
     wx/mac/carbon/statbox.h
     wx/mac/carbon/statline.h
@@ -3169,7 +3158,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="RICHTEXT_HDR" hints="files">
     wx/richtext/richtextctrl.h
     wx/richtext/richtextbuffer.h
-    wx/richtext/richtexthtml.h
     wx/richtext/richtextstyles.h
     wx/richtext/richtextxml.h
     wx/richtext/richtextformatdlg.h

build/msw/makefile.bcc

@@ -1490,7 +1490,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_rgncmn.obj \
 	$(OBJS)\monodll_settcmn.obj \
 	$(OBJS)\monodll_sizer.obj \
-	$(OBJS)\monodll_srchcmn.obj \
 	$(OBJS)\monodll_statbar.obj \
 	$(OBJS)\monodll_stockitem.obj \
 	$(OBJS)\monodll_tbarbase.obj \
@@ -1526,7 +1525,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_selstore.obj \
 	$(OBJS)\monodll_spinctlg.obj \
 	$(OBJS)\monodll_splitter.obj \
-	$(OBJS)\monodll_srchctlg.obj \
 	$(OBJS)\monodll_textdlgg.obj \
 	$(OBJS)\monodll_tipwin.obj \
 	$(OBJS)\monodll_toolbkg.obj \
@@ -1715,7 +1713,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_rgncmn.obj \
 	$(OBJS)\monodll_settcmn.obj \
 	$(OBJS)\monodll_sizer.obj \
-	$(OBJS)\monodll_srchcmn.obj \
 	$(OBJS)\monodll_statbar.obj \
 	$(OBJS)\monodll_stockitem.obj \
 	$(OBJS)\monodll_tbarbase.obj \
@@ -1751,7 +1748,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_selstore.obj \
 	$(OBJS)\monodll_spinctlg.obj \
 	$(OBJS)\monodll_splitter.obj \
-	$(OBJS)\monodll_srchctlg.obj \
 	$(OBJS)\monodll_textdlgg.obj \
 	$(OBJS)\monodll_tipwin.obj \
 	$(OBJS)\monodll_toolbkg.obj \
@@ -2106,7 +2102,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_rgncmn.obj \
 	$(OBJS)\monolib_settcmn.obj \
 	$(OBJS)\monolib_sizer.obj \
-	$(OBJS)\monolib_srchcmn.obj \
 	$(OBJS)\monolib_statbar.obj \
 	$(OBJS)\monolib_stockitem.obj \
 	$(OBJS)\monolib_tbarbase.obj \
@@ -2142,7 +2137,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_selstore.obj \
 	$(OBJS)\monolib_spinctlg.obj \
 	$(OBJS)\monolib_splitter.obj \
-	$(OBJS)\monolib_srchctlg.obj \
 	$(OBJS)\monolib_textdlgg.obj \
 	$(OBJS)\monolib_tipwin.obj \
 	$(OBJS)\monolib_toolbkg.obj \
@@ -2331,7 +2325,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_rgncmn.obj \
 	$(OBJS)\monolib_settcmn.obj \
 	$(OBJS)\monolib_sizer.obj \
-	$(OBJS)\monolib_srchcmn.obj \
 	$(OBJS)\monolib_statbar.obj \
 	$(OBJS)\monolib_stockitem.obj \
 	$(OBJS)\monolib_tbarbase.obj \
@@ -2367,7 +2360,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_selstore.obj \
 	$(OBJS)\monolib_spinctlg.obj \
 	$(OBJS)\monolib_splitter.obj \
-	$(OBJS)\monolib_srchctlg.obj \
 	$(OBJS)\monolib_textdlgg.obj \
 	$(OBJS)\monolib_tipwin.obj \
 	$(OBJS)\monolib_toolbkg.obj \
@@ -2630,7 +2622,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_rgncmn.obj \
 	$(OBJS)\coredll_settcmn.obj \
 	$(OBJS)\coredll_sizer.obj \
-	$(OBJS)\coredll_srchcmn.obj \
 	$(OBJS)\coredll_statbar.obj \
 	$(OBJS)\coredll_stockitem.obj \
 	$(OBJS)\coredll_tbarbase.obj \
@@ -2666,7 +2657,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_selstore.obj \
 	$(OBJS)\coredll_spinctlg.obj \
 	$(OBJS)\coredll_splitter.obj \
-	$(OBJS)\coredll_srchctlg.obj \
 	$(OBJS)\coredll_textdlgg.obj \
 	$(OBJS)\coredll_tipwin.obj \
 	$(OBJS)\coredll_toolbkg.obj \
@@ -2855,7 +2845,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_rgncmn.obj \
 	$(OBJS)\coredll_settcmn.obj \
 	$(OBJS)\coredll_sizer.obj \
-	$(OBJS)\coredll_srchcmn.obj \
 	$(OBJS)\coredll_statbar.obj \
 	$(OBJS)\coredll_stockitem.obj \
 	$(OBJS)\coredll_tbarbase.obj \
@@ -2891,7 +2880,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_selstore.obj \
 	$(OBJS)\coredll_spinctlg.obj \
 	$(OBJS)\coredll_splitter.obj \
-	$(OBJS)\coredll_srchctlg.obj \
 	$(OBJS)\coredll_textdlgg.obj \
 	$(OBJS)\coredll_tipwin.obj \
 	$(OBJS)\coredll_toolbkg.obj \
@@ -3081,7 +3069,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_rgncmn.obj \
 	$(OBJS)\corelib_settcmn.obj \
 	$(OBJS)\corelib_sizer.obj \
-	$(OBJS)\corelib_srchcmn.obj \
 	$(OBJS)\corelib_statbar.obj \
 	$(OBJS)\corelib_stockitem.obj \
 	$(OBJS)\corelib_tbarbase.obj \
@@ -3117,7 +3104,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_selstore.obj \
 	$(OBJS)\corelib_spinctlg.obj \
 	$(OBJS)\corelib_splitter.obj \
-	$(OBJS)\corelib_srchctlg.obj \
 	$(OBJS)\corelib_textdlgg.obj \
 	$(OBJS)\corelib_tipwin.obj \
 	$(OBJS)\corelib_toolbkg.obj \
@@ -3306,7 +3292,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_rgncmn.obj \
 	$(OBJS)\corelib_settcmn.obj \
 	$(OBJS)\corelib_sizer.obj \
-	$(OBJS)\corelib_srchcmn.obj \
 	$(OBJS)\corelib_statbar.obj \
 	$(OBJS)\corelib_stockitem.obj \
 	$(OBJS)\corelib_tbarbase.obj \
@@ -3342,7 +3327,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_selstore.obj \
 	$(OBJS)\corelib_spinctlg.obj \
 	$(OBJS)\corelib_splitter.obj \
-	$(OBJS)\corelib_srchctlg.obj \
 	$(OBJS)\corelib_textdlgg.obj \
 	$(OBJS)\corelib_tipwin.obj \
 	$(OBJS)\corelib_toolbkg.obj \
@@ -6177,11 +6161,6 @@ $(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6357,11 +6336,6 @@ $(OBJS)\monodll_splitter.obj: ..\..\src\generic\splitter.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -8174,11 +8148,6 @@ $(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -8354,11 +8323,6 @@ $(OBJS)\monolib_splitter.obj: ..\..\src\generic\splitter.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -10195,11 +10159,6 @@ $(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -10375,11 +10334,6 @@ $(OBJS)\coredll_splitter.obj: ..\..\src\generic\splitter.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -11470,11 +11424,6 @@ $(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -11650,11 +11599,6 @@ $(OBJS)\corelib_splitter.obj: ..\..\src\generic\splitter.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**

build/msw/makefile.gcc

@@ -1500,7 +1500,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_rgncmn.o \
 	$(OBJS)\monodll_settcmn.o \
 	$(OBJS)\monodll_sizer.o \
-	$(OBJS)\monodll_srchcmn.o \
 	$(OBJS)\monodll_statbar.o \
 	$(OBJS)\monodll_stockitem.o \
 	$(OBJS)\monodll_tbarbase.o \
@@ -1536,7 +1535,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_selstore.o \
 	$(OBJS)\monodll_spinctlg.o \
 	$(OBJS)\monodll_splitter.o \
-	$(OBJS)\monodll_srchctlg.o \
 	$(OBJS)\monodll_textdlgg.o \
 	$(OBJS)\monodll_tipwin.o \
 	$(OBJS)\monodll_toolbkg.o \
@@ -1727,7 +1725,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_rgncmn.o \
 	$(OBJS)\monodll_settcmn.o \
 	$(OBJS)\monodll_sizer.o \
-	$(OBJS)\monodll_srchcmn.o \
 	$(OBJS)\monodll_statbar.o \
 	$(OBJS)\monodll_stockitem.o \
 	$(OBJS)\monodll_tbarbase.o \
@@ -1763,7 +1760,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_selstore.o \
 	$(OBJS)\monodll_spinctlg.o \
 	$(OBJS)\monodll_splitter.o \
-	$(OBJS)\monodll_srchctlg.o \
 	$(OBJS)\monodll_textdlgg.o \
 	$(OBJS)\monodll_tipwin.o \
 	$(OBJS)\monodll_toolbkg.o \
@@ -2122,7 +2118,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_rgncmn.o \
 	$(OBJS)\monolib_settcmn.o \
 	$(OBJS)\monolib_sizer.o \
-	$(OBJS)\monolib_srchcmn.o \
 	$(OBJS)\monolib_statbar.o \
 	$(OBJS)\monolib_stockitem.o \
 	$(OBJS)\monolib_tbarbase.o \
@@ -2158,7 +2153,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_selstore.o \
 	$(OBJS)\monolib_spinctlg.o \
 	$(OBJS)\monolib_splitter.o \
-	$(OBJS)\monolib_srchctlg.o \
 	$(OBJS)\monolib_textdlgg.o \
 	$(OBJS)\monolib_tipwin.o \
 	$(OBJS)\monolib_toolbkg.o \
@@ -2349,7 +2343,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_rgncmn.o \
 	$(OBJS)\monolib_settcmn.o \
 	$(OBJS)\monolib_sizer.o \
-	$(OBJS)\monolib_srchcmn.o \
 	$(OBJS)\monolib_statbar.o \
 	$(OBJS)\monolib_stockitem.o \
 	$(OBJS)\monolib_tbarbase.o \
@@ -2385,7 +2378,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_selstore.o \
 	$(OBJS)\monolib_spinctlg.o \
 	$(OBJS)\monolib_splitter.o \
-	$(OBJS)\monolib_srchctlg.o \
 	$(OBJS)\monolib_textdlgg.o \
 	$(OBJS)\monolib_tipwin.o \
 	$(OBJS)\monolib_toolbkg.o \
@@ -2662,7 +2654,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_rgncmn.o \
 	$(OBJS)\coredll_settcmn.o \
 	$(OBJS)\coredll_sizer.o \
-	$(OBJS)\coredll_srchcmn.o \
 	$(OBJS)\coredll_statbar.o \
 	$(OBJS)\coredll_stockitem.o \
 	$(OBJS)\coredll_tbarbase.o \
@@ -2698,7 +2689,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_selstore.o \
 	$(OBJS)\coredll_spinctlg.o \
 	$(OBJS)\coredll_splitter.o \
-	$(OBJS)\coredll_srchctlg.o \
 	$(OBJS)\coredll_textdlgg.o \
 	$(OBJS)\coredll_tipwin.o \
 	$(OBJS)\coredll_toolbkg.o \
@@ -2889,7 +2879,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_rgncmn.o \
 	$(OBJS)\coredll_settcmn.o \
 	$(OBJS)\coredll_sizer.o \
-	$(OBJS)\coredll_srchcmn.o \
 	$(OBJS)\coredll_statbar.o \
 	$(OBJS)\coredll_stockitem.o \
 	$(OBJS)\coredll_tbarbase.o \
@@ -2925,7 +2914,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_selstore.o \
 	$(OBJS)\coredll_spinctlg.o \
 	$(OBJS)\coredll_splitter.o \
-	$(OBJS)\coredll_srchctlg.o \
 	$(OBJS)\coredll_textdlgg.o \
 	$(OBJS)\coredll_tipwin.o \
 	$(OBJS)\coredll_toolbkg.o \
@@ -3121,7 +3109,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_rgncmn.o \
 	$(OBJS)\corelib_settcmn.o \
 	$(OBJS)\corelib_sizer.o \
-	$(OBJS)\corelib_srchcmn.o \
 	$(OBJS)\corelib_statbar.o \
 	$(OBJS)\corelib_stockitem.o \
 	$(OBJS)\corelib_tbarbase.o \
@@ -3157,7 +3144,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_selstore.o \
 	$(OBJS)\corelib_spinctlg.o \
 	$(OBJS)\corelib_splitter.o \
-	$(OBJS)\corelib_srchctlg.o \
 	$(OBJS)\corelib_textdlgg.o \
 	$(OBJS)\corelib_tipwin.o \
 	$(OBJS)\corelib_toolbkg.o \
@@ -3348,7 +3334,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_rgncmn.o \
 	$(OBJS)\corelib_settcmn.o \
 	$(OBJS)\corelib_sizer.o \
-	$(OBJS)\corelib_srchcmn.o \
 	$(OBJS)\corelib_statbar.o \
 	$(OBJS)\corelib_stockitem.o \
 	$(OBJS)\corelib_tbarbase.o \
@@ -3384,7 +3369,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_selstore.o \
 	$(OBJS)\corelib_spinctlg.o \
 	$(OBJS)\corelib_splitter.o \
-	$(OBJS)\corelib_srchctlg.o \
 	$(OBJS)\corelib_textdlgg.o \
 	$(OBJS)\corelib_tipwin.o \
 	$(OBJS)\corelib_toolbkg.o \
@@ -6394,11 +6378,6 @@ $(OBJS)\monodll_sizer.o: ../../src/common/sizer.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_srchcmn.o: ../../src/common/srchcmn.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_statbar.o: ../../src/common/statbar.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -6574,11 +6553,6 @@ $(OBJS)\monodll_splitter.o: ../../src/generic/splitter.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_srchctlg.o: ../../src/generic/srchctlg.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_textdlgg.o: ../../src/generic/textdlgg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8491,11 +8465,6 @@ $(OBJS)\monolib_sizer.o: ../../src/common/sizer.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_srchcmn.o: ../../src/common/srchcmn.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_statbar.o: ../../src/common/statbar.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -8671,11 +8640,6 @@ $(OBJS)\monolib_splitter.o: ../../src/generic/splitter.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_srchctlg.o: ../../src/generic/srchctlg.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_textdlgg.o: ../../src/generic/textdlgg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10612,11 +10576,6 @@ $(OBJS)\coredll_sizer.o: ../../src/common/sizer.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_srchcmn.o: ../../src/common/srchcmn.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_statbar.o: ../../src/common/statbar.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -10792,11 +10751,6 @@ $(OBJS)\coredll_splitter.o: ../../src/generic/splitter.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_srchctlg.o: ../../src/generic/srchctlg.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_textdlgg.o: ../../src/generic/textdlgg.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -11987,11 +11941,6 @@ $(OBJS)\corelib_sizer.o: ../../src/common/sizer.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_srchcmn.o: ../../src/common/srchcmn.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_statbar.o: ../../src/common/statbar.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -12167,11 +12116,6 @@ $(OBJS)\corelib_splitter.o: ../../src/generic/splitter.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_srchctlg.o: ../../src/generic/srchctlg.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_textdlgg.o: ../../src/generic/textdlgg.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<

build/msw/makefile.vc

@@ -1657,7 +1657,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_rgncmn.obj \
 	$(OBJS)\monodll_settcmn.obj \
 	$(OBJS)\monodll_sizer.obj \
-	$(OBJS)\monodll_srchcmn.obj \
 	$(OBJS)\monodll_statbar.obj \
 	$(OBJS)\monodll_stockitem.obj \
 	$(OBJS)\monodll_tbarbase.obj \
@@ -1693,7 +1692,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_selstore.obj \
 	$(OBJS)\monodll_spinctlg.obj \
 	$(OBJS)\monodll_splitter.obj \
-	$(OBJS)\monodll_srchctlg.obj \
 	$(OBJS)\monodll_textdlgg.obj \
 	$(OBJS)\monodll_tipwin.obj \
 	$(OBJS)\monodll_toolbkg.obj \
@@ -1882,7 +1880,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_rgncmn.obj \
 	$(OBJS)\monodll_settcmn.obj \
 	$(OBJS)\monodll_sizer.obj \
-	$(OBJS)\monodll_srchcmn.obj \
 	$(OBJS)\monodll_statbar.obj \
 	$(OBJS)\monodll_stockitem.obj \
 	$(OBJS)\monodll_tbarbase.obj \
@@ -1918,7 +1915,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_selstore.obj \
 	$(OBJS)\monodll_spinctlg.obj \
 	$(OBJS)\monodll_splitter.obj \
-	$(OBJS)\monodll_srchctlg.obj \
 	$(OBJS)\monodll_textdlgg.obj \
 	$(OBJS)\monodll_tipwin.obj \
 	$(OBJS)\monodll_toolbkg.obj \
@@ -2279,7 +2275,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_rgncmn.obj \
 	$(OBJS)\monolib_settcmn.obj \
 	$(OBJS)\monolib_sizer.obj \
-	$(OBJS)\monolib_srchcmn.obj \
 	$(OBJS)\monolib_statbar.obj \
 	$(OBJS)\monolib_stockitem.obj \
 	$(OBJS)\monolib_tbarbase.obj \
@@ -2315,7 +2310,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_selstore.obj \
 	$(OBJS)\monolib_spinctlg.obj \
 	$(OBJS)\monolib_splitter.obj \
-	$(OBJS)\monolib_srchctlg.obj \
 	$(OBJS)\monolib_textdlgg.obj \
 	$(OBJS)\monolib_tipwin.obj \
 	$(OBJS)\monolib_toolbkg.obj \
@@ -2504,7 +2498,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_rgncmn.obj \
 	$(OBJS)\monolib_settcmn.obj \
 	$(OBJS)\monolib_sizer.obj \
-	$(OBJS)\monolib_srchcmn.obj \
 	$(OBJS)\monolib_statbar.obj \
 	$(OBJS)\monolib_stockitem.obj \
 	$(OBJS)\monolib_tbarbase.obj \
@@ -2540,7 +2533,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_selstore.obj \
 	$(OBJS)\monolib_spinctlg.obj \
 	$(OBJS)\monolib_splitter.obj \
-	$(OBJS)\monolib_srchctlg.obj \
 	$(OBJS)\monolib_textdlgg.obj \
 	$(OBJS)\monolib_tipwin.obj \
 	$(OBJS)\monolib_toolbkg.obj \
@@ -2833,7 +2825,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_rgncmn.obj \
 	$(OBJS)\coredll_settcmn.obj \
 	$(OBJS)\coredll_sizer.obj \
-	$(OBJS)\coredll_srchcmn.obj \
 	$(OBJS)\coredll_statbar.obj \
 	$(OBJS)\coredll_stockitem.obj \
 	$(OBJS)\coredll_tbarbase.obj \
@@ -2869,7 +2860,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_selstore.obj \
 	$(OBJS)\coredll_spinctlg.obj \
 	$(OBJS)\coredll_splitter.obj \
-	$(OBJS)\coredll_srchctlg.obj \
 	$(OBJS)\coredll_textdlgg.obj \
 	$(OBJS)\coredll_tipwin.obj \
 	$(OBJS)\coredll_toolbkg.obj \
@@ -3058,7 +3048,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_rgncmn.obj \
 	$(OBJS)\coredll_settcmn.obj \
 	$(OBJS)\coredll_sizer.obj \
-	$(OBJS)\coredll_srchcmn.obj \
 	$(OBJS)\coredll_statbar.obj \
 	$(OBJS)\coredll_stockitem.obj \
 	$(OBJS)\coredll_tbarbase.obj \
@@ -3094,7 +3083,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_selstore.obj \
 	$(OBJS)\coredll_spinctlg.obj \
 	$(OBJS)\coredll_splitter.obj \
-	$(OBJS)\coredll_srchctlg.obj \
 	$(OBJS)\coredll_textdlgg.obj \
 	$(OBJS)\coredll_tipwin.obj \
 	$(OBJS)\coredll_toolbkg.obj \
@@ -3290,7 +3278,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_rgncmn.obj \
 	$(OBJS)\corelib_settcmn.obj \
 	$(OBJS)\corelib_sizer.obj \
-	$(OBJS)\corelib_srchcmn.obj \
 	$(OBJS)\corelib_statbar.obj \
 	$(OBJS)\corelib_stockitem.obj \
 	$(OBJS)\corelib_tbarbase.obj \
@@ -3326,7 +3313,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_selstore.obj \
 	$(OBJS)\corelib_spinctlg.obj \
 	$(OBJS)\corelib_splitter.obj \
-	$(OBJS)\corelib_srchctlg.obj \
 	$(OBJS)\corelib_textdlgg.obj \
 	$(OBJS)\corelib_tipwin.obj \
 	$(OBJS)\corelib_toolbkg.obj \
@@ -3515,7 +3501,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_rgncmn.obj \
 	$(OBJS)\corelib_settcmn.obj \
 	$(OBJS)\corelib_sizer.obj \
-	$(OBJS)\corelib_srchcmn.obj \
 	$(OBJS)\corelib_statbar.obj \
 	$(OBJS)\corelib_stockitem.obj \
 	$(OBJS)\corelib_tbarbase.obj \
@@ -3551,7 +3536,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_selstore.obj \
 	$(OBJS)\corelib_spinctlg.obj \
 	$(OBJS)\corelib_splitter.obj \
-	$(OBJS)\corelib_srchctlg.obj \
 	$(OBJS)\corelib_textdlgg.obj \
 	$(OBJS)\corelib_tipwin.obj \
 	$(OBJS)\corelib_toolbkg.obj \
@@ -6510,11 +6494,6 @@ $(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6690,11 +6669,6 @@ $(OBJS)\monodll_splitter.obj: ..\..\src\generic\splitter.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -8507,11 +8481,6 @@ $(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8687,11 +8656,6 @@ $(OBJS)\monolib_splitter.obj: ..\..\src\generic\splitter.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -10528,11 +10492,6 @@ $(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -10708,11 +10667,6 @@ $(OBJS)\coredll_splitter.obj: ..\..\src\generic\splitter.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -11803,11 +11757,6 @@ $(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -11983,11 +11932,6 @@ $(OBJS)\corelib_splitter.obj: ..\..\src\generic\splitter.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**

build/msw/makefile.wat

@@ -383,7 +383,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_rgncmn.obj &
 	$(OBJS)\monodll_settcmn.obj &
 	$(OBJS)\monodll_sizer.obj &
-	$(OBJS)\monodll_srchcmn.obj &
 	$(OBJS)\monodll_statbar.obj &
 	$(OBJS)\monodll_stockitem.obj &
 	$(OBJS)\monodll_tbarbase.obj &
@@ -419,7 +418,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_selstore.obj &
 	$(OBJS)\monodll_spinctlg.obj &
 	$(OBJS)\monodll_splitter.obj &
-	$(OBJS)\monodll_srchctlg.obj &
 	$(OBJS)\monodll_textdlgg.obj &
 	$(OBJS)\monodll_tipwin.obj &
 	$(OBJS)\monodll_toolbkg.obj &
@@ -610,7 +608,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_rgncmn.obj &
 	$(OBJS)\monodll_settcmn.obj &
 	$(OBJS)\monodll_sizer.obj &
-	$(OBJS)\monodll_srchcmn.obj &
 	$(OBJS)\monodll_statbar.obj &
 	$(OBJS)\monodll_stockitem.obj &
 	$(OBJS)\monodll_tbarbase.obj &
@@ -646,7 +643,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_selstore.obj &
 	$(OBJS)\monodll_spinctlg.obj &
 	$(OBJS)\monodll_splitter.obj &
-	$(OBJS)\monodll_srchctlg.obj &
 	$(OBJS)\monodll_textdlgg.obj &
 	$(OBJS)\monodll_tipwin.obj &
 	$(OBJS)\monodll_toolbkg.obj &
@@ -1009,7 +1005,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_rgncmn.obj &
 	$(OBJS)\monolib_settcmn.obj &
 	$(OBJS)\monolib_sizer.obj &
-	$(OBJS)\monolib_srchcmn.obj &
 	$(OBJS)\monolib_statbar.obj &
 	$(OBJS)\monolib_stockitem.obj &
 	$(OBJS)\monolib_tbarbase.obj &
@@ -1045,7 +1040,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_selstore.obj &
 	$(OBJS)\monolib_spinctlg.obj &
 	$(OBJS)\monolib_splitter.obj &
-	$(OBJS)\monolib_srchctlg.obj &
 	$(OBJS)\monolib_textdlgg.obj &
 	$(OBJS)\monolib_tipwin.obj &
 	$(OBJS)\monolib_toolbkg.obj &
@@ -1236,7 +1230,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_rgncmn.obj &
 	$(OBJS)\monolib_settcmn.obj &
 	$(OBJS)\monolib_sizer.obj &
-	$(OBJS)\monolib_srchcmn.obj &
 	$(OBJS)\monolib_statbar.obj &
 	$(OBJS)\monolib_stockitem.obj &
 	$(OBJS)\monolib_tbarbase.obj &
@@ -1272,7 +1265,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_selstore.obj &
 	$(OBJS)\monolib_spinctlg.obj &
 	$(OBJS)\monolib_splitter.obj &
-	$(OBJS)\monolib_srchctlg.obj &
 	$(OBJS)\monolib_textdlgg.obj &
 	$(OBJS)\monolib_tipwin.obj &
 	$(OBJS)\monolib_toolbkg.obj &
@@ -1556,7 +1548,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_rgncmn.obj &
 	$(OBJS)\coredll_settcmn.obj &
 	$(OBJS)\coredll_sizer.obj &
-	$(OBJS)\coredll_srchcmn.obj &
 	$(OBJS)\coredll_statbar.obj &
 	$(OBJS)\coredll_stockitem.obj &
 	$(OBJS)\coredll_tbarbase.obj &
@@ -1592,7 +1583,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_selstore.obj &
 	$(OBJS)\coredll_spinctlg.obj &
 	$(OBJS)\coredll_splitter.obj &
-	$(OBJS)\coredll_srchctlg.obj &
 	$(OBJS)\coredll_textdlgg.obj &
 	$(OBJS)\coredll_tipwin.obj &
 	$(OBJS)\coredll_toolbkg.obj &
@@ -1783,7 +1773,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_rgncmn.obj &
 	$(OBJS)\coredll_settcmn.obj &
 	$(OBJS)\coredll_sizer.obj &
-	$(OBJS)\coredll_srchcmn.obj &
 	$(OBJS)\coredll_statbar.obj &
 	$(OBJS)\coredll_stockitem.obj &
 	$(OBJS)\coredll_tbarbase.obj &
@@ -1819,7 +1808,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_selstore.obj &
 	$(OBJS)\coredll_spinctlg.obj &
 	$(OBJS)\coredll_splitter.obj &
-	$(OBJS)\coredll_srchctlg.obj &
 	$(OBJS)\coredll_textdlgg.obj &
 	$(OBJS)\coredll_tipwin.obj &
 	$(OBJS)\coredll_toolbkg.obj &
@@ -2017,7 +2005,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_rgncmn.obj &
 	$(OBJS)\corelib_settcmn.obj &
 	$(OBJS)\corelib_sizer.obj &
-	$(OBJS)\corelib_srchcmn.obj &
 	$(OBJS)\corelib_statbar.obj &
 	$(OBJS)\corelib_stockitem.obj &
 	$(OBJS)\corelib_tbarbase.obj &
@@ -2053,7 +2040,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_selstore.obj &
 	$(OBJS)\corelib_spinctlg.obj &
 	$(OBJS)\corelib_splitter.obj &
-	$(OBJS)\corelib_srchctlg.obj &
 	$(OBJS)\corelib_textdlgg.obj &
 	$(OBJS)\corelib_tipwin.obj &
 	$(OBJS)\corelib_toolbkg.obj &
@@ -2244,7 +2230,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_rgncmn.obj &
 	$(OBJS)\corelib_settcmn.obj &
 	$(OBJS)\corelib_sizer.obj &
-	$(OBJS)\corelib_srchcmn.obj &
 	$(OBJS)\corelib_statbar.obj &
 	$(OBJS)\corelib_stockitem.obj &
 	$(OBJS)\corelib_tbarbase.obj &
@@ -2280,7 +2265,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_selstore.obj &
 	$(OBJS)\corelib_spinctlg.obj &
 	$(OBJS)\corelib_splitter.obj &
-	$(OBJS)\corelib_srchctlg.obj &
 	$(OBJS)\corelib_textdlgg.obj &
 	$(OBJS)\corelib_tipwin.obj &
 	$(OBJS)\corelib_toolbkg.obj &
@@ -6622,11 +6606,6 @@ $(OBJS)\monodll_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monodll_srchcmn.obj :  .AUTODEPEND ..\..\src\common\srchcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\monodll_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6802,11 +6781,6 @@ $(OBJS)\monodll_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monodll_srchctlg.obj :  .AUTODEPEND ..\..\src\generic\srchctlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\monodll_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -8719,11 +8693,6 @@ $(OBJS)\monolib_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monolib_srchcmn.obj :  .AUTODEPEND ..\..\src\common\srchcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\monolib_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8899,11 +8868,6 @@ $(OBJS)\monolib_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monolib_srchctlg.obj :  .AUTODEPEND ..\..\src\generic\srchctlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\monolib_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -10840,11 +10804,6 @@ $(OBJS)\coredll_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_srchcmn.obj :  .AUTODEPEND ..\..\src\common\srchcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\coredll_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -11020,11 +10979,6 @@ $(OBJS)\coredll_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_srchctlg.obj :  .AUTODEPEND ..\..\src\generic\srchctlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\coredll_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -12215,11 +12169,6 @@ $(OBJS)\corelib_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_srchcmn.obj :  .AUTODEPEND ..\..\src\common\srchcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\corelib_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -12395,11 +12344,6 @@ $(OBJS)\corelib_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_srchctlg.obj :  .AUTODEPEND ..\..\src\generic\srchctlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\corelib_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<

build/msw/wx_core.dsp

@@ -778,10 +778,6 @@ SOURCE=..\..\src\common\sizer.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\common\srchcmn.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\common\statbar.cpp
 # End Source File
 # Begin Source File
@@ -4678,10 +4674,6 @@ SOURCE=..\..\src\generic\splitter.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\srchctlg.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\generic\statusbr.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
@@ -8361,10 +8353,6 @@ SOURCE=..\..\include\wx\generic\splitter.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\srchctlg.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\generic\statusbr.h
 # End Source File
 # Begin Source File
@@ -9205,10 +9193,6 @@ SOURCE=..\..\include\wx\richtext\richtextformatdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\richtext\richtexthtml.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\richtext\richtextprint.h
 # End Source File
 # Begin Source File
@@ -9281,10 +9265,6 @@ SOURCE=..\..\include\wx\splitter.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\srchctrl.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\statbmp.h
 # End Source File
 # Begin Source File

build/msw/wx_richtext.dsp

@@ -970,10 +970,6 @@ SOURCE=..\..\include\wx\richtext\richtextformatdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\richtext\richtexthtml.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\richtext\richtextprint.h
 # End Source File
 # Begin Source File

build/os2/makefile.wat

@@ -352,7 +352,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_rgncmn.obj &
 	$(OBJS)\monodll_settcmn.obj &
 	$(OBJS)\monodll_sizer.obj &
-	$(OBJS)\monodll_srchcmn.obj &
 	$(OBJS)\monodll_statbar.obj &
 	$(OBJS)\monodll_stockitem.obj &
 	$(OBJS)\monodll_tbarbase.obj &
@@ -388,7 +387,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_selstore.obj &
 	$(OBJS)\monodll_spinctlg.obj &
 	$(OBJS)\monodll_splitter.obj &
-	$(OBJS)\monodll_srchctlg.obj &
 	$(OBJS)\monodll_textdlgg.obj &
 	$(OBJS)\monodll_tipwin.obj &
 	$(OBJS)\monodll_toolbkg.obj &
@@ -529,7 +527,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_rgncmn.obj &
 	$(OBJS)\monodll_settcmn.obj &
 	$(OBJS)\monodll_sizer.obj &
-	$(OBJS)\monodll_srchcmn.obj &
 	$(OBJS)\monodll_statbar.obj &
 	$(OBJS)\monodll_stockitem.obj &
 	$(OBJS)\monodll_tbarbase.obj &
@@ -565,7 +562,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_selstore.obj &
 	$(OBJS)\monodll_spinctlg.obj &
 	$(OBJS)\monodll_splitter.obj &
-	$(OBJS)\monodll_srchctlg.obj &
 	$(OBJS)\monodll_textdlgg.obj &
 	$(OBJS)\monodll_tipwin.obj &
 	$(OBJS)\monodll_toolbkg.obj &
@@ -897,7 +893,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_rgncmn.obj &
 	$(OBJS)\monolib_settcmn.obj &
 	$(OBJS)\monolib_sizer.obj &
-	$(OBJS)\monolib_srchcmn.obj &
 	$(OBJS)\monolib_statbar.obj &
 	$(OBJS)\monolib_stockitem.obj &
 	$(OBJS)\monolib_tbarbase.obj &
@@ -933,7 +928,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_selstore.obj &
 	$(OBJS)\monolib_spinctlg.obj &
 	$(OBJS)\monolib_splitter.obj &
-	$(OBJS)\monolib_srchctlg.obj &
 	$(OBJS)\monolib_textdlgg.obj &
 	$(OBJS)\monolib_tipwin.obj &
 	$(OBJS)\monolib_toolbkg.obj &
@@ -1074,7 +1068,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_rgncmn.obj &
 	$(OBJS)\monolib_settcmn.obj &
 	$(OBJS)\monolib_sizer.obj &
-	$(OBJS)\monolib_srchcmn.obj &
 	$(OBJS)\monolib_statbar.obj &
 	$(OBJS)\monolib_stockitem.obj &
 	$(OBJS)\monolib_tbarbase.obj &
@@ -1110,7 +1103,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_selstore.obj &
 	$(OBJS)\monolib_spinctlg.obj &
 	$(OBJS)\monolib_splitter.obj &
-	$(OBJS)\monolib_srchctlg.obj &
 	$(OBJS)\monolib_textdlgg.obj &
 	$(OBJS)\monolib_tipwin.obj &
 	$(OBJS)\monolib_toolbkg.obj &
@@ -1368,7 +1360,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_rgncmn.obj &
 	$(OBJS)\coredll_settcmn.obj &
 	$(OBJS)\coredll_sizer.obj &
-	$(OBJS)\coredll_srchcmn.obj &
 	$(OBJS)\coredll_statbar.obj &
 	$(OBJS)\coredll_stockitem.obj &
 	$(OBJS)\coredll_tbarbase.obj &
@@ -1404,7 +1395,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_selstore.obj &
 	$(OBJS)\coredll_spinctlg.obj &
 	$(OBJS)\coredll_splitter.obj &
-	$(OBJS)\coredll_srchctlg.obj &
 	$(OBJS)\coredll_textdlgg.obj &
 	$(OBJS)\coredll_tipwin.obj &
 	$(OBJS)\coredll_toolbkg.obj &
@@ -1545,7 +1535,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_rgncmn.obj &
 	$(OBJS)\coredll_settcmn.obj &
 	$(OBJS)\coredll_sizer.obj &
-	$(OBJS)\coredll_srchcmn.obj &
 	$(OBJS)\coredll_statbar.obj &
 	$(OBJS)\coredll_stockitem.obj &
 	$(OBJS)\coredll_tbarbase.obj &
@@ -1581,7 +1570,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_selstore.obj &
 	$(OBJS)\coredll_spinctlg.obj &
 	$(OBJS)\coredll_splitter.obj &
-	$(OBJS)\coredll_srchctlg.obj &
 	$(OBJS)\coredll_textdlgg.obj &
 	$(OBJS)\coredll_tipwin.obj &
 	$(OBJS)\coredll_toolbkg.obj &
@@ -1760,7 +1748,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_rgncmn.obj &
 	$(OBJS)\corelib_settcmn.obj &
 	$(OBJS)\corelib_sizer.obj &
-	$(OBJS)\corelib_srchcmn.obj &
 	$(OBJS)\corelib_statbar.obj &
 	$(OBJS)\corelib_stockitem.obj &
 	$(OBJS)\corelib_tbarbase.obj &
@@ -1796,7 +1783,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_selstore.obj &
 	$(OBJS)\corelib_spinctlg.obj &
 	$(OBJS)\corelib_splitter.obj &
-	$(OBJS)\corelib_srchctlg.obj &
 	$(OBJS)\corelib_textdlgg.obj &
 	$(OBJS)\corelib_tipwin.obj &
 	$(OBJS)\corelib_toolbkg.obj &
@@ -1937,7 +1923,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_rgncmn.obj &
 	$(OBJS)\corelib_settcmn.obj &
 	$(OBJS)\corelib_sizer.obj &
-	$(OBJS)\corelib_srchcmn.obj &
 	$(OBJS)\corelib_statbar.obj &
 	$(OBJS)\corelib_stockitem.obj &
 	$(OBJS)\corelib_tbarbase.obj &
@@ -1973,7 +1958,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_selstore.obj &
 	$(OBJS)\corelib_spinctlg.obj &
 	$(OBJS)\corelib_splitter.obj &
-	$(OBJS)\corelib_srchctlg.obj &
 	$(OBJS)\corelib_textdlgg.obj &
 	$(OBJS)\corelib_tipwin.obj &
 	$(OBJS)\corelib_toolbkg.obj &
@@ -6002,11 +5986,6 @@ $(OBJS)\monodll_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monodll_srchcmn.obj :  .AUTODEPEND ..\..\src\common\srchcmn.cpp
-	$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\monodll_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6182,11 +6161,6 @@ $(OBJS)\monodll_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monodll_srchctlg.obj :  .AUTODEPEND ..\..\src\generic\srchctlg.cpp
-	$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\monodll_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -7870,11 +7844,6 @@ $(OBJS)\monolib_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monolib_srchcmn.obj :  .AUTODEPEND ..\..\src\common\srchcmn.cpp
-	$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\monolib_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8050,11 +8019,6 @@ $(OBJS)\monolib_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monolib_srchctlg.obj :  .AUTODEPEND ..\..\src\generic\srchctlg.cpp
-	$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\monolib_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -9720,11 +9684,6 @@ $(OBJS)\coredll_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_srchcmn.obj :  .AUTODEPEND ..\..\src\common\srchcmn.cpp
-	$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\coredll_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -9900,11 +9859,6 @@ $(OBJS)\coredll_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_srchctlg.obj :  .AUTODEPEND ..\..\src\generic\srchctlg.cpp
-	$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\coredll_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -10932,11 +10886,6 @@ $(OBJS)\corelib_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_srchcmn.obj :  .AUTODEPEND ..\..\src\common\srchcmn.cpp
-	$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\corelib_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -11112,11 +11061,6 @@ $(OBJS)\corelib_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_srchctlg.obj :  .AUTODEPEND ..\..\src\generic\srchctlg.cpp
-	$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\corelib_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<

build/script/win_docs.bat

@@ -1,12 +1,12 @@
 rem Uncomment the next line to set the version; used also in wxWidgets.iss
-SET WXW_VER=2.8.1
+SET WXW_VER=2.8.0
 if (%WXW_VER%)==() SET WXW_VER=CVS
 
 echo docs building for %WXW_VER%
 
 rem  This builds the docs in %WXWIN% in a number of formats 
 rem  and a clean inno setup in a second tree
-rem  it uses a number of tools nmake, gnuwin32 zip & dos2unix, ghostscript, MS word, cvsNT
+rem  it uses a number of tools nmake, gnuwin32 zip, ghostscript, MS word, cvsNT
 rem  cvs is in the path already from CVSNT install
 rem  writes a log file in c:\
 
@@ -18,22 +18,14 @@ set PATH=%PATH%;C:\wx\wxw26b\utils\tex2rtf\src\vc_based;C:\wx\Gnu\bin;c:\progra~
 set PATH=%PATH%;C:\Program Files\gs\gs8.51\lib;C:\Program Files\gs\gs8.51\bin
 echo %PATH% >> c:\temp.log
 
-rem update wxwidgets (holds docs) and inno (cvs wxMSW setup.exe only)
+rem update wxwidgets (holds docs) and inno (cvs wxMSW module only)
 c:
 cd %WXWIN%
 cvs up -P -d
-
-rem now inno
 cd \wx\inno\wxWidgets
-del c*.*
 if exist include\wx\msw\setup.h del include\wx\msw\setup.h
-if exist include\wx\univ\setup.h del include\wx\univ\setup.h
 cvs up -P
-dos2unix configure
-dos2unix config.guess
-dos2unix config.sub
 copy include\wx\msw\setup0.h include\wx\msw\setup.h
-copy include\wx\univ\setup0.h include\wx\univ\setup.h
 echo CVS update  >>  c:\temp.log
 
 rem add bakefile build...

configure

@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Id: configure.in.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.1.
+# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.0.
 #
 # Report bugs to <wx-dev@lists.wxwidgets.org>.
 #
@@ -270,8 +270,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='wxWidgets'
 PACKAGE_TARNAME='wxwidgets'
-PACKAGE_VERSION='2.8.1'
-PACKAGE_STRING='wxWidgets 2.8.1'
+PACKAGE_VERSION='2.8.0'
+PACKAGE_STRING='wxWidgets 2.8.0'
 PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
 
 ac_unique_file="wx-config.in"
@@ -870,7 +870,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures wxWidgets 2.8.1 to adapt to many kinds of systems.
+\`configure' configures wxWidgets 2.8.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -936,7 +936,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of wxWidgets 2.8.1:";;
+     short | recursive ) echo "Configuration of wxWidgets 2.8.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1086,7 +1086,6 @@ Optional Features:
   --enable-radiobtn       use wxRadioButton class
   --enable-sash           use wxSashWindow class
   --enable-scrollbar      use wxScrollBar class and scrollable windows
-  --enable-searchctrl     use wxSearchCtrl class
   --enable-slider         use wxSlider class
   --enable-spinbtn        use wxSpinButton class
   --enable-spinctrl       use wxSpinCtrl class
@@ -1339,7 +1338,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-wxWidgets configure 2.8.1
+wxWidgets configure 2.8.0
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1353,7 +1352,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by wxWidgets $as_me 2.8.1, which was
+It was created by wxWidgets $as_me 2.8.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1804,7 +1803,7 @@ test -n "$target_alias" &&
 
 wx_major_version_number=2
 wx_minor_version_number=8
-wx_release_number=1
+wx_release_number=0
 wx_subrelease_number=0
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
@@ -2366,7 +2365,6 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_RADIOBTN=no
   DEFAULT_wxUSE_SASH=no
   DEFAULT_wxUSE_SCROLLBAR=no
-  DEFAULT_wxUSE_SEARCHCTRL=no
   DEFAULT_wxUSE_SLIDER=no
   DEFAULT_wxUSE_SPINBTN=no
   DEFAULT_wxUSE_SPINCTRL=no
@@ -2590,7 +2588,6 @@ else
   DEFAULT_wxUSE_RADIOBTN=yes
   DEFAULT_wxUSE_SASH=yes
   DEFAULT_wxUSE_SCROLLBAR=yes
-  DEFAULT_wxUSE_SEARCHCTRL=yes
   DEFAULT_wxUSE_SLIDER=yes
   DEFAULT_wxUSE_SPINBTN=yes
   DEFAULT_wxUSE_SPINCTRL=yes
@@ -8000,7 +7997,6 @@ if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_RADIOBTN=yes
   DEFAULT_wxUSE_SASH=yes
   DEFAULT_wxUSE_SCROLLBAR=yes
-  DEFAULT_wxUSE_SEARCHCTRL=yes
   DEFAULT_wxUSE_SLIDER=yes
   DEFAULT_wxUSE_SPINBTN=yes
   DEFAULT_wxUSE_SPINCTRL=yes
@@ -8053,7 +8049,6 @@ elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_RADIOBTN=no
   DEFAULT_wxUSE_SASH=no
   DEFAULT_wxUSE_SCROLLBAR=no
-  DEFAULT_wxUSE_SEARCHCTRL=no
   DEFAULT_wxUSE_SLIDER=no
   DEFAULT_wxUSE_SPINBTN=no
   DEFAULT_wxUSE_SPINCTRL=no
@@ -9510,47 +9505,6 @@ echo "${ECHO_T}no" >&6
           fi
 
 
-          enablestring=
-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-searchctrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-searchctrl... $ECHO_C" >&6
-          no_cache=0
-          # Check whether --enable-searchctrl or --disable-searchctrl was given.
-if test "${enable_searchctrl+set}" = set; then
-  enableval="$enable_searchctrl"
-
-                          if test "$enableval" = yes; then
-                            ac_cv_use_searchctrl='wxUSE_SEARCHCTRL=yes'
-                          else
-                            ac_cv_use_searchctrl='wxUSE_SEARCHCTRL=no'
-                          fi
-
-else
-
-                          LINE=`grep "wxUSE_SEARCHCTRL" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_searchctrl='wxUSE_SEARCHCTRL='$DEFAULT_wxUSE_SEARCHCTRL
-
-fi;
-
-          eval "$ac_cv_use_searchctrl"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_searchctrl >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_SEARCHCTRL" = yes; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-          else
-            echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          fi
-
-
           enablestring=
           echo "$as_me:$LINENO: checking for --${enablestring:-enable}-slider" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-slider... $ECHO_C" >&6
@@ -29810,7 +29764,7 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -29837,7 +29791,7 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Xlib.h"; then
+  if test -r "$ac_dir/X11/Intrinsic.h"; then
     ac_x_includes=$ac_dir
     break
   fi
@@ -29851,18 +29805,18 @@ if test "$ac_x_libraries" = no; then
   # See if we find them without any special options.
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
-  LIBS="-lX11 $LIBS"
+  LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
 int
 main ()
 {
-XrmInitialize ()
+XtMalloc (0)
   ;
   return 0;
 }
@@ -29900,7 +29854,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
   for ac_extension in a so sl; do
-    if test -r $ac_dir/libX11.$ac_extension; then
+    if test -r $ac_dir/libXt.$ac_extension; then
       ac_x_libraries=$ac_dir
       break 2
     fi
@@ -35898,7 +35852,7 @@ cat >>conftest.$ac_ext <<_ACEOF
                         int main (void)
                         {
                             char buffer[128];
-                            snprintf (buffer, 128, "%2$d %3$d %1$d", 1, 2, 3);
+                            snprintf (buffer, 128, "%2\$d %3\$d %1\$d", 1, 2, 3);
                             if (strcmp ("2 3 1", buffer) == 0)
                                 exit (0);
                             exit (1);
@@ -46063,9 +46017,9 @@ _ACEOF
 fi
 
 if test "$wxUSE_DATAOBJ" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
-        { echo "$as_me:$LINENO: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&5
-echo "$as_me: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&2;}
+    if test "$wxUSE_MGL" = 1; then
+        { echo "$as_me:$LINENO: WARNING: wxDataObject not yet supported under MGL... disabled" >&5
+echo "$as_me: WARNING: wxDataObject not yet supported under MGL... disabled" >&2;}
         wxUSE_DATAOBJ=no
     else
         cat >>confdefs.h <<\_ACEOF
@@ -46081,9 +46035,9 @@ echo "$as_me: WARNING: Clipboard and drag-and-drop require wxDataObject -- disab
 fi
 
 if test "$wxUSE_CLIPBOARD" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
-        { echo "$as_me:$LINENO: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&5
-echo "$as_me: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&2;}
+    if test "$wxUSE_MGL" = 1; then
+        { echo "$as_me:$LINENO: WARNING: Clipboard not yet supported under MGL... disabled" >&5
+echo "$as_me: WARNING: Clipboard not yet supported under MGL... disabled" >&2;}
         wxUSE_CLIPBOARD=no
     fi
 
@@ -46104,10 +46058,21 @@ echo "$as_me: WARNING: Drag and drop is only supported under GTK+ 1.2... disable
         fi
     fi
 
-    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MGL" = 1 -o \
-            "$wxUSE_DFB" = 1; then
-        { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&5
-echo "$as_me: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&2;}
+    if test "$wxUSE_MOTIF" = 1; then
+        { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under Motif... disabled" >&5
+echo "$as_me: WARNING: Drag and drop not yet supported under Motif... disabled" >&2;}
+        wxUSE_DRAG_AND_DROP=no
+    fi
+
+    if test "$wxUSE_X11" = 1; then
+        { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under X11... disabled" >&5
+echo "$as_me: WARNING: Drag and drop not yet supported under X11... disabled" >&2;}
+        wxUSE_DRAG_AND_DROP=no
+    fi
+
+    if test "$wxUSE_MGL" = 1; then
+        { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under MGL... disabled" >&5
+echo "$as_me: WARNING: Drag and drop not yet supported under MGL... disabled" >&2;}
         wxUSE_DRAG_AND_DROP=no
     fi
 
@@ -46294,17 +46259,11 @@ _ACEOF
 fi
 
 if test "$wxUSE_DISPLAY" = "yes"; then
-    if test "$wxUSE_DFB" = 1 -o "$wxUSE_MGL" = 1; then
-        { echo "$as_me:$LINENO: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&5
-echo "$as_me: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&2;}
-        wxUSE_DISPLAY=no
-    else
-        cat >>confdefs.h <<\_ACEOF
+    cat >>confdefs.h <<\_ACEOF
 #define wxUSE_DISPLAY 1
 _ACEOF
 
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
-    fi
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
 fi
 
 if test "$wxUSE_DETECT_SM" = "yes"; then
@@ -46446,14 +46405,6 @@ _ACEOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
 fi
 
-if test "$wxUSE_SEARCHCTRL" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SEARCHCTRL 1
-_ACEOF
-
-    USES_CONTROLS=1
-fi
-
 if test "$wxUSE_SLIDER" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 #define wxUSE_SLIDER 1
@@ -46747,10 +46698,7 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-                           #include <Carbon/Carbon.h>
-                           #include <WebKit/WebKit.h>
-
+#include <Carbon/Carbon.h>
 
 #include <WebKit/HIWebView.h>
 _ACEOF
@@ -46891,16 +46839,10 @@ _ACEOF
 fi
 
 if test "$wxUSE_PALETTE" = "yes" ; then
-    if test "$wxUSE_DFB" = 1; then
-        { echo "$as_me:$LINENO: WARNING: wxPalette not yet supported under DFB... disabled" >&5
-echo "$as_me: WARNING: wxPalette not yet supported under DFB... disabled" >&2;}
-        wxUSE_PALETTE=no
-    else
-        cat >>confdefs.h <<\_ACEOF
+  cat >>confdefs.h <<\_ACEOF
 #define wxUSE_PALETTE 1
 _ACEOF
 
-    fi
 fi
 
 if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
@@ -51442,7 +51384,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by wxWidgets $as_me 2.8.1, which was
+This file was extended by wxWidgets $as_me 2.8.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -51505,7 +51447,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-wxWidgets config.status 2.8.1
+wxWidgets config.status 2.8.0
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

configure.in

@@ -17,7 +17,7 @@ dnl ---------------------------------------------------------------------------
 dnl initialization
 dnl ---------------------------------------------------------------------------
 
-AC_INIT([wxWidgets], [2.8.1], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [2.8.0], [wx-dev@lists.wxwidgets.org])
 
 dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
 AC_CONFIG_SRCDIR([wx-config.in])
@@ -34,7 +34,7 @@ dnl wx_release_number += 1
 
 wx_major_version_number=2
 wx_minor_version_number=8
-wx_release_number=1
+wx_release_number=0
 wx_subrelease_number=0
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
@@ -552,7 +552,6 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_RADIOBTN=no
   DEFAULT_wxUSE_SASH=no
   DEFAULT_wxUSE_SCROLLBAR=no
-  DEFAULT_wxUSE_SEARCHCTRL=no
   DEFAULT_wxUSE_SLIDER=no
   DEFAULT_wxUSE_SPINBTN=no
   DEFAULT_wxUSE_SPINCTRL=no
@@ -776,7 +775,6 @@ else
   DEFAULT_wxUSE_RADIOBTN=yes
   DEFAULT_wxUSE_SASH=yes
   DEFAULT_wxUSE_SCROLLBAR=yes
-  DEFAULT_wxUSE_SEARCHCTRL=yes
   DEFAULT_wxUSE_SLIDER=yes
   DEFAULT_wxUSE_SPINBTN=yes
   DEFAULT_wxUSE_SPINCTRL=yes
@@ -1109,7 +1107,6 @@ if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_RADIOBTN=yes
   DEFAULT_wxUSE_SASH=yes
   DEFAULT_wxUSE_SCROLLBAR=yes
-  DEFAULT_wxUSE_SEARCHCTRL=yes
   DEFAULT_wxUSE_SLIDER=yes
   DEFAULT_wxUSE_SPINBTN=yes
   DEFAULT_wxUSE_SPINCTRL=yes
@@ -1162,7 +1159,6 @@ elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_RADIOBTN=no
   DEFAULT_wxUSE_SASH=no
   DEFAULT_wxUSE_SCROLLBAR=no
-  DEFAULT_wxUSE_SEARCHCTRL=no
   DEFAULT_wxUSE_SLIDER=no
   DEFAULT_wxUSE_SPINBTN=no
   DEFAULT_wxUSE_SPINCTRL=no
@@ -1218,7 +1214,6 @@ WX_ARG_ENABLE(radiobox,    [  --enable-radiobox       use wxRadioBox class], wxU
 WX_ARG_ENABLE(radiobtn,    [  --enable-radiobtn       use wxRadioButton class], wxUSE_RADIOBTN)
 WX_ARG_ENABLE(sash,        [  --enable-sash           use wxSashWindow class], wxUSE_SASH)
 WX_ARG_ENABLE(scrollbar,   [  --enable-scrollbar      use wxScrollBar class and scrollable windows], wxUSE_SCROLLBAR)
-WX_ARG_ENABLE(searchctrl,  [  --enable-searchctrl     use wxSearchCtrl class], wxUSE_SEARCHCTRL)
 WX_ARG_ENABLE(slider,      [  --enable-slider         use wxSlider class], wxUSE_SLIDER)
 WX_ARG_ENABLE(spinbtn,     [  --enable-spinbtn        use wxSpinButton class], wxUSE_SPINBTN)
 WX_ARG_ENABLE(spinctrl,    [  --enable-spinctrl       use wxSpinCtrl class], wxUSE_SPINCTRL)
@@ -4557,7 +4552,7 @@ if test "$ac_cv_func_snprintf" = "yes"; then
                         int main (void)
                         {
                             char buffer[128];
-                            snprintf (buffer, 128, "%2$d %3$d %1$d", 1, 2, 3);
+                            snprintf (buffer, 128, "%2\$d %3\$d %1\$d", 1, 2, 3);
                             if (strcmp ("2 3 1", buffer) == 0)
                                 exit (0);
                             exit (1);
@@ -6619,8 +6614,8 @@ if test "$wxUSE_IPC" = "yes"; then
 fi
 
 if test "$wxUSE_DATAOBJ" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
-        AC_MSG_WARN([wxDataObject not yet supported under $TOOLKIT... disabled])
+    if test "$wxUSE_MGL" = 1; then
+        AC_MSG_WARN([wxDataObject not yet supported under MGL... disabled])
         wxUSE_DATAOBJ=no
     else
         AC_DEFINE(wxUSE_DATAOBJ)
@@ -6632,8 +6627,8 @@ else
 fi
 
 if test "$wxUSE_CLIPBOARD" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
-        AC_MSG_WARN([Clipboard not yet supported under $TOOLKIT... disabled])
+    if test "$wxUSE_MGL" = 1; then
+        AC_MSG_WARN([Clipboard not yet supported under MGL... disabled])
         wxUSE_CLIPBOARD=no
     fi
 
@@ -6650,9 +6645,18 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
         fi
     fi
 
-    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MGL" = 1 -o \
-            "$wxUSE_DFB" = 1; then
-        AC_MSG_WARN([Drag and drop not yet supported under $TOOLKIT... disabled])
+    if test "$wxUSE_MOTIF" = 1; then
+        AC_MSG_WARN([Drag and drop not yet supported under Motif... disabled])
+        wxUSE_DRAG_AND_DROP=no
+    fi
+
+    if test "$wxUSE_X11" = 1; then
+        AC_MSG_WARN([Drag and drop not yet supported under X11... disabled])
+        wxUSE_DRAG_AND_DROP=no
+    fi
+
+    if test "$wxUSE_MGL" = 1; then
+        AC_MSG_WARN([Drag and drop not yet supported under MGL... disabled])
         wxUSE_DRAG_AND_DROP=no
     fi
 
@@ -6779,13 +6783,8 @@ if test "$wxUSE_FONTPICKERCTRL" = "yes"; then
 fi
 
 if test "$wxUSE_DISPLAY" = "yes"; then
-    if test "$wxUSE_DFB" = 1 -o "$wxUSE_MGL" = 1; then
-        AC_MSG_WARN([wxDisplay not yet supported under $TOOLKIT... disabled])
-        wxUSE_DISPLAY=no
-    else
-        AC_DEFINE(wxUSE_DISPLAY)
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
-    fi
+    AC_DEFINE(wxUSE_DISPLAY)
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
 fi
 
 if test "$wxUSE_DETECT_SM" = "yes"; then
@@ -6883,11 +6882,6 @@ if test "$wxUSE_SCROLLBAR" = "yes"; then
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
 fi
 
-if test "$wxUSE_SEARCHCTRL" = "yes"; then
-    AC_DEFINE(wxUSE_SEARCHCTRL)
-    USES_CONTROLS=1
-fi
-
 if test "$wxUSE_SLIDER" = "yes"; then
     AC_DEFINE(wxUSE_SLIDER)
     USES_CONTROLS=1
@@ -7091,10 +7085,7 @@ if test "$wxUSE_WEBKIT" = "yes"; then
                            AC_MSG_WARN([WebKit headers not found; disabling wxWebKit])
                            wxUSE_WEBKIT=no
                         ],
-                        [
-                           #include <Carbon/Carbon.h>
-                           #include <WebKit/WebKit.h>
-                        ])
+                        [#include <Carbon/Carbon.h>])
         CPPFLAGS="$old_CPPFLAGS"
     elif test "$wxUSE_COCOA" = 1; then
         AC_DEFINE(wxUSE_WEBKIT)
@@ -7155,12 +7146,7 @@ if test "$wxUSE_VALIDATORS" = "yes"; then
 fi
 
 if test "$wxUSE_PALETTE" = "yes" ; then
-    if test "$wxUSE_DFB" = 1; then
-        AC_MSG_WARN([wxPalette not yet supported under DFB... disabled])
-        wxUSE_PALETTE=no
-    else
-        AC_DEFINE(wxUSE_PALETTE)
-    fi
+  AC_DEFINE(wxUSE_PALETTE)
 fi
 
 if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then

contrib/src/fl/controlbar.cpp

@@ -887,7 +887,9 @@ void wxFrameLayout::DoSetBarState( cbBarInfo* pBar )
         pMiniFrm->Create( &GetParentFrame(), wxID_ANY, pBar->mName,
                           wxPoint( 50,50 ),
                           wxSize ( 0, 0  ),
-                          wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT
+                          wxFRAME_FLOAT_ON_PARENT |
+                          wxNO_BORDER |
+                          wxFRAME_NO_TASKBAR
                         );
 
         pMiniFrm->SetClient( pBar->mpBarWnd );

debian/README.HowToBuild.txt

@@ -149,14 +149,6 @@ When finished the binary and source packages will be left in the
 parent dir of the source tree.
 
 
-Automating the process
-----------------------
-
-The script debian/build_all automates the above stepds and builds both
-wxWidgets and wxPython packages in both ANSI and Unicode modes. You should do
-the build manually at least the first time however to make sure you have all
-the prerequisites and the build doesn't fail.
-
 
 Other Sources of Information
 ----------------------------

debian/build_all

@@ -1,49 +0,0 @@
-#!/bin/sh
-##############################################################################
-# Name:       debian/build_all
-# Purpose:    build both ANSI and Unicode Debian packages at once
-# Created:    2006-12-13
-# RCS-ID:     $Id$
-# Copyright:  (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
-# Licence:    wxWindows licence
-##############################################################################
-
-# The following variables may be defined:
-#   wx          The wxWidgets root directory (if it's unset you have to run the
-#               script from this directory)
-#   debsrc_dir  If set, suppose there are already debian sources in this dir
-
-set -e
-wx_dir=${wx-`pwd`}
-if [ ! -f $wx_dir/debian/build_all ]; then
-    echo "Please run the script from the root wx directory" >&2
-    exit 1
-fi
-
-(
-if [ -z $debsrc_dir ]; then
-    configure_dir=/tmp/wxtmp-$$
-
-    mkdir $configure_dir
-    cd $configure_dir
-    $wx_dir/configure --without-subdirs > /dev/null
-    make debian-dist > /dev/null
-    debsrc_dir=`grep 'DEBIAN_SOURCE_DIR =' Makefile | sed 's@.*/@@'`
-    cd ..
-    rm -rf $configure_dir
-fi
-
-cd $wx_dir/../$debsrc_dir
-./debian/rules debian/control
-dpkg-buildpackage -rfakeroot > /dev/null
-
-fakeroot ./debian/rules clean
-
-sed -i '/^WX_UNICODE := /s/1/0/' debian/rules
-rm debian/control
-./debian/rules debian/control
-dpkg-buildpackage -rfakeroot > /dev/null
-
-fakeroot ./debian/rules clean
-
-) 2>&1 | tee $wx_dir/debian/build.log

debian/changelog

@@ -1,16 +1,3 @@
-wxwidgets2.8 (2.8.0.1-1) unstable; urgency=low
-
-  * No changes, just a different packager
-
- -- Vadim Zeitlin <vadim@wxwindows.org>  Dec, 13 Wed 2006 17:40:24 +0100
-
-wxwidgets2.8 (2.8.0.1-0) unstable; urgency=low
-
-  * Add wxSearchCtrl
-  * Official wxPython release
-
- -- Robin Dunn <robin@alldunn.com>  Mon, 11 Dec 2006 18:50:29 -0800
-
 wxwidgets2.8 (2.8.0.0-0rc3) unstable; urgency=low
 
   * wxFileSystem::OpenFile() takes wxFS_SEEKABLE by default now.

debian/wx-config.1

@@ -70,11 +70,6 @@ Output the wxWidgets version number in all its glory.
 .TP 15
 .B  \-\-basename
 Output the base name of the wxWidgets libraries.
-.TP 15
-.B  \-\-selected-config
-Output the signature of the selected wxWidgets library.
-This is a string of the form "port-unicode-release-version".
-
 
 .SS Feature options
 These options select features which determine which wxWidgets

demos/forty/scorefil.cpp

@@ -33,6 +33,34 @@
 
 ScoreFile::ScoreFile(const wxString& appName)
 {
+#if 0
+    wxString filename;
+    m_configFilename << "/usr/local/share/" << appName << ".scores";
+    if (access(m_configFilename, F_OK) == 0)
+    {
+        if (access(m_configFilename, R_OK | W_OK) != 0)
+        {
+            // file is not r/w - use local file instead
+            m_configFilename = wxFileConfig::GetLocalFileName(appName);
+        }
+    }
+    else
+    {
+        int fd = creat(m_configFilename, 0666);
+
+        if (fd < 0)
+        {
+            // failed to create file - use local file instead
+            m_configFilename = wxFileConfig::GetLocalFileName(appName);
+        }
+        else
+        {
+            // ensure created file has rw-rw-rw permissions
+            close(fd);
+        }
+    }
+#endif
+
     m_config = new wxConfig(appName, _T("wxWidgets"), appName, wxEmptyString,
                                 wxCONFIG_USE_LOCAL_FILE);  // only local
 }
@@ -40,6 +68,11 @@ ScoreFile::ScoreFile(const wxString& appName)
 ScoreFile::~ScoreFile()
 {
     delete m_config;
+#ifdef __WXGTK__
+    // ensure score file has rw-rw-rw permissions
+    // (wxFileConfig sets them to rw-------)
+    chmod(m_configFilename, 0666);
+#endif
 }
 
 

distrib/scripts/build-environ.cfg

@@ -17,7 +17,7 @@ DOCDIR=${WX_TEMP_DIR}/wxWidgets/docs/
 CURDATE=`date -I`
 
 # build info
-BUILD_VERSION=2.8.1-rc1
+BUILD_VERSION=2.8.0-rc1
 BUILD_TAG=HEAD
 
 

distrib/scripts/create_archives.sh

@@ -56,7 +56,7 @@ getfilelist(){
   fi
   
   if [ $port = "x11" ] || [ $port = "all" ]; then
-    filelist="$filelist univ.rsp x11.rsp"
+    filelist="$filelist x11.rsp"
   fi
   
   if [ $port = "mgl" ] || [ $port = "all" ]; then
@@ -164,7 +164,7 @@ dospinport(){
     popd
     rm -rf /tmp/wx$port
     rm ${portfiles}
-    rm /tmp/textfiles
+#    rm /tmp/textfiles
 }
 
 prepareforrelease()

distrib/scripts/is_text.sh

@@ -14,17 +14,6 @@ if [ $# != 1 ]; then
     exit 2
 fi
 
-# don't do configure; config.sub; config.guess
-if [ `basename $1` = "configure" ] ; then
-    exit 1
-fi
-if [ `basename $1` = "config.sub" ] ; then
-    exit 1
-fi
-if [ `basename $1` = "config.guess" ] ; then
-    exit 1
-fi
-
 entries=`dirname $1`/CVS/Entries
 if [ ! -f $entries ]; then
     echo "CVS entries file \"$entries\" not found." >&2

distrib/scripts/manifests/generic.rsp

@@ -118,6 +118,8 @@ include/wx/richtext/*.h
 include/wx/aui/*.h
 lib/dummy
 
+tools/gettext/*.*
+
 utils/*.bkl
 utils/make*.*
 utils/configure

distrib/scripts/manifests/mac.rsp

@@ -3,8 +3,6 @@ readme-mac.txt
 
 lib/dummy
 
-distrib/mac/pbsetup-sh 
-
 docs/licence.txt
 docs/mac/*.txt
 docs/mac/*.hqx

distrib/scripts/manifests/msw.rsp

@@ -16,6 +16,9 @@ docs/wine/COPYING.LIB
 docs/microwin/readme.txt
 docs/microwin/microwindows.patches
 
+tools/gettext/*.exe
+tools/gettext/*.sed
+
 src/cwcopysetup.bat
 src/cwdcopysetup.bat
 src/common/*.rc

distrib/scripts/manifests/msw_minimal.rsp

@@ -125,6 +125,8 @@ include/wx/html/msw/*.ico
 include/wx/html/msw/*.rc
 lib/dummy
 
+tools/gettext/*.*
+
 bitmaps/xpm/16x16/*.*
 bitmaps/xpm/32x32/*.*
 bitmaps/xpm/64x64/*.*

distrib/scripts/manifests/vc.rsp

@@ -1,5 +1,3 @@
-include/msvc/wx/setup.h
-
 build/msw/*.dsp
 build/msw/*.dsw
 

distrib/scripts/manifests/x11.rsp

@@ -21,6 +21,13 @@ docs/x11/makewxx11
 
 lib/dummy
 
+mobile/configure
+mobile/configure.in
+mobile/Makefile.in
+mobile/wxedit/Makefile.in
+mobile/wxedit/*.cpp
+mobile/wxedit/*.h
+
 misc/afm/*.afm
 misc/gs_afm/*.afm
 

distrib/scripts/pre-flight.sh

@@ -131,7 +131,7 @@ else
      cp $g $START_DIR/$DIST_DIR/readme-`echo $g | sed -e "s|${DOCDIR}||g" | sed -e "s|msw/wince|wince|g" | sed -e "s|/readme.txt||g"`-${BUILD_VERSION}.txt
    done
    # Rename double readme
-   mv $START_DIR/$DIST_DIR/readme-readme.txt-${BUILD_VERSION}.txt $START_DIR/$DIST_DIR/readme-${BUILD_VERSION}.txt
+   mv $START_DIR/$DIST_DIR/readme-readme-${BUILD_VERSION}.txt $START_DIR/$DIST_DIR/readme-${BUILD_VERSION}.txt
    ## copy files ...
    mkdir ${FTPDIR}/
    cp  $START_DIR/$DIST_DIR/* ${FTPDIR}/

docs/changes.txt

@@ -68,8 +68,7 @@ Deprecated methods since 2.6.x and their replacements
   wxFS_SEEKABLE flags is deprecated. You can still seek, but use the flag.
 - Constructor wxZipInputStream(const wxString& archive, const wxString& file)
   deprecated in favour of wxFileSystem (other zip ctors are not deprecated).
-- wx{Dir|File}Dialog::{Set|Get}Style deprecated in favour of the generic
-  wxWindow::{Set|Get}WindowStyle()
+ 
 
 
 Major new features in 2.8 release
@@ -85,33 +84,7 @@ Major new features in 2.8 release
 - Further functionality including wxAnimationCtrl (moved from contrib/src/anim
   and enhanced), wxSimpleHtmlListBox, wxHyperlinkCtrl, wxColourPickerCtrl,
   wxDirPickerCtrl, wxFilePickerCtrl, wxFontPickerCtrl, wxCollapsiblePane,
-  wxSearchCtrl, wxAboutBox, wxTreebook, tar streams.
-
-
-2.8.1
------
-
-All:
-
-- Fix compilation with wxUSE_STL=1
-- wxGrid::GetBestSize() returns same size the grid would have after AutoSize()
-- Added wxTreeCtrl::CollapseAll[Children]() and IsEmpty() (Francesco Montorsi)
-- Several RTL-related positioning fixes (Diaa Sami)
-- Fix wxConfig::DeleteGroup() for arguments with trailing slash (David Hart)
-- Fix memory leak in wxGrid::ShowCellEditControl() (Christian Sturmlechner)
-
-wxMSW:
-
-- Fixed compilation with Borland C++ in Unicode mode but without MSLU
-- Show taskbar icon menu on right button release, not press
-
-wxGTK:
-
-- Don't crash if command line is not valid UTF-8 (Unicode build only)
-
-wxUniv:
-
-- It is now possible to set background colour of wxStaticText
+  wxAboutBox, wxTreebook, tar streams.
 
 
 2.8.0
@@ -119,7 +92,6 @@ wxUniv:
 
 All:
 
-- Added wxSearchCtrl (Vince Harron)
 - wxCSConv("UTF-16/32") now behaves correctly, i.e. same as wxMBConvUTF16/32
 - wxArrayString::Alloc() now works as reserve() and doesn't clear array contents
 - Fixed long standing bug in wxFileConfig groups renaming (Antti Koivisto).

docs/dfb/install.txt

@@ -28,7 +28,11 @@ wxWidgets features that don't work in wxDFB yet:
 
 $ ./configure --with-directfb \
               --with-themes=mono \
+              --disable-sockets \
               --disable-accel \
+              --disable-display \
+              --disable-palette \
+              --disable-dataobj \
               --disable-popupwin \
               --disable-help \
               --disable-combobox \

docs/latex/wx/auimanager.tex

@@ -125,7 +125,7 @@ enum wxAuiManagerOption
 
 \func{}{wxAuiManager}{\param{wxWindow* }{managed\_wnd = NULL}, \param{unsigned int }{flags = wxAUI\_MGR\_DEFAULT}}
 
-Constructor. \arg{managed\_wnd} specifies the wxFrame which should be managed.
+Constructor. \arg{frame} specifies the wxFrame which should be managed.
 \arg{flags}  specifies options which allow the frame management behavior
 to be modified.
 
@@ -166,11 +166,9 @@ Returns the current art provider being used.
 
 See also: \helpref{wxAuiDockArt}{wxauidockart}.
 
-\membersection{wxAuiManager::GetDockSizeConstraint}\label{wxauimanagergetdocksizeconstraint}
-
 \func{void}{GetDockSizeConstraint}{\param{double* }{widthpct}, \param{double* }{heightpct}}
 
-Returns the current dock constraint values.  See \helpref{SetDockSizeConstraint()}{wxauimanagersetdocksizeconstraint} for more information.
+Returns the current dock constraint values.  See SetDockSizeConstraint() for more information.
 
 \membersection{wxAuiManager::GetFlags}\label{wxauimanagergetflags}
 
@@ -184,8 +182,6 @@ Returns the current manager's flags.
 
 Returns the frame currently being managed by wxAuiManager.
 
-\membersection{wxAuiManager::GetManager}\label{wxauimanagergetmanager}
-
 \func{static wxAuiManager*}{GetManager}{\param{wxWindow* }{window}}
 
 Calling this method will return the wxAuiManager for a given window.  The \arg{window} parameter should
@@ -273,8 +269,6 @@ will be deleted by wxAuiManager.
 
 See also: \helpref{wxAuiDockArt}{wxauidockart}.
 
-\membersection{wxAuiManager::SetDockSizeConstraint}\label{wxauimanagersetdocksizeconstraint}
-
 \func{void}{SetDockSizeConstraint}{\param{double }{widthpct}, \param{double }{heightpct}}
 
 When a user creates a new dock by dragging a window into a docked position, often times the large size of the

docs/latex/wx/classes.tex

@@ -348,7 +348,6 @@
 \input setcursorevt.tex
 \input ipcservr.tex
 \input hprovsmp.tex
-\input srchctrl.tex
 \input sngchdlg.tex
 \input snglinst.tex
 \input size.tex

docs/latex/wx/dirctrl.tex

@@ -188,12 +188,3 @@ Sets the current filter index (zero-based).
 
 Sets the current path.
 
-\membersection{wxGenericDirCtrl::ShowHidden}\label{wxgenericdirctrlShowHidden}
-
-\func{void}{ShowHidden}{\param{bool }{show}}
-
-\wxheading{Parameters}
-
-\docparam{show}{If true, hidden folders and files will be displayed by the
-control. If false, they will not be displayed.}
-

docs/latex/wx/dirtrav.tex

@@ -71,7 +71,6 @@ enum wxDirTraverseResult
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 
-
 \membersection{wxDirTraverser::OnDir}\label{wxdirtraverserondir}
 
 \func{virtual wxDirTraverseResult}{OnDir}{\param{const wxString\& }{dirname}}
@@ -83,7 +82,6 @@ subdirectories in this directory.
 
 This is a pure virtual function and must be implemented in the derived class.
 
-
 \membersection{wxDirTraverser::OnFile}\label{wxdirtraverseronfile}
 
 \func{virtual wxDirTraverseResult}{OnFile}{\param{const wxString\& }{filename}}
@@ -94,10 +92,9 @@ traversing (for example, if the file being searched is found) or
 
 This is a pure virtual function and must be implemented in the derived class.
 
+\membersection{wxOpenErrorTraverser::OnOpenError}\label{wxopenerrortraverseronopenerror}
 
-\membersection{wxDirTraverser::OnOpenError}\label{wxopenerrortraverseronopenerror}
-
-\func{virtual wxDirTraverseResult}{OnOpenError}{\param{const wxString\& }{openerrorname}}
+\func{virtual wxOpenErrorTraverseResult}{OnOpenError}{\param{const wxString\& }{openerrorname}}
 
 This function is called for each directory which we failed to open for
 enumerating. It may return {\tt wxSIR\_STOP} to abort traversing completely,

docs/latex/wx/filename.tex

@@ -142,8 +142,6 @@ You can initialize a wxFileName instance using one of the following functions:
 \helpref{AssignDir}{wxfilenameassigndir}\\
 \helpref{AssignHomeDir}{wxfilenameassignhomedir}\\
 \helpref{AssignHomeTempFileName}{wxfilenameassigntempfilename}\\
-\helpref{DirName}{wxfilenamedirname}\\
-\helpref{FileName}{wxfilenamefilename}\\
 \helpref{operator $=$}{wxfilenameoperatorassign}
 
 

docs/latex/wx/function.tex

@@ -996,8 +996,7 @@ Returns true if the file exists and is a plain file.
 
 Returns time of last modification of given file.
 
-The function returns \texttt{(time\_t)}$-1$ if an error occurred (e.g. file not
-found).
+The return value is $0$ if an error occured (e.g. file not found).
 
 
 \membersection{::wxFileNameFromPath}\label{wxfilenamefrompath}
@@ -1274,11 +1273,6 @@ Removes the directory {\it dir}, returning true if successful. Does not work und
 
 The {\it flags} parameter is reserved for future use.
 
-Please notice that there is also a wxRmDir() function which simply wraps the
-standard POSIX rmdir() function and so return an integer error code instead of
-a boolean value (but otherwise is currently identical to wxRmdir), don't
-confuse these two functions.
-
 
 \membersection{::wxSetWorkingDirectory}\label{wxsetworkingdirectory}
 

docs/latex/wx/listctrl.tex

@@ -41,8 +41,7 @@ in \helpref{wxListEvent}{wxlistevent}.
 {\bf Mac Note:} Starting with 2.8, wxListCtrl uses a native implementation for 
 report mode, and uses a generic implementation for other modes. You can use the
 generic implementation for report mode as well by setting the 
-mac.listctrl.always\_use\_generic \helpref{wxSystemOption}{wxsystemoptions} to
-1.
+mac.listctrl.always_use_generic \helpref{wxSystemOption}{wxsystemoptions} to 1.
 
 \wxheading{Derived from}
 

docs/latex/wx/manual.tex

@@ -26,7 +26,7 @@
 %\special{!/@scaleunit 1 def}
 \parskip=10pt
 \parindent=0pt
-\title{wxWidgets 2.8.1: A portable C++ and Python GUI toolkit}
+\title{wxWidgets 2.8.0: A portable C++ and Python GUI toolkit}
 \winhelponly{\author{by Julian Smart et al
 %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
 }}

docs/latex/wx/size.tex

@@ -198,9 +198,9 @@ Sets the width.
 Assignment operator.
 
 
-\constfunc{bool}{operator $==$}{\param{const wxSize\& }{sz}}
+\func{bool}{operator $==$}{\param{const wxSize\& }{sz}}
 
-\constfunc{bool}{operator $!=$}{\param{const wxSize\& }{sz}}
+\func{bool}{operator $!=$}{\param{const wxSize\& }{sz}}
 
 \func{wxSize}{operator $+$}{\param{const wxSize\& }{sz}}
 

docs/latex/wx/srchctrl.tex

@@ -1,157 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%% wxSearchCtrl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\section{\class{wxSearchCtrl}}\label{wxsearchctrl}
-
-A search control is a composite control with a search button, a text 
-control, and a cancel button.
-
-\wxheading{Derived from}
-
-\helpref{wxTextCtrl}{wxtextctrl}\\
-streambuf\\
-\helpref{wxControl}{wxcontrol}\\
-\helpref{wxWindow}{wxwindow}\\
-\helpref{wxEvtHandler}{wxevthandler}\\
-\helpref{wxObject}{wxobject}
-
-\wxheading{Include files}
-
-<wx/srchctrl.h>
-
-\wxheading{Window styles}
-
-\twocolwidtha{5cm}
-\begin{twocollist}\itemsep=0pt
-\twocolitem{\windowstyle{wxTE\_PROCESS\_ENTER}}{The control will generate
-the event wxEVT\_COMMAND\_TEXT\_ENTER (otherwise pressing Enter key
-is either processed internally by the control or used for navigation between
-dialog controls).}
-\twocolitem{\windowstyle{wxTE\_PROCESS\_TAB}}{The control will receive
-wxEVT\_CHAR events for TAB pressed - normally, TAB is used for passing to the
-next control in a dialog instead. For the control created with this style,
-you can still use Ctrl-Enter to pass to the next control from the keyboard.}
-\twocolitem{\windowstyle{wxTE\_NOHIDESEL}}{By default, the Windows text control
-doesn't show the selection when it doesn't have focus - use this style to force
-it to always show it. It doesn't do anything under other platforms.}
-\twocolitem{\windowstyle{wxTE\_LEFT}}{The text in the control will be left-justified (default).}
-\twocolitem{\windowstyle{wxTE\_CENTRE}}{The text in the control will be centered (currently wxMSW and wxGTK2 only).}
-\twocolitem{\windowstyle{wxTE\_RIGHT}}{The text in the control will be right-justified (currently wxMSW and wxGTK2 only).}
-\twocolitem{\windowstyle{wxTE\_CAPITALIZE}}{On PocketPC and Smartphone, causes the first letter to be capitalized.}
-\end{twocollist}
-
-See also \helpref{window styles overview}{windowstyles} and \helpref{wxSearchCtrl::wxSearchCtrl}{wxsearchctrlctor}.
-
-\wxheading{Event handling}
-
-To process input from a search control, use these event handler macros to direct input to member
-functions that take a \helpref{wxCommandEvent}{wxcommandevent} argument. To retrieve actual search
-queries, use EVT\_TEXT and EVT\_TEXT\_ENTER events, just as you would with \helpref{wxTextCtrl}{wxtextctrl}.
-
-\twocolwidtha{9cm}%
-\begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf EVT\_SEARCHCTRL\_SEARCH\_BTN(id, func)}}{Respond to a wxEVT\_SEARCHCTRL\_SEARCH\_BTN event,
-generated when the search button is clicked. Note that this does not initiate a search.}
-\twocolitem{{\bf EVT\_SEARCHCTRL\_CANCEL\_BTN(id, func)}}{Respond to a wxEVT\_SEARCHCTRL\_CANCEL\_BTN event,
-generated when the cancel button is clicked.}
-\end{twocollist}%
-
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxSearchCtrl::wxSearchCtrl}\label{wxsearchctrlctor}
-
-\func{}{wxSearchCtrl}{\void}
-
-Default constructor.
-
-\func{}{wxSearchCtrl}{\param{wxWindow* }{parent}, \param{wxWindowID}{ id},\rtfsp
-\param{const wxString\& }{value = ``"}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize},\rtfsp
-\param{long}{ style = 0}, \param{const wxValidator\& }{validator = wxDefaultValidator}, \param{const wxString\& }{name = wxSearchCtrlNameStr}}
-
-Constructor, creating and showing a text control.
-
-\wxheading{Parameters}
-
-\docparam{parent}{Parent window. Should not be NULL.}
-
-\docparam{id}{Control identifier. A value of -1 denotes a default value.}
-
-\docparam{value}{Default text value.}
-
-\docparam{pos}{Text control position.}
-
-\docparam{size}{Text control size.}
-
-\docparam{style}{Window style. See \helpref{wxSearchCtrl}{wxsearchctrl}.}
-
-\docparam{validator}{Window validator.}
-
-\docparam{name}{Window name.}
-
-\wxheading{See also}
-
-\helpref{wxTextCtrl::Create}{wxtextctrlcreate}, \helpref{wxValidator}{wxvalidator}
-
-
-\membersection{wxSearchCtrl::\destruct{wxSearchCtrl}}\label{wxsearchctrldtor}
-
-\func{}{\destruct{wxSearchCtrl}}{\void}
-
-Destructor, destroying the search control.
-
-
-\membersection{wxSearchCtrl::SetMenu}\label{wxsearchctrlsetmenu}
-
-\func{virtual void}{SetMenu}{\param{wxMenu* }{ menu}}
-
-Sets the search control's menu object.  If there is already a menu associated with
-the search control it is deleted.
-
-
-\wxheading{Parameters}
-
-\docparam{menu}{Menu to attach to the search control.}
-
-\membersection{wxSearchCtrl::GetMenu}\label{wxsearchctrlgetmenu}
-
-\func{virtual wxMenu*}{GetMenu}{\void}
-
-Returns a pointer to the search control's menu object or NULL if there is no 
-menu attached.
-
-
-\membersection{wxSearchCtrl::ShowSearchButton}\label{wxsearchctrlshowsearchbutton}
-
-\func{virtual void}{ShowSearchButton}{\param{bool }{ show}}
-
-Sets the search button visibility value on the search control.  
-If there is a menu attached, the search button will be visible regardless of the search
-button visibility value. 
-
-This has no effect in Mac OS X v10.3
-
-
-\membersection{wxSearchCtrl::IsSearchButtonVisible}\label{wxsearchctrlissearchbuttonvisible}
-
-\func{virtual bool}{IsSearchButtonVisible}{\void}
-
-Returns the search button visibility value.  
-If there is a menu attached, the search button will be visible regardless of the search
-button visibility value. 
-
-This always returns false in Mac OS X v10.3
-
-
-\membersection{wxSearchCtrl::ShowCancelButton}\label{wxsearchctrlshowcancelbutton}
-
-\func{virtual void}{ShowCancelButton}{\param{bool }{ show}}
-
-Shows or hides the cancel button.
-
-
-\membersection{wxSearchCtrl::IsCancelButtonVisible}\label{wxsearchctrliscancelbuttonvisible}
-
-\func{virtual bool}{IsCancelButtonVisible}{\void}
-
-Indicates whether the cancel button is visible.

docs/latex/wx/stdpaths.tex

@@ -176,9 +176,9 @@ Return the directory where the loadable modules (plugins) live.
 
 Example return values:
 \begin{itemize}
-    \item Unix: \texttt{\textit{prefix}/lib/\textit{appname}}
-    \item Windows: the directory of the executable file
-    \item Mac: \texttt{\textit{appname}.app/Contents/PlugIns} bundle subdirectory
+    \item Unix: \texttt{\textit{prefix}/share/\textit{appname}}
+    \item Windows: the directory where the executable file is located
+    \item Mac: \texttt{\textit{appname}.app/Contents/Resources} bundle subdirectory
 \end{itemize}
 
 \wxheading{See also}
@@ -199,9 +199,9 @@ all platforms except Mac OS X.
 
 Example return values:
 \begin{itemize}
-    \item Unix: \texttt{\textit{prefix}/share/\textit{appname}}
-    \item Windows: the directory where the executable file is located
-    \item Mac: \texttt{\textit{appname}.app/Contents/Resources} bundle subdirectory
+    \item Unix: \texttt{\textit{prefix}/lib/\textit{appname}}
+    \item Windows: the directory of the executable file
+    \item Mac: \texttt{\textit{appname}.app/Contents/PlugIns} bundle subdirectory
 \end{itemize}
 
 \newsince{2.7.0}

docs/latex/wx/sysopt.tex

@@ -42,7 +42,7 @@ used.}
 a window. You can also use the symbol wxMAC\_WINDOW\_PLAIN\_TRANSITION.}
 \twocolitem{window-default-variant}{The default variant used by windows (cast to integer from the wxWindowVariant enum).
 Also known as wxWINDOW\_DEFAULT\_VARIANT.}
-\twocolitem{mac.listctrl.always\_use\_generic}{Tells wxListCtrl to use the generic 
+\twocolitem{mac.listctrl.always_use_generic}{Tells wxListCtrl to use the generic 
 control even when it is capable of using the native control instead. 
 Also knwon as wxMAC\_ALWAYS\_USE\_GENERIC\_LISTCTRL.}
 \end{twocollist}

docs/latex/wx/taskbar.tex

@@ -51,10 +51,6 @@ wxEVT\_TASKBAR\_RIGHT\_UP event.}
 wxEVT\_TASKBAR\_LEFT\_DCLICK event.}
 \twocolitem{{\bf EVT\_TASKBAR\_RIGHT\_DCLICK(func)}}{Process a
 wxEVT\_TASKBAR\_RIGHT\_DCLICK event.}
-\twocolitem{{\bf EVT\_TASKBAR\_CLICK(func)}}{This is a synonym for either
-EVT\_TASKBAR\_RIGHT\_DOWN or UP depending on the platform, use this event macro
-to catch the event which should result in the menu being displayed on the
-current platform.}
 \end{twocollist}%
 
 \latexignore{\rtfignore{\wxheading{Members}}}

docs/latex/wx/taui.tex

@@ -2,7 +2,7 @@
 
 Class: \helpref{wxAuiManager}{wxauimanager}, \helpref{wxAuiPaneInfo}{wxauipaneinfo}
 
-wxAUI stands for Advanced User Interface and the wxAUI framework
+wxAUI stands for Advances User Interface and the wxAUI framework
 aims to give its user a cutting edge interface for use with the
 wxWidgets based applications. The original wxAUI sources have
 kindly been made available under the wxWindows licence

docs/latex/wx/treectrl.tex

@@ -13,7 +13,7 @@
 
 A tree control presents information as a hierarchy, with items that may be expanded
 to show further items. Items in a tree control are referenced by wxTreeItemId handles,
-which may be tested for validity by calling \helpref{wxTreeItemId::IsOk}{wxtreeitemidisok}.
+which may be tested for validity by calling wxTreeItemId::IsOk.
 
 To intercept events from a tree control, use the event table macros described in \helpref{wxTreeEvent}{wxtreeevent}.
 
@@ -238,28 +238,6 @@ See also \helpref{SetStateImageList}{wxtreectrlsetstateimagelist}.
 Collapses the given item.
 
 
-\membersection{wxTreeCtrl::CollapseAll}\label{wxtreectrlcollapseall}
-
-\func{void}{CollapseAll}{\void}
-
-Collapses the root item.
-
-\wxheading{See also}
-
-\helpref{ExpandAll}{wxtreectrlexpandall}
-
-
-\membersection{wxTreeCtrl::CollapseAllChildren}\label{wxtreectrlcollapseallchildren}
-
-\func{void}{CollapseAllChildren}{\param{const wxTreeItemId\&}{ item}}
-
-Collapses this item and all of its children, recursively.
-
-\wxheading{See also}
-
-\helpref{ExpandAllChildren}{wxtreectrlexpandallchildren}
-
-
 \membersection{wxTreeCtrl::CollapseAndReset}\label{wxtreectrlcollapseandreset}
 
 \func{void}{CollapseAndReset}{\param{const wxTreeItemId\&}{ item}}
@@ -355,7 +333,7 @@ Expands the given item.
 
 \membersection{wxTreeCtrl::ExpandAll}\label{wxtreectrlexpandall}
 
-\func{void}{ExpandAll}{\void}
+\func{void}{Expand}{\void}
 
 Expands all items in the tree.
 
@@ -750,13 +728,6 @@ Returns {\tt true} if the given item is in bold state.
 See also: \helpref{SetItemBold}{wxtreectrlsetitembold}
 
 
-\membersection{wxTreeCtrl::IsEmpty}\label{wxtreectrlisempty}
-
-\constfunc{bool}{IsEmpty}{}
-
-Returns \true if the control is empty (i.e. has no items, even no root one).
-
-
 \membersection{wxTreeCtrl::IsExpanded}\label{wxtreectrlisexpanded}
 
 \constfunc{bool}{IsExpanded}{\param{const wxTreeItemId\&}{ item}}
@@ -1052,59 +1023,3 @@ all items if it does have this style.
 
 Unselects the given item. This works in multiselection controls only.
 
-
-
-
-
-%% the wxTreeItemId opaque class
-
-
-\section{\class{wxTreeItemId}}\label{wxtreeitemid}
-
-An opaque reference to a tree item.
-
-
-\wxheading{Derived from}
-
-None
-
-\wxheading{Include files}
-
-<wx/treebase.h>
-
-\wxheading{See also}
-
-\helpref{wxTreeItemCtrl}{wxtreeitemctrl}, \helpref{wxTreeItemData}{wxtreeitemdata},\\
-\helpref{wxTreeCtrl overview}{wxtreectrloverview}
-
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxTreeItemId::wxTreeItemId}\label{wxtreeitemidconstr}
-
-\func{}{wxTreeItemId}{\void}
-
-Default constructor. wxTreemItemIds are not meant to be constructed explicitly by
-the user; they are returned by the \helpref{wxTreeItemCtrl}{wxtreeitemctrl} functions instead.
-
-
-\membersection{wxTreeItemId::IsOk}\label{wxtreeitemidisok}
-
-\constfunc{bool}{IsOk}{}
-
-Returns \true if this instance is referencing a valid tree item.
-
-
-\membersection{Operators}\label{wxtreeitemidoperators}
-
-\constfunc{void}{operator $!$}{}
-
-Synonim for \helpref{IsOk}{wxtreeitemidisok}
-
-
-\constfunc{bool}{operator $==$}{\param{const wxTreeItemId\& }{item}}
-
-\constfunc{bool}{operator $!=$}{\param{const wxTreeItemId\& }{item}}
-
-Operators for comparison between \helpref{wxTreeItemId}{wxtreeitemid} objects.
-

docs/latex/wx/treeevt.tex

@@ -52,13 +52,11 @@ is being given to the application (call wxTreeEvent::SetToolTip). Windows only.}
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 
-
 \membersection{wxTreeEvent::wxTreeEvent}\label{wxtreeeventctor}
 
-\func{}{wxTreeEvent}{\param{wxEventType }{commandType}, \param{wxTreeCtrl *}{tree}, \param{const wxTreeItemId\&}{item = wxTreeItemId()}}
-
-Constructor, used by wxWidgets itself only.
+\func{}{wxTreeEvent}{\param{WXTYPE }{commandType = 0}, \param{int }{id = 0}}
 
+Constructor.
 
 \membersection{wxTreeEvent::GetKeyCode}\label{wxtreeeventgetkeycode}
 
@@ -68,52 +66,43 @@ Returns the key code if the event is a key event. Use
 \helpref{GetKeyEvent}{wxtreeeventgetkeyevent} to get the values of the
 modifier keys for this event (i.e. Shift or Ctrl).
 
-
 \membersection{wxTreeEvent::GetItem}\label{wxtreeeventgetitem}
 
 \constfunc{wxTreeItemId}{GetItem}{}
 
 Returns the item (valid for all events).
 
-
 \membersection{wxTreeEvent::GetKeyEvent}\label{wxtreeeventgetkeyevent}
 
 \constfunc{const wxKeyEvent\&}{GetKeyEvent}{}
 
 Returns the key event for {\tt EVT\_TREE\_KEY\_DOWN} events.
 
-
 \membersection{wxTreeEvent::GetLabel}\label{wxtreeeventgetlabel}
 
 \constfunc{const wxString\&}{GetLabel}{}
 
 Returns the label if the event is a begin or end edit label event.
 
-
 \membersection{wxTreeEvent::GetOldItem}\label{wxtreeeventgetolditem}
 
 \constfunc{wxTreeItemId}{GetOldItem}{}
 
 Returns the old item index (valid for EVT\_TREE\_ITEM\_CHANGING and CHANGED events)
 
-
-\membersection{wxTreeEvent::GetPoint}\label{wxtreeeventgetpoint}
+\membersection{wxTreeEvent::GetPoint()}\label{wxtreeeventgetpoint}
 
 \constfunc{wxPoint}{GetPoint}{}
 
-Returns the position of the mouse pointer if the event is a drag or menu-context event.
-In both cases the position is in client coordinates - i.e. relative to the wxTreeCtrl
-window (so that you can pass it directly to e.g. \helpref{wxWindow::PopupMenu}{wxwindowpopupmenu}).
+Returns the position of the mouse pointer if the event is a drag event.
 
-
-\membersection{wxTreeEvent::IsEditCancelled}\label{wxtreeeventiseditcancelled}
+\membersection{wxTreeEvent::IsEditCancelled()}\label{wxtreeeventiseditcancelled}
 
 \constfunc{bool}{IsEditCancelled}{}
 
 Returns true if the label edit was cancelled. This should be
 called from within an EVT\_TREE\_END\_LABEL\_EDIT handler.
 
-
 \membersection{wxTreeEvent::SetToolTip}\label{wxtreeeventsettooltip}
 
 \func{void}{SetToolTip}{\param{const wxString\&}{ tooltip}}

docs/latex/wx/trefcount.tex

@@ -64,9 +64,7 @@ and copy constructors since they are reference-counted:
 \helpref{wxPalette}{wxpalette}\\
 \helpref{wxPen}{wxpen}\\
 \helpref{wxRegion}{wxregion}\\
-\helpref{wxString}{wxstring}\\
-\helpref{wxVariant}{wxvariant}\\
-\helpref{wxVariantData}{wxvariantdata}
+\helpref{wxString}{wxstring}
 
 Note that the list above reports the objects which are reference-counted in all ports of
 wxWidgets; some ports may use this tecnique also for other classes.

docs/latex/wx/variant.tex

@@ -34,12 +34,12 @@ for different data types, or a remote procedure call protocol.
 An optional name member is associated with a wxVariant. This might be used, for example,
 in CORBA or OLE automation classes, where named parameters are required.
 
-Note that as of wxWidgets 2.7.1, wxVariant is \helpref{reference counted}{trefcount}. 
-Additionally, the convenience macros {\bf DECLARE\_VARIANT\_OBJECT} and 
-{\bf IMPLEMENT\_VARIANT\_OBJECT} were added so that adding (limited) support 
-for conversion to and from wxVariant can be very easily implemented without modifying 
-either wxVariant or the class to be stored by wxVariant. Since assignment operators 
-cannot be declared outside the class, the shift left operators are used like this:
+Note that as of wxWidgets 2.7.1, wxVariant is reference counted. Additionally, the
+conveniance macros {\bf DECLARE\_VARIANT\_OBJECT} and {\bf IMPLEMENT\_VARIANT\_OBJECT}
+were added so that adding (limited) support for conversion to and from wxVariant
+can be very easily implemented without modifiying either wxVariant or the class
+to be stored by wxVariant. Since assignement operators cannot be declared outside
+the class, the shift left operators are used like this:
 
 \begin{verbatim}
     // in the header file
@@ -94,7 +94,7 @@ Default constructor.
 
 \func{}{wxVariant}{\param{const wxVariant\& }{variant}}
 
-Copy constructor, uses \helpref{reference counting}{trefcount}.
+Copy constructor.
 
 \func{}{wxVariant}{\param{const wxChar*}{ value}, \param{const wxString\& }{name = ``"}}
 
@@ -165,7 +165,6 @@ Destructor.
 
 Note that destructor is protected, so wxVariantData cannot usually
 be deleted. Instead, \helpref{DecRef}{wxvariantdatadecref} should be called.
-See \helpref{reference-counted object destruction}{refcountdestruct} for more info.
 
 
 \membersection{wxVariant::Append}\label{wxvariantappend}
@@ -383,7 +382,7 @@ Sets the internal variant data, deleting the existing data if there is any.
 
 \func{void}{operator $=$}{\param{const TIMESTAMP\_STRUCT* }{value}}
 
-Assignment operators, using \helpref{reference counting}{trefcount} when possible.
+Assignment operators.
 
 \membersection{wxVariant::operator $==$}\label{wxvarianteq}
 
@@ -486,18 +485,13 @@ Operator for implicit conversion to a pointer to a void, using \helpref{wxVarian
 
 Operator for implicit conversion to a pointer to a \helpref{wxDateTime}{wxdatetime}, using \helpref{wxVariant::GetDateTime}{wxvariantgetdatetime}.
 
-
-
-%% wxVariantData
-
-
 \section{\class{wxVariantData}}\label{wxvariantdata}
 
-The {\bf wxVariantData} class is used to implement a new type for \helpref{wxVariant}{wxvariant}. 
-Derive from wxVariantData, and override the pure virtual functions.
+The {\bf wxVariantData} is used to implement a new type for wxVariant. Derive from wxVariantData,
+and override the pure virtual functions.
 
-wxVariantData is \helpref{reference counted}{refcount}, but you don't normally have to care about this, 
-as wxVariant manages the count automatically. However, in case your application needs to take
+wxVariantData is reference counted, but you don't normally have to care about this, as
+wxVariant manages the count automatically. However, incase your application needs to take
 ownership of wxVariantData, be aware that the object is created with reference count of 1,
 and passing it to wxVariant will not increase this. In other words, \helpref{IncRef}{wxvariantdataincref}
 needs to be called only if you both take ownership of wxVariantData and pass it to a wxVariant.
@@ -533,9 +527,7 @@ Decreases reference count. If the count reaches zero, the object is
 automatically deleted.
 
 Note that destructor of wxVariantData is protected, so delete
-cannot be used as normal. Instead, \helpref{DecRef}{wxvariantdatadecref} should be called.
-
-
+cannot be used as normal. Instead, DecRef should be called.
 
 \membersection{wxVariantData::Eq}\label{wxvariantdataeq}
 

docs/msw/install.txt

@@ -79,21 +79,21 @@ build ('d'). Last component of them name is name of wxWidgets component
 "Configuring the build" below). This is a typical set of release ANSI build
 libraries (release versions on left, debug on right side):
 
-  wxbase28.lib              wxbase28d.lib
-  wxbase28_net.lib          wxbase28d_net.lib
-  wxbase28_xml.lib          wxbase28d_xml.lib
-  wxmsw28_core.lib          wxmsw28d_core.lib
-  wxmsw28_html.lib          wxmsw28d_html.lib
-  wxmsw28_adv.lib           wxmsw28d_adv.lib
+  wxbase25.lib              wxbase25d.lib
+  wxbase25_net.lib          wxbase25d_net.lib
+  wxbase25_xml.lib          wxbase25d_xml.lib
+  wxmsw25_core.lib          wxmsw25d_core.lib
+  wxmsw25_html.lib          wxmsw25d_html.lib
+  wxmsw25_adv.lib           wxmsw25d_adv.lib
 
 Their Unicode debug counterparts in wxUniversal build would be
 
-  wxbase28ud.lib
-  wxbase28ud_net.lib
-  wxbase28ud_xml.lib        (notice these libs are same for wxUniv and wxMSW)
-  wxmswuniv28ud_core.lib
-  wxmswuniv28ud_html.lib
-  wxmswuniv28ud_adv.lib
+  wxbase25ud.lib
+  wxbase25ud_net.lib
+  wxbase25ud_xml.lib        (notice these libs are same for wxUniv and wxMSW)
+  wxmswuniv25ud_core.lib
+  wxmswuniv25ud_html.lib
+  wxmswuniv25ud_adv.lib
 
 These directories also contain subdirectory with wx/setup.h header. This
 subdirectory is named after port, Unicode, wxUniv and debug settings and 
@@ -714,7 +714,7 @@ USE_GUI=0
   you should set wxUSE_GUI to 1 in setup.h.
 
 USE_OPENGL=1
-  Build wxmsw28_gl.lib library with OpenGL integration class wxGLCanvas.
+  Build wxmsw25_gl.lib library with OpenGL integration class wxGLCanvas.
   You must also modify your setup.h to #define wxUSE_GLCANVAS 1. Note that
   OpenGL library is always built as additional library, even in monolithic
   build!
@@ -766,9 +766,9 @@ VENDOR=<your company name>
   distribute wxWidgets DLLs with your application. Default value is 'custom'.
   This string is included as part of DLL name. wxWidgets DLLs contain compiler
   name, version information and vendor name in them. For example
-  wxmsw280_core_bcc_custom.dll is one of DLLs build using Borland C++ with
+  wxmsw250_core_bcc_custom.dll is one of DLLs build using Borland C++ with
   default settings. If you set VENDOR=mycorp, the name will change to
-  wxmsw280_core_bcc_mycorp.dll.
+  wxmsw250_core_bcc_mycorp.dll.
 
 CFG=<configuration name>
   Sets configuration name so that you can have multiple wxWidgets builds with

docs/readme.txt

@@ -1,4 +1,4 @@
-wxWidgets 2.8.1
+wxWidgets 2.8.0
 ---------------------------------------------------------
 
 Welcome to wxWidgets, a sophisticated cross-platform C++
@@ -153,5 +153,5 @@ web site.
 
 Have fun!
 
-The wxWidgets Team, January 2007
+The wxWidgets Team, December 2006
 

docs/tech/tn0011.txt

@@ -12,15 +12,12 @@
        {wx}/include/wx/version.h
        {wx}/include/msvc/wx/setup.h
        {wx}/src/wxvc_dll.dsp
-       {wx}/docs/latex/wx/manual.tex
        {wx}/docs/changes.txt
        {wx}/docs/gtk/changes.txt
        {wx}/build/bakefiles/wxpresets/presets/wx_win32.bkl
        {wx}/build/script/win_docs.bat {windows doc and setup file}
        {wx}/distrib/scripts/build-environ.cfg {cvs tar and zip files}
  
-   The script misc/scripts/inc_release can be used for incrementing
-   the release field of the version, i.e. changing 2.8.x to 2.8.x+1.
 
 2. When to update the version numbers:
 
@@ -34,12 +31,6 @@
 Version: $Id$
 
 $Log$
-Revision 1.10  2007/01/07 22:28:07  VZ
-also update manual.tex
-
-Revision 1.9  2007/01/07 21:34:40  VZ
-added a script to update release version field
-
 Revision 1.8  2006/11/12 20:13:09  VZ
 removed obsolete src/make*.env files
 

docs/tech/tn0020.txt

@@ -1,9 +1,9 @@
-                    Binary Compatibility and wxWidgets
+                    Binary Compatability and wxWidgets
                     ==================================
 0. Purpose
 ----------
 
-This is broad technote covering all aspects of binary compatibility with 
+This is broad technote covering all aspects of binary compatability with 
 wxWidgets.
 
 1. Releases
@@ -21,64 +21,38 @@ Major  Minor Release
 
 (I.E. Major.Minor.Release).
 
-All versions with EVEN minor version component (e.g. 2.4.x, 2.6.x etc.)
-are expected to be binary compatible (ODD minors are development versions
-and the compatibility constraints don't apply to them). Note that by
-preserving binary compatibility we mean BACKWARDS compatibility only,
-meaning that applications built with old wxWidgets headers should continue
-to work with new wxWidgets (shared/dynamic) libraries without the need to
-rebuild. There is no requirement to preserve compatibility in the other
-direction (i.e. make new headers compatible with old libraries) as this
-would preclude any additions whatsoever to the stable branch. But see
-also section (4).
+All Release versions where the Minor is EVEN (2.4.x,2.6.x 
+etc.  ODD minors are development versions)  are expected to be binary 
+compatable.  Note that this means FORWARD binary compatability only -
+new methods to classes are ok as long as they arn't virtual, etc.
 
-
-2. What kind of changes are NOT binary compatible
+2. What kind of changes are NOT binary compatable
 -------------------------------------------------
 
 If its still up, the KDE guide is a good reference:
 http://developer.kde.org/documentation/other/binarycompatibility.html
 
-The changes that are NOT binary compatible:
+The changes that are NOT binary compatable:
 - Adding a virtual function
 - Changing the name of a any function or variable
 - Changing the signature of a virtual function (adding a parameter, 
 even a default one)
 - Changing the order of the virtual functions in a class
 ["switching" them, etc.]
-- Changing access privileges to a function (protected to private etc.)
+- Changing access privalages to a function (protected to private etc.)
 [unlike KDE we need to support windows so this is not allowed]
 - Adding a member variable
 - Changing the order of non-static member variables
 
 
-3. Changes which are compatible
--------------------------------
-
-- Adding a new class
-- Adding a new non-virtual method to an existing class
-- Overriding the implementation of an existing virtual function
-[this is considered to be backwards binary compatible until we find a
- counter example; currently it's known to work with Apple gcc at least]
-- Anything which doesn't result in ABI change at all, e.g. adding new
-  macros, constants and, of course, private changes in the implementation
-
-
-4. wxABI_VERSION and "forward" binary compatibility
+3. wxABI_VERSION and BACKWARD binary compatability
 --------------------------------------------------
 
-As mentioned we do not support "forward" binary compatibility, that is the
-ability to run applications compiled with new wxWidgets headers on systems
-with old wxWidgets libraries.
+As mentioned we do not support BACKWARD binary compatability. 
 
-However, for the developers who want to ensure that their application works
-with some fixed old wxWidgets version and doesn't (inadvertently) require
-features added in later releases, we provide the macro wxABI_VERSION which
-can be defined to restrict the API exported by wxWidgets headers to that of
-a fixed old release.
-
-For this to work, all new symbols added to binary compatible releases must
-be #if'ed with wxABI_VERSION.
+However, for this purpose we have the macro wxABI_VERSION.  All
+new symbols added to binary compatable releases are to be ifed
+with wxABI_VERSION.
 
 The layout of wxABI_VERSION is as follows:
 
@@ -89,7 +63,7 @@ where
  2     06     02
 Major Minor Release
 
-I.E. it corresponds to the wxWidgets release in (1).
+I.E. it corresponds to the wxWidgets release in {1}.
 
 An example of using wxABI_VERSION is as follows for symbols
 only in a 2.6.2 release:
@@ -112,10 +86,10 @@ bool LoadURIWithProxy(const wxString& fileName, const wxString& proxy)
 #endif
 
 
-5. Workarounds for adding virtual functions
+4. Workarounds for adding virtual functions
 -------------------------------------------
 
-Originally the idea for adding virtual functions to binary compatible
+Originally the idea for adding virtual functions to binary compatable
 releases was to pad out some empty "reserved" functions and then
 rename those later when someone needed to add a virtual function.
 
@@ -141,7 +115,7 @@ is a wxShadowObjectMethod which is a typedef:
 typedef int (*wxShadowObjectMethod)(void*, void*);
 
 After you add a field, you can set it via SetField with the same
-parameters as AddField, the second parameter being the value to set
+params as AddField, the second param being the value to set
 the field to.  You can get the field after you call AddField
 via GetField, with the parameters as the other two field functions,
 only in the case the second parameter is the fallback 
@@ -156,11 +130,11 @@ parameter passed to the wxShadowObjectMethod, the third is the
 second parameter passed to that wxShadowObjectMethod, and the
 fourth is the return value of the wxShadowObjectMethod.
 
-6. version-script.in
+5. version-script.in
 --------------------
 
 For ld/libtool we use sun-style version scripts.  Basically
-anything which fits the conditions of being #if'ed via wxABI_VERSION
+anything which fits the conditions of being ifed via wxABI_VERSION
 needs to go here also.
 
 See 'info ld scripts version' on a GNU system, it's online here:
@@ -201,8 +175,8 @@ For example for wxLogBuffer a line like this:
     *wxLogBuffer*;
 
 
-7. Checking the version information in libraries and programs
--------------------------------------------------------------
+5.5. Checking the version information in libraries and programs
+---------------------------------------------------------------
 
 On Sun there is a tool for this, see pvs(1). On GNU you can use objdump, below
 are some examples.
@@ -252,18 +226,18 @@ $ objdump -T libwx_based-2.6.so | grep 'WXD_2\.6\.2' | grep -v 'UND\|ABS'
 00000000000abe10 g    DF .text  0000000000000088  WXD_2.6.2   _ZN14wxZipFSHandler7CleanupEv
 
 
-8. Testing binary compatibility between releases
+6. Testing binary compatability between releases
 ------------------------------------------------
 
-An easy way of testing binary compatibility is just to build wxWidgets
+An easy way of testing binary compatability is just to build wxWidgets
 in dll/dynamic library mode and then switch out the current library
 in question with an earlier stable version of the library, then running
 the application in question again.  If it runs OK then there is usually
-binary compatibility between those releases.
+binary compatability between those releases.
 
 You can also break into your debugger or whatever program you want
 to use and check the memory layout of the class.  If it is the same
-then it is binary compatible.
+then it is binary compatable.
 
 Also remember to look at http://www.wxwidgets.org/bincompat.html page which
 summarizes the results of testing of all the samples built against old

include/wx/aui/auibook.h

@@ -531,10 +531,6 @@ public:
 
     virtual void Split(size_t page, int direction);
    
-#if wxABI_VERSION >= 20801
-    const wxAuiManager& GetAuiManager() const { return m_mgr; }
-#endif
-
 protected:
 
     // these can be overridden

include/wx/aui/tabmdi.h

@@ -74,7 +74,7 @@ public:
     virtual bool ProcessEvent(wxEvent& event);
 
     wxAuiMDIChildFrame *GetActiveChild() const;
-    void SetActiveChild(wxAuiMDIChildFrame* pChildFrame);
+    inline void SetActiveChild(wxAuiMDIChildFrame* pChildFrame);
 
     wxAuiMDIClientWindow *GetClientWindow() const;
     virtual wxAuiMDIClientWindow *OnCreateClient();

include/wx/chkconf.h

@@ -1276,17 +1276,6 @@
                         wxUSE_CHOICEBOOK || \
                         wxUSE_TREEBOOK)
 
-#if wxUSE_COLLPANE
-#   if !wxUSE_BUTTON || !wxUSE_STATLINE
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxUSE_COLLPANE requires wxUSE_BUTTON and wxUSE_STATLINE"
-#       else
-#           undef wxUSE_COLLPANE
-#           define wxUSE_COLLPANE 0
-#       endif
-#   endif
-#endif /* wxUSE_COLLPANE */
-
 #if wxUSE_LISTBOOK
 #   if !wxUSE_LISTCTRL
 #       ifdef wxABORT_ON_CONFIG_ERROR

include/wx/confbase.h

@@ -225,7 +225,7 @@ public:
     // delete the group (with all subgroups)
   virtual bool DeleteGroup(const wxString& key) = 0;
     // delete the whole underlying object (disk file, registry key, ...)
-    // primarily for use by uninstallation routine.
+    // primarly for use by desinstallation routine.
   virtual bool DeleteAll() = 0;
 
   // options
@@ -254,13 +254,6 @@ protected:
   static bool IsImmutable(const wxString& key)
     { return !key.IsEmpty() && key[0] == wxCONFIG_IMMUTABLE_PREFIX; }
 
-  // return the path without trailing separator, if any: this should be called
-  // to sanitize paths referring to the group names before passing them to
-  // wxConfigPathChanger as "/foo/bar/" should be the same as "/foo/bar" and it
-  // isn't interpreted in the same way by it (and this can't be changed there
-  // as it's not the same for the entries names)
-  static wxString RemoveTrailingSeparator(const wxString& key);
-
   // do read/write the values of different types
   virtual bool DoReadString(const wxString& key, wxString *pStr) const = 0;
   virtual bool DoReadLong(const wxString& key, long *pl) const = 0;

include/wx/datetime.h

@@ -1928,9 +1928,7 @@ inline wxLongLong wxTimeSpan::GetSeconds() const
 
 inline int wxTimeSpan::GetMinutes() const
 {
-    // explicit cast to int suppresses a warning with CodeWarrior and possibly
-    // others (changing the return type to long from int is impossible in 2.8)
-    return (int)((GetSeconds() / 60l).GetLo());
+    return (GetSeconds() / 60l).GetLo();
 }
 
 inline int wxTimeSpan::GetHours() const

include/wx/dfb/evtloop.h

@@ -31,10 +31,6 @@ public:
     // returns DirectFB event buffer used by wx
     static wxIDirectFBEventBufferPtr GetDirectFBEventBuffer();
 
-    // wxYield implementation: iterate the loop as long as there are any
-    // pending events
-    void Yield();
-
 protected:
     virtual void WakeUp();
     virtual void OnNextIteration();

include/wx/dirdlg.h

@@ -73,12 +73,6 @@ public:
         return true;
     }
 
-#if WXWIN_COMPATIBILITY_2_6
-
-    wxDEPRECATED( long GetStyle() const );
-    wxDEPRECATED( void SetStyle(long style) );
-
-#endif  // WXWIN_COMPATIBILITY_2_6
 
     virtual void SetMessage(const wxString& message) { m_message = message; }
     virtual void SetPath(const wxString& path) { m_path = path; }

include/wx/filedlg.h

@@ -129,14 +129,6 @@ public:
                                            wxArrayString& filters) );
 #endif // WXWIN_COMPATIBILITY_2_4
 
-#if WXWIN_COMPATIBILITY_2_6
-
-    wxDEPRECATED( long GetStyle() const );
-    wxDEPRECATED( void SetStyle(long style) );
-
-#endif  // WXWIN_COMPATIBILITY_2_6
-
-
     // Append first extension to filePath from a ';' separated extensionList
     // if filePath = "path/foo.bar" just return it as is
     // if filePath = "foo[.]" and extensionList = "*.jpg;*.png" return "foo.jpg"

include/wx/filefn.h

@@ -295,8 +295,8 @@ enum wxFileKind
                     #define   wxOpen       _wopen
                 #endif
                 #define   wxAccess     _waccess
-                #define   wxMkDir      _wmkdir
-                #define   wxRmDir      _wrmdir
+                #define   wxMkDir      _mkdir
+                #define   wxRmDir      _rmdir
                 #ifdef wxHAS_HUGE_FILES
                     #define   wxStat       _wstati64
                 #else

include/wx/gdicmn.h

@@ -157,9 +157,6 @@ enum wxStockCursor
 #elif defined(__WXMGL__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( (const char**) X##_xpm )
-#elif defined(__WXDFB__)
-    // Initialize from an included XPM
-    #define wxICON(X) wxIcon( (const char**) X##_xpm )
 #elif defined(__WXGTK__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( (const char**) X##_xpm )
@@ -188,7 +185,6 @@ enum wxStockCursor
       defined(__WXX11__)   || \
       defined(__WXMAC__)   || \
       defined(__WXMGL__)   || \
-      defined(__WXDFB__)   || \
       defined(__WXCOCOA__)
     // Initialize from an included XPM
     #define wxBITMAP(name) wxBitmap( (const char**) name##_xpm )
@@ -487,7 +483,7 @@ public:
 };
 
 #if WXWIN_COMPATIBILITY_2_6
-inline bool wxRect::Inside(int cx, int cy) const { return Contains(cx, cy); }
+inline bool wxRect::Inside(int x, int y) const { return Contains(x, y); }
 inline bool wxRect::Inside(const wxPoint& pt) const { return Contains(pt); }
 inline bool wxRect::Inside(const wxRect& rect) const { return Contains(rect); }
 #endif // WXWIN_COMPATIBILITY_2_6

include/wx/generic/collpaneg.h

@@ -12,6 +12,8 @@
 #ifndef _WX_COLLAPSABLE_PANE_H_GENERIC_
 #define _WX_COLLAPSABLE_PANE_H_GENERIC_
 
+#if wxUSE_BUTTON && wxUSE_STATLINE
+
 // forward declared
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxStaticLine;
@@ -102,4 +104,5 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
+#endif // wxUSE_BUTTON && wxUSE_STATLINE
 #endif // _WX_COLLAPSABLE_PANE_H_GENERIC_

include/wx/generic/splitter.h

@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_GENERIC_SPLITTER_H_
-#define _WX_GENERIC_SPLITTER_H_
+#ifndef __SPLITTERH_G__
+#define __SPLITTERH_G__
 
 #include "wx/window.h"                      // base class declaration
 #include "wx/containr.h"                    // wxControlContainer
@@ -226,7 +226,7 @@ protected:
 
     // send the given event, return false if the event was processed and vetoed
     // by the user code
-    bool DoSendEvent(wxSplitterEvent& event);
+    inline bool DoSendEvent(wxSplitterEvent& event);
 
     // common part of all ctors
     void Init();
@@ -403,4 +403,4 @@ typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&);
 #define EVT_SPLITTER_UNSPLIT(id, fn) \
     wx__DECLARE_SPLITTEREVT(UNSPLIT, id, fn)
 
-#endif // _WX_GENERIC_SPLITTER_H_
+#endif // __SPLITTERH_G__

include/wx/generic/srchctlg.h

@@ -2,8 +2,9 @@
 // Name:        wx/generic/srchctlg.h
 // Purpose:     generic wxSearchCtrl class
 // Author:      Vince Harron
+// Modified by:
 // Created:     2006-02-19
-// RCS-ID:      $Id$
+// RCS-ID:      
 // Copyright:   Vince Harron
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,11 +14,37 @@
 
 #if wxUSE_SEARCHCTRL
 
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "srchctlg.h"
+#endif
+
 #include "wx/bitmap.h"
 
+// ----------------------------------------------------------------------------
+
 class WXDLLEXPORT wxSearchButton;
 class WXDLLEXPORT wxSearchTextCtrl;
 
+class WXDLLEXPORT wxSearchCtrlBase : public wxTextCtrlBase
+{
+public:
+    wxSearchCtrlBase() {}
+    virtual ~wxSearchCtrlBase() {}
+
+    // search control 
+    virtual void SetMenu( wxMenu* menu ) = 0;
+    virtual wxMenu* GetMenu() = 0;
+
+
+    // get/set options
+    virtual void SetSearchButtonVisible( bool show ) = 0;
+    virtual bool GetSearchButtonVisible() const = 0;
+
+    virtual void SetCancelButtonVisible( bool show ) = 0;
+    virtual bool GetCancelButtonVisible() const = 0;
+protected:
+};
+
 // ----------------------------------------------------------------------------
 // wxSearchCtrl is a combination of wxTextCtrl and wxSearchButton
 // ----------------------------------------------------------------------------
@@ -37,7 +64,7 @@ public:
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxSearchCtrlNameStr);
 
-    virtual ~wxSearchCtrl();
+    ~wxSearchCtrl();
 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& value = wxEmptyString,
@@ -54,11 +81,11 @@ public:
     
     // get/set search options
     // ----------------------
-    virtual void ShowSearchButton( bool show );
-    virtual bool IsSearchButtonVisible() const;
+    virtual void SetSearchButtonVisible( bool show );
+    virtual bool GetSearchButtonVisible() const;
 
-    virtual void ShowCancelButton( bool show );
-    virtual bool IsCancelButtonVisible() const;
+    virtual void SetCancelButtonVisible( bool show );
+    virtual bool GetCancelButtonVisible() const;
 
     // accessors
     // ---------
@@ -212,7 +239,6 @@ protected:
     virtual void OnSearchButton( wxCommandEvent& event );
 
     void OnSetFocus( wxFocusEvent& event );
-    void OnSize( wxSizeEvent& event );
 
 private:
     friend class wxSearchButton;

include/wx/list.h

@@ -181,18 +181,16 @@ private:
         static BaseListType EmptyList;                                        \
                                                                               \
         bool m_destroy;                                                       \
-                                                                              \
     public:                                                                   \
         decl compatibility_iterator                                           \
         {                                                                     \
         private:                                                              \
-            /* Workaround for broken VC6 nested class name resolution */      \
-            typedef std::list<elT>::iterator iterator;                        \
-            friend class liT;                                                 \
-                                                                              \
+          /* Workaround for broken VC6 nested class name resolution */        \
+          typedef std::list<elT>::iterator iterator;                          \
+          friend class liT;                                                   \
+        private:                                                              \
             iterator m_iter;                                                  \
             liT * m_list;                                                     \
-                                                                              \
         public:                                                               \
             compatibility_iterator()                                          \
                 : m_iter(EmptyList.end()), m_list( NULL ) {}                  \
@@ -340,9 +338,6 @@ private:
         void Sort( wxSortCompareFunction compfunc )                           \
             { sort( WX_LIST_SORTFUNCTION( elT, compfunc ) ); }                \
         ~liT() { Clear(); }                                                   \
-                                                                              \
-        /* It needs access to our EmptyList */                                \
-        friend decl compatibility_iterator;                                   \
     }
 
 #define WX_DECLARE_LIST(elementtype, listname)                              \

include/wx/listbook.h

@@ -65,7 +65,6 @@ public:
                 const wxString& name = wxEmptyString);
 
 
-    // overridden base class methods
     virtual int GetSelection() const;
     virtual bool SetPageText(size_t n, const wxString& strText);
     virtual wxString GetPageText(size_t n) const;
@@ -79,7 +78,6 @@ public:
                             int imageId = -1);
     virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
     virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
-    virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
     virtual void SetImageList(wxImageList *imageList);
 
     virtual bool DeleteAllPages();
@@ -92,6 +90,9 @@ protected:
     // get the size which the list control should have
     virtual wxSize GetControllerSize() const;
 
+    // return the page corresponding to the tab at the specified position
+    virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
+
     void UpdateSelectedPage(size_t newsel);
 
     wxBookCtrlBaseEvent* CreatePageChangingEvent() const;

include/wx/mac/carbon/listctrl.h

@@ -12,11 +12,8 @@
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 
-#include "wx/defs.h"
 #include "wx/generic/listctrl.h"
 
-#define wxMAC_ALWAYS_USE_GENERIC_LISTCTRL wxT("mac.listctrl.always_use_generic")
-
 class wxMacDataBrowserListCtrlControl;
 class wxMacListControl;
 class wxListCtrlTextCtrlWrapper;
@@ -344,14 +341,6 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   
   virtual int GetScrollPos(int orient) const;
   
-#if wxABI_VERSION >= 20801
-  void OnRightDown(wxMouseEvent& event);
-  void OnMiddleDown(wxMouseEvent& event);
-  void OnChar(wxKeyEvent& event);
-  virtual void SetFocus();
-  void FireMouseEvent(wxEventType eventType, wxPoint position);
-#endif
-
   virtual void SetDropTarget( wxDropTarget *dropTarget );
   virtual wxDropTarget* GetDropTarget() const;
   

include/wx/mac/carbon/private/mactext.h

@@ -1,115 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        mactext.h
-// Purpose:     private wxMacTextControl base class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     03/02/99
-// RCS-ID:      $Id: 
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_PRIVATE_MACTEXT_H_
-#define _WX_MAC_PRIVATE_MACTEXT_H_
-
-#include "wx/mac/private.h"
-
-// common interface for all implementations
-class wxMacTextControl : public wxMacControl
-{
-public :
-    wxMacTextControl( wxTextCtrl *peer ) ;
-    virtual ~wxMacTextControl() ;
-
-    virtual wxString GetStringValue() const = 0 ;
-    virtual void SetStringValue( const wxString &val ) = 0 ;
-    virtual void SetSelection( long from, long to ) = 0 ;
-    virtual void GetSelection( long* from, long* to ) const = 0 ;
-    virtual void WriteText( const wxString& str ) = 0 ;
-
-    virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
-    virtual void Copy() ;
-    virtual void Cut() ;
-    virtual void Paste() ;
-    virtual bool CanPaste() const ;
-    virtual void SetEditable( bool editable ) ;
-    virtual wxTextPos GetLastPosition() const ;
-    virtual void Replace( long from, long to, const wxString &str ) ;
-    virtual void Remove( long from, long to ) ;
-
-
-    virtual bool HasOwnContextMenu() const
-    { return false ; }
-
-    virtual bool SetupCursor( const wxPoint& pt )
-    { return false ; }
-
-    virtual void Clear() ;
-    virtual bool CanUndo() const;
-    virtual void Undo() ;
-    virtual bool CanRedo() const;
-    virtual void Redo() ;
-    virtual int GetNumberOfLines() const ;
-    virtual long XYToPosition(long x, long y) const;
-    virtual bool PositionToXY(long pos, long *x, long *y) const ;
-    virtual void ShowPosition(long WXUNUSED(pos)) ;
-    virtual int GetLineLength(long lineNo) const ;
-    virtual wxString GetLineText(long lineNo) const ;
-    virtual void CheckSpelling(bool check) { }
-
-#ifndef __WXMAC_OSX__
-    virtual void            MacControlUserPaneDrawProc(wxInt16 part) = 0 ;
-    virtual wxInt16         MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) = 0 ;
-    virtual wxInt16         MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) = 0 ;
-    virtual void            MacControlUserPaneIdleProc() = 0 ;
-    virtual wxInt16         MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) = 0 ;
-    virtual void            MacControlUserPaneActivateProc(bool activating) = 0 ;
-    virtual wxInt16         MacControlUserPaneFocusProc(wxInt16 action) = 0 ;
-    virtual void            MacControlUserPaneBackgroundProc(void* info) = 0 ;
-#endif
-} ;
-
-#if TARGET_API_MAC_OSX
-
-class wxMacUnicodeTextControl : public wxMacTextControl
-{
-public :
-    wxMacUnicodeTextControl( wxTextCtrl *wxPeer ) ;
-    wxMacUnicodeTextControl( wxTextCtrl *wxPeer,
-                             const wxString& str,
-                             const wxPoint& pos,
-                             const wxSize& size, long style ) ;
-    virtual ~wxMacUnicodeTextControl();
-
-    virtual bool Create( wxTextCtrl *wxPeer,
-                         const wxString& str,
-                         const wxPoint& pos,
-                         const wxSize& size, long style ) ;
-    virtual void VisibilityChanged(bool shown);
-    virtual wxString GetStringValue() const ;
-    virtual void SetStringValue( const wxString &str) ;
-    virtual void Copy();
-    virtual void Cut();
-    virtual void Paste();
-    virtual bool CanPaste() const;
-    virtual void SetEditable(bool editable) ;
-    virtual void GetSelection( long* from, long* to) const ;
-    virtual void SetSelection( long from , long to ) ;
-    virtual void WriteText(const wxString& str) ;
-
-protected :
-	virtual void CreateControl( wxTextCtrl* peer, const Rect* bounds, CFStringRef cfr );
-
-    // contains the tag for the content (is different for password and non-password controls)
-    OSType m_valueTag ;
-
-    // as the selection tag only works correctly when the control has the focus we have to mirror the
-    // intended value
-    EventHandlerRef m_focusHandlerRef ;
-public :
-    ControlEditTextSelectionRec m_selection ;
-};
-
-#endif // TARGET_API_MAC_OSX
-
-#endif // _WX_MAC_PRIVATE_MACTEXT_H_

include/wx/mac/carbon/srchctrl.h

@@ -1,86 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/srchctrl.h
-// Purpose:     mac carbon wxSearchCtrl class
-// Author:      Vince Harron
-// Created:     2006-02-19
-// RCS-ID:      $Id$
-// Copyright:   Vince Harron
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SEARCHCTRL_H_
-#define _WX_SEARCHCTRL_H_
-
-#if wxUSE_SEARCHCTRL
-
-class wxMacSearchFieldControl;
-
-class WXDLLEXPORT wxSearchCtrl : public wxSearchCtrlBase
-{
-public:
-    // creation
-    // --------
-
-    wxSearchCtrl();
-    wxSearchCtrl(wxWindow *parent, wxWindowID id,
-               const wxString& value = wxEmptyString,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxSearchCtrlNameStr);
-
-    virtual ~wxSearchCtrl();
-
-    bool Create(wxWindow *parent, wxWindowID id,
-                const wxString& value = wxEmptyString,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxSearchCtrlNameStr);
-
-    // get/set search button menu
-    // --------------------------
-    virtual void SetMenu( wxMenu* menu );
-    virtual wxMenu* GetMenu();
-
-    // get/set search options
-    // ----------------------
-    virtual void ShowSearchButton( bool show );
-    virtual bool IsSearchButtonVisible() const;
-
-    virtual void ShowCancelButton( bool show );
-    virtual bool IsCancelButtonVisible() const;
-
-    virtual wxInt32     MacSearchFieldSearchHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
-    virtual wxInt32     MacSearchFieldCancelHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
-
-    wxMacSearchFieldControl * GetPeer() const
-    { return (wxMacSearchFieldControl*) m_peer; }
-
-    virtual void SetFocus();
-
-protected:
-
-    wxSize DoGetBestSize() const;
-
-    void Init();
-
-    virtual void CreatePeer(
-           const wxString& str,
-           const wxPoint& pos,
-           const wxSize& size, long style );
-
-    wxMenu *m_menu;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxSearchCtrl)
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif // wxUSE_SEARCHCTRL
-
-#endif // _WX_SEARCHCTRL_H_
-

include/wx/mac/setup0.h

@@ -639,7 +639,6 @@
 #define wxUSE_RADIOBOX      1   // wxRadioBox
 #define wxUSE_RADIOBTN      1   // wxRadioButton
 #define wxUSE_SCROLLBAR     1   // wxScrollBar
-#define wxUSE_SEARCHCTRL    1   // wxSearchCtrl
 #define wxUSE_SLIDER        1   // wxSlider
 #define wxUSE_SPINBTN       1   // wxSpinButton
 #define wxUSE_SPINCTRL      1   // wxSpinCtrl

include/wx/mac/srchctrl.h

@@ -1,5 +0,0 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/generic/srchctlg.h"
-#else
-#include "wx/mac/carbon/srchctrl.h"
-#endif

include/wx/motif/setup0.h

@@ -638,7 +638,6 @@
 #define wxUSE_RADIOBOX      1   // wxRadioBox
 #define wxUSE_RADIOBTN      1   // wxRadioButton
 #define wxUSE_SCROLLBAR     1   // wxScrollBar
-#define wxUSE_SEARCHCTRL    1   // wxSearchCtrl
 #define wxUSE_SLIDER        1   // wxSlider
 #define wxUSE_SPINBTN       1   // wxSpinButton
 #define wxUSE_SPINCTRL      1   // wxSpinCtrl

include/wx/msw/mdi.h

@@ -178,7 +178,6 @@ public:
     virtual bool Show(bool show = true);
 
 protected:
-    virtual void DoGetScreenPosition(int *x, int *y) const;
     virtual void DoGetPosition(int *x, int *y) const;
     virtual void DoSetClientSize(int width, int height);
     virtual void InternalSetMenuBar();

include/wx/msw/private.h

@@ -406,49 +406,29 @@ private:
 // dtor
 class SelectInHDC
 {
-private:
-    void DoInit(HGDIOBJ hgdiobj) { m_hgdiobj = ::SelectObject(m_hdc, hgdiobj); }
-
 public:
-    SelectInHDC() : m_hdc(NULL) { }
-    SelectInHDC(HDC hdc, HGDIOBJ hgdiobj) : m_hdc(hdc) { DoInit(hgdiobj); }
+    SelectInHDC(HDC hdc, HGDIOBJ hgdiobj) : m_hdc(hdc)
+        { m_hgdiobj = ::SelectObject(hdc, hgdiobj); }
 
-    void Init(HDC hdc, HGDIOBJ hgdiobj)
-    {
-        wxASSERT_MSG( !m_hdc, _T("initializing twice?") );
+   ~SelectInHDC() { ::SelectObject(m_hdc, m_hgdiobj); }
 
-        m_hdc = hdc;
-
-        DoInit(hgdiobj);
-    }
-
-    ~SelectInHDC() { if ( m_hdc ) ::SelectObject(m_hdc, m_hgdiobj); }
-
-    // return true if the object was successfully selected
-    operator bool() const { return m_hgdiobj != 0; }
+   // return true if the object was successfully selected
+   operator bool() const { return m_hgdiobj != 0; }
 
 private:
-    HDC m_hdc;
-    HGDIOBJ m_hgdiobj;
+   HDC m_hdc;
+   HGDIOBJ m_hgdiobj;
 
-    DECLARE_NO_COPY_CLASS(SelectInHDC)
+   DECLARE_NO_COPY_CLASS(SelectInHDC)
 };
 
 // a class which cleans up any GDI object
 class AutoGDIObject
 {
 protected:
-    AutoGDIObject() { m_gdiobj = NULL; }
     AutoGDIObject(HGDIOBJ gdiobj) : m_gdiobj(gdiobj) { }
     ~AutoGDIObject() { if ( m_gdiobj ) ::DeleteObject(m_gdiobj); }
 
-    void InitGdiobj(HGDIOBJ gdiobj)
-    {
-        wxASSERT_MSG( !m_gdiobj, _T("initializing twice?") );
-
-        m_gdiobj = gdiobj;
-    }
-
     HGDIOBJ GetObject() const { return m_gdiobj; }
 
 private:
@@ -457,7 +437,7 @@ private:
 
 // TODO: all this asks for using a AutoHandler<T, CreateFunc> template...
 
-// a class for temporary brushes
+// a class for temporary pens
 class AutoHBRUSH : private AutoGDIObject
 {
 public:
@@ -467,22 +447,6 @@ public:
     operator HBRUSH() const { return (HBRUSH)GetObject(); }
 };
 
-// a class for temporary fonts
-class AutoHFONT : private AutoGDIObject
-{
-private:
-public:
-    AutoHFONT()
-        : AutoGDIObject() { }
-
-    AutoHFONT(const LOGFONT& lf)
-        : AutoGDIObject(::CreateFontIndirect(&lf)) { }
-
-    void Init(const LOGFONT& lf) { InitGdiobj(::CreateFontIndirect(&lf)); }
-
-    operator HFONT() const { return (HFONT)GetObject(); }
-};
-
 // a class for temporary pens
 class AutoHPEN : private AutoGDIObject
 {

include/wx/msw/setup0.h

@@ -638,7 +638,6 @@
 #define wxUSE_RADIOBOX      1   // wxRadioBox
 #define wxUSE_RADIOBTN      1   // wxRadioButton
 #define wxUSE_SCROLLBAR     1   // wxScrollBar
-#define wxUSE_SEARCHCTRL    1   // wxSearchCtrl
 #define wxUSE_SLIDER        1   // wxSlider
 #define wxUSE_SPINBTN       1   // wxSpinButton
 #define wxUSE_SPINCTRL      1   // wxSpinCtrl

include/wx/msw/textctrl.h

@@ -156,8 +156,6 @@ public:
     // the colours for them otherwise
     virtual bool SetBackgroundColour(const wxColour& colour);
     virtual bool SetForegroundColour(const wxColour& colour);
-#else
-    bool IsRich() const { return false; }
 #endif // wxUSE_RICHEDIT
 
 #if wxUSE_INKEDIT && wxUSE_RICHEDIT
@@ -209,15 +207,6 @@ protected:
     // common part of all ctors
     void Init();
 
-    // creates the control of appropriate class (plain or rich edit) with the
-    // styles corresponding to m_windowStyle
-    //
-    // this is used by ctor/Create() and when we need to recreate the control
-    // later
-    bool MSWCreateText(const wxString& value,
-                       const wxPoint& pos,
-                       const wxSize& size);
-
     virtual void DoSetValue(const wxString &value, int flags = 0);
 
     // return true if this control has a user-set limit on amount of text (i.e.

include/wx/msw/treectrl.h

@@ -273,10 +273,10 @@ private:
     void Init();
 
     // helper functions
-    bool DoGetItem(wxTreeViewItem *tvItem) const;
-    void DoSetItem(wxTreeViewItem *tvItem);
+    inline bool DoGetItem(wxTreeViewItem *tvItem) const;
+    inline void DoSetItem(wxTreeViewItem *tvItem);
 
-    void DoExpand(const wxTreeItemId& item, int flag);
+    inline void DoExpand(const wxTreeItemId& item, int flag);
 
     void DeleteTextCtrl();
 

include/wx/msw/wince/setup.h

@@ -638,7 +638,6 @@
 #define wxUSE_RADIOBOX      1   // wxRadioBox
 #define wxUSE_RADIOBTN      1   // wxRadioButton
 #define wxUSE_SCROLLBAR     1   // wxScrollBar
-#define wxUSE_SEARCHCTRL    1   // wxSearchCtrl
 #define wxUSE_SLIDER        1   // wxSlider
 #define wxUSE_SPINBTN       1   // wxSpinButton
 #define wxUSE_SPINCTRL      1   // wxSpinCtrl

include/wx/os2/setup0.h

@@ -638,7 +638,6 @@
 #define wxUSE_RADIOBOX      1   // wxRadioBox
 #define wxUSE_RADIOBTN      1   // wxRadioButton
 #define wxUSE_SCROLLBAR     1   // wxScrollBar
-#define wxUSE_SEARCHCTRL    1   // wxSearchCtrl
 #define wxUSE_SLIDER        1   // wxSlider
 #define wxUSE_SPINBTN       1   // wxSpinButton
 #define wxUSE_SPINCTRL      1   // wxSpinCtrl

include/wx/palmos/setup0.h

@@ -638,7 +638,6 @@
 #define wxUSE_RADIOBOX      1   // wxRadioBox
 #define wxUSE_RADIOBTN      1   // wxRadioButton
 #define wxUSE_SCROLLBAR     1   // wxScrollBar
-#define wxUSE_SEARCHCTRL    1   // wxSearchCtrl
 #define wxUSE_SLIDER        1   // wxSlider
 #define wxUSE_SPINBTN       1   // wxSpinButton
 #define wxUSE_SPINCTRL      1   // wxSpinCtrl

include/wx/pickerbase.h

@@ -17,7 +17,6 @@
 #include "wx/containr.h"
 
 class WXDLLIMPEXP_CORE wxTextCtrl;
-class WXDLLEXPORT wxToolTip;
 
 extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
 
@@ -52,7 +51,6 @@ public:
                     const wxValidator& validator = wxDefaultValidator,
                     const wxString& name = wxButtonNameStr);
 
-    virtual void DoSetToolTip( wxToolTip *tip );
 
 public:     // public API
 

include/wx/private/socketevtdispatch.h

@@ -1,67 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/private/socketevtdispatch.h
-// Purpose:     wxSocketEventDispatcher class
-// Authors:     Angel Vidal
-// Modified by:
-// Created:     August 2006
-// Copyright:   (c) Angel Vidal
-// RCS-ID:      $Id$
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRIVATE_SOCKETEVTDISPATCH_H_
-#define _WX_PRIVATE_SOCKETEVTDISPATCH_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_SOCKETS
-
-#include "wx/hash.h"
-
-// forward declarations
-class wxSocketEventDispatcherEntry;
-class GSocket;
-
-enum wxSocketEventDispatcherType
-{
-    wxSocketEventDispatcherInput,
-    wxSocketEventDispatcherOutput
-};
-
-class WXDLLIMPEXP_CORE wxSocketEventDispatcher : public wxHashTable
-{
-protected:
-    wxSocketEventDispatcher() : wxHashTable(wxKEY_INTEGER) {}
-
-public:
-    // returns instance of the table
-    static wxSocketEventDispatcher& Get();
-
-    virtual ~wxSocketEventDispatcher()
-    {
-        WX_CLEAR_HASH_TABLE(*this)
-    }
-
-    void RegisterCallback(int fd, wxSocketEventDispatcherType socketType,
-                          GSocket* socket);
-
-    void UnregisterCallback(int fd, wxSocketEventDispatcherType socketType);
-
-    void RunLoop(int timeout = 0);
-
-private:
-    void AddEvents(fd_set* readset, fd_set* writeset);
-
-    int FillSets(fd_set* readset, fd_set* writeset);
-
-    wxSocketEventDispatcherEntry* FindEntry(int fd);
-
-private:
-    static wxSocketEventDispatcher *ms_instance;
-
-    friend class wxSocketEventDispatcherModule;
-};
-
-#endif // wxUSE_SOCKETS
-
-#endif // _WX_PRIVATE_SOCKETEVTDISPATCH_H_

include/wx/richtext/richtextctrl.h

@@ -600,7 +600,6 @@ public:
 
     void Command(wxCommandEvent& event);
     void OnDropFiles(wxDropFilesEvent& event);
-    void OnCaptureLost(wxMouseCaptureLostEvent& event);
 
     void OnCut(wxCommandEvent& event);
     void OnCopy(wxCommandEvent& event);

include/wx/richtext/richtextsymboldlg.h

@@ -116,10 +116,16 @@ public:
     void OnFromUnicodeSelected( wxCommandEvent& event );
 
 #endif
-
+#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMGL__) || defined(__WXMOTIF__) || defined(__WXCOCOA__) || defined(__WXX11__) || defined(__WXPALMOS__)
     /// wxEVT_UPDATE_UI event handler for wxID_OK
     void OnOkUpdate( wxUpdateUIEvent& event );
 
+#endif
+#if defined(__WXMAC__)
+    /// wxEVT_UPDATE_UI event handler for wxID_OK
+    void OnOkUpdate( wxUpdateUIEvent& event );
+
+#endif
 ////@end wxSymbolPickerDialog event handler declarations
 
 ////@begin wxSymbolPickerDialog member function declarations

include/wx/scopeguard.h

@@ -51,14 +51,8 @@
 
 #else
 
-#if !defined(__GNUC__) || wxCHECK_GCC_VERSION(2, 95)
-// namespace support was first implemented in gcc-2.95,
-// so avoid using it for older versions.
 namespace wxPrivate
 {
-#else
-#define wxPrivate
-#endif
     // in the original implementation this was a member template function of
     // ScopeGuardImplBase but gcc 2.8 which is still used for OS/2 doesn't
     // support member templates and so we must make it global
@@ -81,9 +75,7 @@ namespace wxPrivate
     void Use(const T& WXUNUSED(t))
     {
     }
-#if !defined(__GNUC__) || wxCHECK_GCC_VERSION(2, 95)
 } // namespace wxPrivate
-#endif
 
 #define wxPrivateOnScopeExit(n) wxPrivate::OnScopeExit(n)
 #define wxPrivateUse(n) wxPrivate::Use(n)

include/wx/setup_inc.h

@@ -634,7 +634,6 @@
 #define wxUSE_RADIOBOX      1   // wxRadioBox
 #define wxUSE_RADIOBTN      1   // wxRadioButton
 #define wxUSE_SCROLLBAR     1   // wxScrollBar
-#define wxUSE_SEARCHCTRL    1   // wxSearchCtrl
 #define wxUSE_SLIDER        1   // wxSlider
 #define wxUSE_SPINBTN       1   // wxSpinButton
 #define wxUSE_SPINCTRL      1   // wxSpinCtrl

include/wx/srchctrl.h

@@ -1,89 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        srchctrl.h
-// Purpose:     wxSearchCtrlBase class
-// Author:      Vince Harron
-// Created:     2006-02-18
-// RCS-ID:      $Id$
-// Copyright:   (c) Vince Harron
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SEARCHCTRL_H_BASE_
-#define _WX_SEARCHCTRL_H_BASE_
-
-#include "wx/defs.h"
-
-#if wxUSE_SEARCHCTRL
-
-#include "wx/textctrl.h"
-
-#if !defined(__WXUNIVERSAL__) && defined(__WXMAC__) && defined(__WXMAC_OSX__) \
-        && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3)
-    // search control was introduced in Mac OS X 10.3 Panther
-    #define wxUSE_NATIVE_SEARCH_CONTROL 1
-
-    #define wxSearchCtrlBaseBaseClass wxTextCtrl
-#else
-    // no native version, use the generic one
-    #define wxUSE_NATIVE_SEARCH_CONTROL 0
-
-    #define wxSearchCtrlBaseBaseClass wxTextCtrlBase
-#endif
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-extern WXDLLEXPORT_DATA(const wxChar) wxSearchCtrlNameStr[];
-
-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, 1119)
-    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, 1120)
-END_DECLARE_EVENT_TYPES()
-
-// ----------------------------------------------------------------------------
-// a search ctrl is a text control with a search button and a cancel button
-// it is based on the MacOSX 10.3 control HISearchFieldCreate
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxSearchCtrlBase : public wxSearchCtrlBaseBaseClass
-{
-public:
-    wxSearchCtrlBase() { }
-    virtual ~wxSearchCtrlBase() { }
-
-    // search control 
-    virtual void SetMenu(wxMenu *menu) = 0;
-    virtual wxMenu *GetMenu() = 0;
-
-    // get/set options
-    virtual void ShowSearchButton( bool show ) = 0;
-    virtual bool IsSearchButtonVisible() const = 0;
-
-    virtual void ShowCancelButton( bool show ) = 0;
-    virtual bool IsCancelButtonVisible() const = 0;
-};
-
-
-// include the platform-dependent class implementation
-#if wxUSE_NATIVE_SEARCH_CONTROL
-    #if defined(__WXMAC__)
-        #include "wx/mac/srchctrl.h"
-    #endif
-#else
-    #include "wx/generic/srchctlg.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// macros for handling search events
-// ----------------------------------------------------------------------------
-
-#define EVT_SEARCHCTRL_CANCEL_BTN(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, id, wxCommandEventHandler(fn))
-
-#define EVT_SEARCHCTRL_SEARCH_BTN(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, id, wxCommandEventHandler(fn))
-
-#endif // wxUSE_SEARCHCTRL
-
-#endif // _WX_SEARCHCTRL_H_BASE_

include/wx/taskbar.h

@@ -109,16 +109,8 @@ END_DECLARE_EVENT_TYPES()
 #define EVT_TASKBAR_LEFT_DCLICK(fn)  wx__DECLARE_TASKBAREVT(LEFT_DCLICK, fn)
 #define EVT_TASKBAR_RIGHT_DCLICK(fn) wx__DECLARE_TASKBAREVT(RIGHT_DCLICK, fn)
 
-// taskbar menu is shown on right button press under all platforms except MSW
-// where it's shown on right button release, using this event type and macro
-// allows to write code which works correctly on all platforms
-#ifdef __WXMSW__
-    #define wxEVT_TASKBAR_CLICK wxEVT_TASKBAR_RIGHT_UP
-#else
-    #define wxEVT_TASKBAR_CLICK wxEVT_TASKBAR_RIGHT_DOWN
 #endif
-#define EVT_TASKBAR_CLICK(fn)        wx__DECLARE_TASKBAREVT(CLICK, fn)
+    // wxHAS_TASK_BAR_ICON
 
-#endif // wxHAS_TASK_BAR_ICON
-
-#endif // _WX_TASKBAR_H_BASE_
+#endif
+    // _WX_TASKBAR_H_BASE_

include/wx/treebook.h

@@ -135,7 +135,6 @@ public:
     virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
     virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
     virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
-    virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
     virtual void SetImageList(wxImageList *imageList);
     virtual void AssignImageList(wxImageList *imageList);
     virtual bool DeleteAllPages();
@@ -147,6 +146,9 @@ protected:
     // This subclass of wxBookCtrlBase accepts NULL page pointers (empty pages)
     virtual bool AllowNullPage() const { return true; }
 
+    // return the page corresponding to the tab at the specified position
+    virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
+
     // event handlers
     void OnTreeSelectionChange(wxTreeEvent& event);
     void OnTreeNodeExpandedCollapsed(wxTreeEvent& event);

include/wx/treectrl.h

@@ -172,11 +172,6 @@ public:
     virtual bool IsSelected(const wxTreeItemId& item) const = 0;
         // is item text in bold font?
     virtual bool IsBold(const wxTreeItemId& item) const = 0;
-#if wxABI_VERSION >= 20801
-        // is the control empty?
-    bool IsEmpty() const;
-#endif // wxABI 2.8.1+
-
 
     // number of children
     // ------------------
@@ -298,12 +293,6 @@ public:
     void ExpandAll();
         // collapse the item without removing its children
     virtual void Collapse(const wxTreeItemId& item) = 0;
-#if wxABI_VERSION >= 20801
-        // collapse the item and all its childs and thats childs
-    void CollapseAllChildren(const wxTreeItemId& item);
-        // collapse all items
-    void CollapseAll();
-#endif // wxABI 2.8.1+
         // collapse the item and remove all children
     virtual void CollapseAndReset(const wxTreeItemId& item) = 0;
         // toggles the current state

include/wx/univ/colschem.h

@@ -68,9 +68,6 @@ public:
         // desktop background colour (only used by framebuffer ports)
         DESKTOP,
 
-        // wxFrame's background colour
-        FRAME,
-
         MAX
     };
 

include/wx/univ/setup0.h

@@ -662,7 +662,6 @@
 #define wxUSE_RADIOBOX         1    // wxRadioBox
 #define wxUSE_RADIOBTN         1    // wxRadioButton
 #define wxUSE_SCROLLBAR        1    // wxScrollBar
-#define wxUSE_SEARCHCTRL       1    // wxSearchCtrl
 #define wxUSE_SLIDER           1    // wxSlider
 #define wxUSE_SPINBTN          1    // wxSpinButton
 #define wxUSE_SPINCTRL         1    // wxSpinCtrl

include/wx/version.h

@@ -28,9 +28,9 @@
 /*  NB: this file is parsed by automatic tools so don't change its format! */
 #define wxMAJOR_VERSION      2
 #define wxMINOR_VERSION      8
-#define wxRELEASE_NUMBER     1
+#define wxRELEASE_NUMBER     0
 #define wxSUBRELEASE_NUMBER  0
-#define wxVERSION_STRING   _T("wxWidgets 2.8.1")
+#define wxVERSION_STRING   _T("wxWidgets 2.8.0")
 
 /*  nothing to update below this line when updating the version */
 /*  ---------------------------------------------------------------------------- */

include/wx/wxchar.h

@@ -982,18 +982,13 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
 #endif /* wxUSE_PRINTF_POS_PARAMS/!wxUSE_PRINTF_POS_PARAMS */
 
 #ifndef wxSnprintf_
-    /* no snprintf(), cook our own */
+    /* no [v]snprintf(), cook our own */
     WXDLLIMPEXP_BASE int
     wxSnprintf_(wxChar *buf, size_t len, const wxChar *format, ...) ATTRIBUTE_PRINTF_3;
 #endif
 #ifndef wxVsnprintf_
-    /* no (suitable) vsnprintf(), cook our own */
     WXDLLIMPEXP_BASE int
     wxVsnprintf_(wxChar *buf, size_t len, const wxChar *format, va_list argptr);
-
-    #define wxUSE_WXVSNPRINTF 1
-#else
-    #define wxUSE_WXVSNPRINTF 0
 #endif
 
 /*

misc/scripts/inc_release

@@ -1,90 +0,0 @@
-#!/bin/sh
-##############################################################################
-# Name:       misc/scripts/inc_release
-# Purpose:    increments the release version number in all files mentioned in
-#             docs/tech/tn0011.txt
-# Created:    2007-01-07
-# RCS-ID:     $Id$
-# Copyright:  (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
-# Licence:    wxWindows licence
-##############################################################################
-
-error() {
-    echo "$progname: $*" >&2
-}
-
-msg() {
-    echo "$progname: $*"
-}
-
-msgn() {
-    echo -n "$progname: $*"
-}
-
-msgc() {
-    echo "$*"
-}
-
-run_sed() {
-    filename=$1
-    shift
-    cmd=
-    while [ $# -gt 0 ]; do
-        cmd="$cmd-e \"$1\" "
-        shift
-    done
-
-    msgn "	processing $filename ...	"
-    eval "sed $cmd $filename" > $filename.$$
-    if cmp -s $filename $filename.$$; then
-        rm $filename.$$
-        msgc "unchanged"
-    else
-        mv $filename.$$ $filename
-        msgc "done"
-    fi
-}
-
-progname=`basename $0`
-
-# we must be run from wx directory
-if [ ! -f wxwin.m4 ]; then
-    error "must be ran from root wx directory"
-    exit 1
-fi
-
-# exit on any error
-set -e
-
-# the primary source of information is wx/version.h
-ver_string=`grep '#define wxVERSION_STRING ' include/wx/version.h | sed 's/^.*"wxWidgets \(.*\)")/\1/'`
-ver_major=`echo $ver_string | sed 's/\([0-9]\{1,\}\)\..*/\1/'`
-ver_minor=`echo $ver_string | sed 's/.*\.\([0-9]\{1,\}\)\..*/\1/'`
-ver_release=`echo $ver_string | sed 's/.*\.\([0-9]\{1,\}\)$/\1/'`
-
-msg "Original version is $ver_major.$ver_minor.$ver_release"
-
-ver_release_new=$(($ver_release + 1))
-ver_string_new=$ver_major.$ver_minor.$ver_release_new
-
-msg "Updating version to $ver_string_new"
-
-ver_for_sed="$ver_major\.$ver_minor\.$ver_release"
-
-run_sed include/wx/version.h \
-    "s/^\(#define wxRELEASE_NUMBER *\) $ver_release$/\1 $ver_release_new/" \
-    "s/^\(#define wxSUBRELEASE_NUMBER *\) [0-9]\{1,\}$/\1 0/" \
-    "/^#define wxVERSION_STRING/s/$ver_for_sed/$ver_string_new/"
-
-run_sed configure.in \
-    "/^AC_INIT/s/$ver_for_sed/$ver_string_new/" \
-    "s/^wx_release_number=$ver_release/wx_release_number=$ver_release_new/" \
-    "s/^wx_subrelease_number=.*$/wx_subrelease_number=0/"
-
-for f in *.spec; do
-    run_sed $f "/^%define *ver/s/$ver_for_sed/$ver_string_new/"
-done
-
-run_sed docs/latex/wx/manual.tex \
-    "/^\\\\\\\\title/s/$ver_for_sed/$ver_string_new/"
-run_sed build/script/win_docs.bat "/SET WXW_VER=/s/$ver_for_sed/$ver_string_new/"

samples/docview/doc.cpp

@@ -172,7 +172,7 @@ wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
     wxTextOutputStream text_stream( stream );
 
     wxInt32 n = lines.GetCount();
-    text_stream << n << _T("\n");
+    text_stream << n << _T('\n');
 
     wxList::compatibility_iterator node = lines.GetFirst();
     while (node)

samples/listctrl/listtest.cpp

@@ -42,7 +42,6 @@
 #include "wx/timer.h"           // for wxStopWatch
 #include "wx/colordlg.h"        // for wxGetColourFromUser
 #include "wx/settings.h"
-#include "wx/sysopt.h"
 
 #include "listtest.h"
 
@@ -92,7 +91,6 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(LIST_FREEZE, MyFrame::OnFreeze)
     EVT_MENU(LIST_THAW, MyFrame::OnThaw)
     EVT_MENU(LIST_TOGGLE_LINES, MyFrame::OnToggleLines)
-    EVT_MENU(LIST_MAC_USE_GENERIC, MyFrame::OnToggleMacUseGeneric)
 
     EVT_UPDATE_UI(LIST_SHOW_COL_INFO, MyFrame::OnUpdateShowColInfo)
     EVT_UPDATE_UI(LIST_TOGGLE_MULTI_SEL, MyFrame::OnUpdateToggleMultiSel)
@@ -224,9 +222,6 @@ MyFrame::MyFrame(const wxChar *title)
     menuView->Append(LIST_SMALL_ICON_TEXT_VIEW, _T("Small icon &view with text\tF6"));
     menuView->Append(LIST_VIRTUAL_VIEW, _T("&Virtual view\tF7"));
     menuView->Append(LIST_SMALL_VIRTUAL_VIEW, _T("Small virtual vie&w\tF8"));
-#ifdef __WXMAC__
-    menuView->AppendCheckItem(LIST_MAC_USE_GENERIC, _T("Mac: Use Generic Control"));
-#endif
 
     wxMenu *menuList = new wxMenu;
     menuList->Append(LIST_FOCUS_LAST, _T("&Make last item current\tCtrl-L"));
@@ -345,11 +340,6 @@ void MyFrame::OnToggleLines(wxCommandEvent& event)
     m_listCtrl->SetSingleStyle(wxLC_HRULES | wxLC_VRULES, event.IsChecked());
 }
 
-void MyFrame::OnToggleMacUseGeneric(wxCommandEvent& event)
-{
-    wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), event.IsChecked());
-}
-
 void MyFrame::OnFocusLast(wxCommandEvent& WXUNUSED(event))
 {
     long index = m_listCtrl->GetItemCount() - 1;

samples/listctrl/listtest.h

@@ -136,7 +136,6 @@ protected:
     void OnFreeze(wxCommandEvent& event);
     void OnThaw(wxCommandEvent& event);
     void OnToggleLines(wxCommandEvent& event);
-    void OnToggleMacUseGeneric(wxCommandEvent& event);
 
     void OnUpdateShowColInfo(wxUpdateUIEvent& event);
     void OnUpdateToggleMultiSel(wxUpdateUIEvent& event);
@@ -204,7 +203,6 @@ enum
     LIST_FREEZE,
     LIST_THAW,
     LIST_TOGGLE_LINES,
-    LIST_MAC_USE_GENERIC,
 
     LIST_CTRL                   = 1000
 };

samples/minimal/minimal.xcodeproj/project.pbxproj

@@ -466,7 +466,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(NATIVE_ARCH)";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = ../../include/wx/wxprec.h;
 				GCC_PREPROCESSOR_DEFINITIONS = (