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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_8_0_rc2@43421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-14 18:33:20 +00:00
898 changed files with 24267 additions and 84895 deletions
--- a/Makefile.in
+++ b/Makefile.in
@@ -1802,7 +1802,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR =  \
 	wx/generic/icon.h \
 	wx/generic/paletteg.h \
 	wx/gtk/app.h \
-	wx/gtk/assertdlg_gtk.h \
 	wx/gtk/bitmap.h \
 	wx/gtk/brush.h \
 	wx/gtk/clipbrd.h \
@@ -1846,6 +1845,7 @@ COND_TOOLKIT_MGL_LOWLEVEL_HDR =  \
 	wx/mgl/dcmemory.h \
 	wx/mgl/dcscreen.h \
 	wx/mgl/font.h \
+	wx/mgl/fontutil.h \
 	wx/mgl/palette.h \
 	wx/mgl/pen.h \
 	wx/mgl/popupwin.h \
@@ -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 \
@@ -3728,8 +3716,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
@COND_TOOLKIT_COCOA@__LOWLEVEL_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 \
@@ -3747,7 +3733,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_evtloop.o \
 	monodll_font.o \
 	monodll_fontenum.o \
-	monodll_fontmgr.o \
 	monodll_overlay.o \
 	monodll_pen.o \
 	monodll_region.o \
@@ -3808,7 +3793,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_icon.o \
 	monodll_paletteg.o \
 	monodll_app.o \
-	monodll_assertdlg_gtk.o \
 	monodll_bitmap.o \
 	monodll_brush.o \
 	monodll_clipbrd.o \
@@ -3840,7 +3824,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS =  \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS)
@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS = $(__MAC_LOWLEVEL_SRC_OBJECTS)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \
-	monodll_fontmgrcmn.o \
 	monodll_caret.o \
 	monodll_colour.o \
 	monodll_icon.o \
@@ -3861,7 +3844,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_evtloop.o \
 	monodll_font.o \
 	monodll_fontenum.o \
-	monodll_fontmgr.o \
 	monodll_fontutil.o \
 	monodll_palette.o \
 	monodll_pen.o \
@@ -3994,7 +3976,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 +3992,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 +4258,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 \
@@ -4561,8 +4542,6 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS =  \
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \
@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 \
@@ -4580,7 +4559,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_evtloop.o \
 	monodll_font.o \
 	monodll_fontenum.o \
-	monodll_fontmgr.o \
 	monodll_overlay.o \
 	monodll_pen.o \
 	monodll_region.o \
@@ -4641,7 +4619,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_icon.o \
 	monodll_paletteg.o \
 	monodll_app.o \
-	monodll_assertdlg_gtk.o \
 	monodll_bitmap.o \
 	monodll_brush.o \
 	monodll_clipbrd.o \
@@ -4673,7 +4650,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 =  \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1)
@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_1 = $(__MAC_LOWLEVEL_SRC_OBJECTS)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1 =  \
-	monodll_fontmgrcmn.o \
 	monodll_caret.o \
 	monodll_colour.o \
 	monodll_icon.o \
@@ -4694,7 +4670,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_evtloop.o \
 	monodll_font.o \
 	monodll_fontenum.o \
-	monodll_fontmgr.o \
 	monodll_fontutil.o \
 	monodll_palette.o \
 	monodll_pen.o \
@@ -4827,7 +4802,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 +4818,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 +5261,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 +5296,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 +5434,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 +5469,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 \
@@ -5509,8 +5480,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \
@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 \
@@ -5528,7 +5497,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_evtloop.o \
 	monolib_font.o \
 	monolib_fontenum.o \
-	monolib_fontmgr.o \
 	monolib_overlay.o \
 	monolib_pen.o \
 	monolib_region.o \
@@ -5589,7 +5557,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_icon.o \
 	monolib_paletteg.o \
 	monolib_app.o \
-	monolib_assertdlg_gtk.o \
 	monolib_bitmap.o \
 	monolib_brush.o \
 	monolib_clipbrd.o \
@@ -5622,7 +5589,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 =  \
@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_2 = \
@COND_TOOLKIT_MAC@	$(__MAC_LOWLEVEL_SRC_OBJECTS_0)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2 =  \
-	monolib_fontmgrcmn.o \
 	monolib_caret.o \
 	monolib_colour.o \
 	monolib_icon.o \
@@ -5643,7 +5609,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_evtloop.o \
 	monolib_font.o \
 	monolib_fontenum.o \
-	monolib_fontmgr.o \
 	monolib_fontutil.o \
 	monolib_palette.o \
 	monolib_pen.o \
@@ -5776,7 +5741,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 +5757,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 +6023,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 \
@@ -6343,8 +6307,6 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 =  \
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \
@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 \
@@ -6362,7 +6324,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_evtloop.o \
 	monolib_font.o \
 	monolib_fontenum.o \
-	monolib_fontmgr.o \
 	monolib_overlay.o \
 	monolib_pen.o \
 	monolib_region.o \
@@ -6423,7 +6384,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_icon.o \
 	monolib_paletteg.o \
 	monolib_app.o \
-	monolib_assertdlg_gtk.o \
 	monolib_bitmap.o \
 	monolib_brush.o \
 	monolib_clipbrd.o \
@@ -6456,7 +6416,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 =  \
@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_3 = \
@COND_TOOLKIT_MAC@	$(__MAC_LOWLEVEL_SRC_OBJECTS_0)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3 =  \
-	monolib_fontmgrcmn.o \
 	monolib_caret.o \
 	monolib_colour.o \
 	monolib_icon.o \
@@ -6477,7 +6436,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_evtloop.o \
 	monolib_font.o \
 	monolib_fontenum.o \
-	monolib_fontmgr.o \
 	monolib_fontutil.o \
 	monolib_palette.o \
 	monolib_pen.o \
@@ -6610,7 +6568,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 +6584,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 +7255,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 +7290,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 +7428,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 +7463,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 \
@@ -7520,8 +7474,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \
@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 \
@@ -7539,7 +7491,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_evtloop.o \
 	coredll_font.o \
 	coredll_fontenum.o \
-	coredll_fontmgr.o \
 	coredll_overlay.o \
 	coredll_pen.o \
 	coredll_region.o \
@@ -7600,7 +7551,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_icon.o \
 	coredll_paletteg.o \
 	coredll_app.o \
-	coredll_assertdlg_gtk.o \
 	coredll_bitmap.o \
 	coredll_brush.o \
 	coredll_clipbrd.o \
@@ -7633,7 +7583,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 =  \
@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_4 = \
@COND_TOOLKIT_MAC@	$(__MAC_LOWLEVEL_SRC_OBJECTS_8)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4 =  \
-	coredll_fontmgrcmn.o \
 	coredll_caret.o \
 	coredll_colour.o \
 	coredll_icon.o \
@@ -7654,7 +7603,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_evtloop.o \
 	coredll_font.o \
 	coredll_fontenum.o \
-	coredll_fontmgr.o \
 	coredll_fontutil.o \
 	coredll_palette.o \
 	coredll_pen.o \
@@ -7787,7 +7735,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 +7751,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 +8017,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 \
@@ -8354,8 +8301,6 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 =  \
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \
@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 \
@@ -8373,7 +8318,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_evtloop.o \
 	coredll_font.o \
 	coredll_fontenum.o \
-	coredll_fontmgr.o \
 	coredll_overlay.o \
 	coredll_pen.o \
 	coredll_region.o \
@@ -8434,7 +8378,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_icon.o \
 	coredll_paletteg.o \
 	coredll_app.o \
-	coredll_assertdlg_gtk.o \
 	coredll_bitmap.o \
 	coredll_brush.o \
 	coredll_clipbrd.o \
@@ -8467,7 +8410,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 =  \
@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_5 = \
@COND_TOOLKIT_MAC@	$(__MAC_LOWLEVEL_SRC_OBJECTS_8)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5 =  \
-	coredll_fontmgrcmn.o \
 	coredll_caret.o \
 	coredll_colour.o \
 	coredll_icon.o \
@@ -8488,7 +8430,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_evtloop.o \
 	coredll_font.o \
 	coredll_fontenum.o \
-	coredll_fontmgr.o \
 	coredll_fontutil.o \
 	coredll_palette.o \
 	coredll_pen.o \
@@ -8621,7 +8562,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 +8578,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 +8693,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 +8728,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 +8866,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 +8901,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 \
@@ -8975,8 +8912,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \
@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 \
@@ -8994,7 +8929,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_evtloop.o \
 	corelib_font.o \
 	corelib_fontenum.o \
-	corelib_fontmgr.o \
 	corelib_overlay.o \
 	corelib_pen.o \
 	corelib_region.o \
@@ -9055,7 +8989,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_icon.o \
 	corelib_paletteg.o \
 	corelib_app.o \
-	corelib_assertdlg_gtk.o \
 	corelib_bitmap.o \
 	corelib_brush.o \
 	corelib_clipbrd.o \
@@ -9088,7 +9021,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 =  \
@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_6 = \
@COND_TOOLKIT_MAC@	$(__MAC_LOWLEVEL_SRC_OBJECTS_9)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6 =  \
-	corelib_fontmgrcmn.o \
 	corelib_caret.o \
 	corelib_colour.o \
 	corelib_icon.o \
@@ -9109,7 +9041,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_evtloop.o \
 	corelib_font.o \
 	corelib_fontenum.o \
-	corelib_fontmgr.o \
 	corelib_fontutil.o \
 	corelib_palette.o \
 	corelib_pen.o \
@@ -9242,7 +9173,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 +9189,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 +9455,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 \
@@ -9809,8 +9739,6 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 =  \
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \
@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 \
@@ -9828,7 +9756,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_evtloop.o \
 	corelib_font.o \
 	corelib_fontenum.o \
-	corelib_fontmgr.o \
 	corelib_overlay.o \
 	corelib_pen.o \
 	corelib_region.o \
@@ -9889,7 +9816,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_icon.o \
 	corelib_paletteg.o \
 	corelib_app.o \
-	corelib_assertdlg_gtk.o \
 	corelib_bitmap.o \
 	corelib_brush.o \
 	corelib_clipbrd.o \
@@ -9922,7 +9848,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 =  \
@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_7 = \
@COND_TOOLKIT_MAC@	$(__MAC_LOWLEVEL_SRC_OBJECTS_9)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7 =  \
-	corelib_fontmgrcmn.o \
 	corelib_caret.o \
 	corelib_colour.o \
 	corelib_icon.o \
@@ -9943,7 +9868,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_evtloop.o \
 	corelib_font.o \
 	corelib_fontenum.o \
-	corelib_fontmgr.o \
 	corelib_fontutil.o \
 	corelib_palette.o \
 	corelib_pen.o \
@@ -10076,7 +10000,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 +10016,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 \
@@ -12043,7 +11967,7 @@ install-wxconfig:
 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
-	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)

 locale_install: 
 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
@@ -12888,9 +12812,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

@@ -13917,9 +13838,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/os2/app.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/app.cpp

-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c
-
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp

@@ -14820,11 +14738,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
@@ -14832,12 +14747,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monodll_reparent.o: $(srcdir)/src/x11/reparent.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp

-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
-
@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mask.o: $(srcdir)/src/generic/mask.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp

@@ -14847,12 +14756,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MGL_USE_GUI_1@monodll_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp

-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
-
@COND_TOOLKIT_DFB_USE_GUI_1@monodll_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp

@@ -16266,9 +16169,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 +16274,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 +16904,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

@@ -18036,9 +17930,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/os2/app.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/app.cpp

-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c
-
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp

@@ -18939,11 +18830,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
@@ -18951,12 +18839,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monolib_reparent.o: $(srcdir)/src/x11/reparent.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp

-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
-
@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mask.o: $(srcdir)/src/generic/mask.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp

@@ -18966,12 +18848,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MGL_USE_GUI_1@monolib_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp

-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
-
@COND_TOOLKIT_DFB_USE_GUI_1@monolib_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp

@@ -20385,9 +20261,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 +20366,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 +21995,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

@@ -22536,9 +22403,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/os2/app.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/app.cpp

-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c
-
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp

@@ -23439,11 +23303,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
@@ -23451,12 +23312,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@coredll_reparent.o: $(srcdir)/src/x11/reparent.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp

-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
-
@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mask.o: $(srcdir)/src/generic/mask.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp

@@ -23466,12 +23321,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MGL_USE_GUI_1@coredll_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp

-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
-
@COND_TOOLKIT_DFB_USE_GUI_1@coredll_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp

@@ -24849,9 +24698,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 +24803,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 +24923,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

@@ -25491,9 +25331,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/os2/app.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/app.cpp

-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c
-
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp

@@ -26394,11 +26231,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
@@ -26406,12 +26240,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@corelib_reparent.o: $(srcdir)/src/x11/reparent.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp

-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
-
@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mask.o: $(srcdir)/src/generic/mask.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp

@@ -26421,12 +26249,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MGL_USE_GUI_1@corelib_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp

-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
-
@COND_TOOLKIT_DFB_USE_GUI_1@corelib_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp

@@ -27804,9 +27626,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 +27731,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

--- a/build/aclocal/bakefile-lang.m4
+++ b/build/aclocal/bakefile-lang.m4
@@ -89,12 +89,12 @@ AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER],
         )
        ]
    )
+    AC_LANG_POP($2)
    if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3" = "xyes"; then
        :; $4
    else
        :; $5
    fi
-    AC_LANG_POP($2)
 ])

 dnl recent versions of SGI mipsPro compiler define _SGI_COMPILER_VERSION
--- a/build/aclocal/bakefile.m4
+++ b/build/aclocal/bakefile.m4
@@ -601,9 +601,9 @@ AC_DEFUN([AC_BAKEFILE_CHECK_BASIC_STUFF],
        dnl Sun C++ compiler requires special way of creating static libs;
        dnl see here for more details:
        dnl https://sourceforge.net/tracker/?func=detail&atid=109863&aid=1229751&group_id=9863
-        AR=${AR:-"$CXX"}
+        AR=$CXX
        AC_SUBST(AR)
-        AROPTIONS=${AROPTIONS:-"-xar -o"}
+        AROPTIONS="-xar -o"
    else
        AC_CHECK_TOOL(AR, ar, ar)
        AROPTIONS=rcu
--- a/build/bakefiles/Bakefiles.bkgen
+++ b/build/bakefiles/Bakefiles.bkgen
@@ -54,22 +54,22 @@
    </add-formats>

    <del-formats files="../../samples/*.bkl">
-        autoconf,msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
+        autoconf,msvc6prj,msevc4prj,cbuilderx,cbx_unix
    </del-formats>
    <del-formats files="../../demos/*.bkl">
-        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,cbuilderx,cbx_unix
    </del-formats>
    <del-formats files="../../samples/html/html_samples.bkl">
-        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,cbuilderx,cbx_unix
    </del-formats>
    <del-formats files="../../samples/mobile/mobile_samples.bkl">
-        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,cbuilderx,cbx_unix
    </del-formats>
    <del-formats files="../../samples/opengl/opengl_samples.bkl">
-        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,cbuilderx,cbx_unix
    </del-formats>
    <del-formats files="../../utils/*.bkl">
-        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,cbuilderx,cbx_unix
    </del-formats>

    <!-- WinCE can't have console apps: -->
@@ -81,7 +81,7 @@

    <!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
    <del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
-        borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2005prj,watcom,cbuilderx,cbx_unix
+        borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix
    </del-formats>


@@ -114,9 +114,6 @@
    <add-flags files="wx.bkl" formats="msvc6prj">
        -o../msw/wx.dsw
    </add-flags>
-    <add-flags files="wx.bkl" formats="msvs2005prj">
-        -o../msw/wx.sln
-    </add-flags>
    <add-flags files="wx.bkl" formats="msevc4prj">
        -o../wince/wx.vcw
    </add-flags>
@@ -134,7 +131,7 @@
        -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT).cbx
    </add-flags>
    <add-flags files="../../contrib/build/*/*.bkl"
-               formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj,msvs2005prj">
+               formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj">
        -DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
    </add-flags>

@@ -145,6 +142,11 @@
        -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4
    </add-flags>

+    <add-formats files="wx.bkl">wx24dsp</add-formats>
+    <add-flags formats="wx24dsp">
+        -DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWindows.dsp
+    </add-flags>
+
    <add-formats files="wx.bkl">rpmspec</add-formats>


--- a/build/bakefiles/build_cfg.bkl
+++ b/build/bakefiles/build_cfg.bkl
@@ -8,7 +8,7 @@
    the library.
    -->

-    <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2005prj','cbuilderx'] and
+    <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','cbuilderx'] and
              TOOLKIT in ['PM','MSW','MGL','MOTIF']">

        <set var="BUILD_CFG_FILE" make_var="1">
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -3,7 +3,7 @@

 <makefile>

-    <requires version="0.2.1"/>
+    <requires version="0.1.7"/>

    <!-- bakefile modules we need: -->
    <using module="datafiles"/>
@@ -347,15 +347,21 @@

    <!-- deal with the need to copy setup.h here: -->

-    <set var="IS_MSVC_PRJ">
-        $(FORMAT in ['msvc6prj','msevc4prj','msvs2005prj'])
-    </set>
+    <set var="IS_MSVC_PRJ">$(FORMAT in ['msvc6prj','msevc4prj'])</set>

    <define-tag name="msvc-headers" rules="dll,lib">
        <if cond="IS_MSVC_PRJ">
-            <msvc-project-files>
-                $(addPrefixToList('include\\', wxwin.headersOnly(value)))
-            </msvc-project-files>
+            <!-- FIXME: remove this once we require >=bkl-0.1.9 -->
+            <if cond="BAKEFILE_VERSION in ['0.1.7', '0.1.8']">
+                <msvc-project-files>
+                    $(addPrefixToList('include\', wxwin.headersOnly(value)))
+                </msvc-project-files>
+            </if>
+            <if cond="BAKEFILE_VERSION not in ['0.1.7', '0.1.8']">
+                <msvc-project-files>
+                    $(addPrefixToList('include\\', wxwin.headersOnly(value)))
+                </msvc-project-files>
+            </if>
        </if>
    </define-tag>

@@ -422,7 +428,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
            <set var="_custom_build_include_wx_msw_genrcdefs_h">
 Creating $(SETUPHDIR)\wx\msw\rcdefs.h

-"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(DOLLAR)(SETUPHDIR)\wx\msw"
 $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
            </set>
        </if>
@@ -640,10 +646,12 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
        <ldflags cond="FORMAT=='autoconf'">$(WXMACVERSION_CMD)</ldflags>

        <!-- version info resources: -->
-        <res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
-        <if cond="FORMAT=='autoconf'">
-            <res-include>$(RCDEFDIR)</res-include>
-            <res-include>$(TOP_SRCDIR)include</res-include>
+        <if cond="FORMAT not in ['rpmspec','wx24dsp']"> <!-- FIXME: fix for bkl-0.1.7 only, remove the cond later -->
+            <res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
+            <if cond="FORMAT=='autoconf'">
+                <res-include>$(RCDEFDIR)</res-include>
+                <res-include>$(TOP_SRCDIR)include</res-include>
+            </if>
        </if>
        <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
    </template>
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -98,8 +98,8 @@ Accepted values: AMD64, IA64.
    <!-- FIXME: restore this once bakefile is fixed to not use
                /Gm /GZ (incompatible with /O2) w/ debug-info -->
    <set var="DEBUG_INFO_DEFAULT">
-        <if cond="FORMAT in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">1</if>
-        <if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">default</if>
+        <if cond="FORMAT in ['msvc','msvc6prj','msevc4prj']">1</if>
+        <if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj']">default</if>
    </set>
    -->
    <set var="DEBUG_INFO_DEFAULT">default</set>
@@ -231,8 +231,8 @@ Acts according to BUILD by default.

    <!-- currently only VC++ can compile wxDebugReport which is in QA lib -->
    <set var="USE_QA_DEFAULT">
-        <if cond="FORMAT in ['msvc','msvc6prj','msvs2005prj']">1</if>
-        <if cond="FORMAT not in ['msvc','msvc6prj','msvs2005prj']">0</if>
+        <if cond="FORMAT in ['msvc','msvc6prj']">1</if>
+        <if cond="FORMAT not in ['msvc','msvc6prj']">0</if>
    </set>
    <option name="USE_QA">
        <values>0,1</values>
--- a/build/bakefiles/files.bkl
+++ b/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
@@ -910,7 +906,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/generic/icon.cpp
    src/generic/paletteg.cpp
    src/gtk/app.cpp
-    src/gtk/assertdlg_gtk.c
    src/gtk/bitmap.cpp
    src/gtk/brush.cpp
    src/gtk/clipbrd.cpp
@@ -945,7 +940,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/generic/icon.h
    wx/generic/paletteg.h
    wx/gtk/app.h
-    wx/gtk/assertdlg_gtk.h
    wx/gtk/bitmap.h
    wx/gtk/brush.h
    wx/gtk/clipbrd.h
@@ -1399,7 +1393,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 +1409,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
@@ -1753,7 +1747,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->

 <set var="MGL_LOWLEVEL_SRC" hints="files">
-    src/common/fontmgrcmn.cpp
    src/generic/caret.cpp
    src/generic/colour.cpp
    src/generic/icon.cpp
@@ -1774,7 +1767,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/mgl/evtloop.cpp
    src/mgl/font.cpp
    src/mgl/fontenum.cpp
-    src/mgl/fontmgr.cpp
    src/mgl/fontutil.cpp
    src/mgl/palette.cpp
    src/mgl/pen.cpp
@@ -1802,6 +1794,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/mgl/dcmemory.h
    wx/mgl/dcscreen.h
    wx/mgl/font.h
+    wx/mgl/fontutil.h
    wx/mgl/palette.h
    wx/mgl/pen.h
    wx/mgl/popupwin.h
@@ -1817,8 +1810,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
@@ -1837,7 +1828,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/dfb/evtloop.cpp
    src/dfb/font.cpp
    src/dfb/fontenum.cpp
-    src/dfb/fontmgr.cpp
    src/dfb/overlay.cpp
    src/dfb/pen.cpp
    src/dfb/region.cpp
@@ -2140,7 +2130,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 +2222,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 +2298,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 +2305,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 +3153,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
--- a/build/bakefiles/formats/wx24dsp.bkl
+++ b/build/bakefiles/formats/wx24dsp.bkl
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<!-- $Id$ -->
+
+<makefile>
+
+    <include file="win32.bkl"/>
+    <set var="COMPILER">vc</set>
+    <include file="presets/fake.bkl"/>
+
+    <set var="ALL_SOURCES" eval="0">
+        $(MONOLIB_SRC) src/common/dummy.cpp $(OPENGL_SRC)
+    </set>
+    
+    <output file="$(OUTPUT_FILE)" writer="wx24dsp.empy"/>
+    <set var="FORMAT_OUTPUT_VARIABLES">
+        ALL_SOURCES ALL_HEADERS
+    </set>
+    
+</makefile>
--- a/build/bakefiles/formats/wx24dsp.empy
+++ b/build/bakefiles/formats/wx24dsp.empy
@@ -0,0 +1,461 @@
+@{
+
+used = {}
+def mkgroup(lst, name, mask):
+    x = [s for s in lst if s.startswith(mask)]
+    for s in x:
+        used[s] = 1
+    x.sort()
+    return (name,x)
+    
+sources = ALL_SOURCES.split()
+SOURCES = []
+SOURCES.append(mkgroup(sources,'Common Files','src/common/'))
+SOURCES.append(mkgroup(sources,'Generic Files','src/generic/'))
+SOURCES.append(mkgroup(sources,'wxHTML Files','src/html/'))
+SOURCES.append(mkgroup(sources,'MSW Files','src/msw/'))
+otherSrcs = [x for x in sources if x not in used]
+otherSrcs.sort()
+SOURCES.append(('Other Sources', otherSrcs))
+
+headers = [x for x in ALL_HEADERS.split() if x.endswith('.h')]
+HEADERS = []
+HEADERS.append(mkgroup(headers,'MSW','wx/msw/'))
+HEADERS.append(mkgroup(headers,'Generic','wx/generic/'))
+HEADERS.append(mkgroup(headers,'HTML','wx/html/'))
+commonHdrs = [x for x in headers if x not in used]
+commonHdrs.sort()
+HEADERS.insert(0, ('Common', commonHdrs))
+
+}@
+# Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=wxWindows - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "wxWindows.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "wxWindows.mak" CFG="wxWindows - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "wxWindows - Win32 Release Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWindows - Win32 Debug Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWindows - Win32 Release Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWindows - Win32 Debug Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWindows - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWindows - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWindows - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWindows - Win32 Release With Debug Info" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF  "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../ReleaseUnicodeDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../ReleaseUnicodeDll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../DebugUnicodeDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../DebugUnicodeDll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250ud.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.dll"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../ReleaseUnicode"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../ReleaseUnicode"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxmswu.lib"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../DebugUnicode"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../DebugUnicode"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxmswud.lib"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../ReleaseDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../ReleaseDll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250.dll"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../DebugDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../DebugDll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250d.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250d.dll"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../Release"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../Debug"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxmswd.lib"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release With Debug Info"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "wxWindows___Win32_Release_With_Debug_Info"
+# PROP BASE Intermediate_Dir "wxWindows___Win32_Release_With_Debug_Info"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ReleaseDebug"
+# PROP Intermediate_Dir "ReleaseDebug"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\lib\wxmsw.lib"
+# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "wxWindows - Win32 Release Unicode DLL"
+# Name "wxWindows - Win32 Debug Unicode DLL"
+# Name "wxWindows - Win32 Release Unicode"
+# Name "wxWindows - Win32 Debug Unicode"
+# Name "wxWindows - Win32 Release DLL"
+# Name "wxWindows - Win32 Debug DLL"
+# Name "wxWindows - Win32 Release"
+# Name "wxWindows - Win32 Debug"
+# Name "wxWindows - Win32 Release With Debug Info"
+# Begin Source File
+
+SOURCE="This project is deprecated, please see install.txt"
+# End Source File
+@[for group in SOURCES]@
+# Begin Group "@group[0]"
+
+# PROP Default_Filter ""
+@[for src in group[1]]@
+# Begin Source File
+
+SOURCE=.\@src[4:].replace('/','\\')
+@[if src=='src/common/dummy.cpp']@
+# ADD CPP /Yc"wx/wxprec.h"
+@[end if]@
+@[if src.endswith('.c')]@
+# SUBTRACT CPP /YX /Yc /Yu
+@[end if]@
+# End Source File
+@[end for]@
+# End Group
+@[end for]@
+# Begin Group "Headers"
+
+# PROP Default_Filter ""
+# Begin Group "Setup"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\wx\msw\setup.h
+
+!IF  "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdllu\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswdllu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswdllu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdllud\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswdllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswdllud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
+
+# Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode"
+
+# Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdll\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswdll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswdll\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdlld\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswdlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswdlld\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
+
+# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"
+
+# Begin Custom Build - Creating ..\lib\mswd\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release With Debug Info"
+
+# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+@[for group in HEADERS]@
+# Begin Group "@group[0]"
+
+# PROP Default_Filter ""
+@[for hdr in group[1]]@
+# Begin Source File
+
+SOURCE=..\include\@hdr.replace('/','\\')
+# End Source File
+@[end for]@
+# End Group
+@[end for]@
+# End Group
+# End Target
+# End Project
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -24,7 +24,7 @@
    <!-- ...and when there are multiple libraries: -->
    <include file="multilib.bkl"/>

-    <if cond="FORMAT in ['msvc6prj','msevc4prj','msvs2005prj']">
+    <if cond="FORMAT in ['msvc6prj','msevc4prj']">
        <set var="MSVC6PRJ_MERGED_TARGETS">
            <if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
            <if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>
@@ -97,7 +97,7 @@
                $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
                $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
                $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
-                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(DESTDIR)$(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
            </command>
        </action>

--- a/build/msw/makefile.bcc
+++ b/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) $**
--- a/build/msw/makefile.gcc
+++ b/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) $<
--- a/build/msw/makefile.vc
+++ b/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) $**
--- a/build/msw/makefile.wat
+++ b/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) $<
--- a/build/msw/wx_core.dsp
+++ b/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
--- a/build/msw/wx_richtext.dsp
+++ b/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
--- a/build/os2/makefile.wat
+++ b/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) $<
--- a/build/script/rebuild-makefiles.sh
+++ b/build/script/rebuild-makefiles.sh
@@ -2,24 +2,23 @@

 CURDATE=`date -I`
 WORKDIR=/home/bake/bkl-cronjob
-WINSRCDIR=/mnt/daily
 FTPDIR=/home/ftp/pub
 LD_LIBRARY_PATH=/usr/local/lib

 update_from_cvs()
 {
    (
-    cd ${WORKDIR}/wxWidgets 
-    cvs -z3 update -P -d
-    find . -name \.#\* | xargs rm -rf
+    cd ${WORKDIR}/wxWidgets &&  cvs -z3 update -P -d
+    )
+    (
+    cd ${WORKDIR}/wxGTK &&  cvs -z3 update -P 
    )
-
 }


 regenerate_makefiles()
 {
-    (cd ${WORKDIR}/wxWidgets/build/bakefiles && nice python -O /usr/local/bin/bakefile_gen)
+    (cd ${WORKDIR}/wxWidgets/build/bakefiles && nice python -O ${WORKDIR}/bakefile/bin/bakefile_gen)
 }


@@ -47,33 +46,48 @@ do_package()
    cd ..
 }

-
+package_cvs()
+{
+    rm -f ${WORKDIR}/archives/wx-cvs-$1*
+    cd ${WORKDIR}/
+    ##tar --exclude=*.ds* -jcf ./archives/test.tar.bz2 ./wxGTK
+    tar --exclude=*.ds* -jcf ./archives/wx-cvs-$1-${CURDATE}.tar.bz2 ./$2
+}


 package_makefiles()
 {
    do_package tar autoconf  Makefile.in autoconf_inc.m4
-    do_package zip gnu       makefile.unx 
-    do_package tar gnu       makefile.unx 
+    do_package zip borland   makefile.bcc config.bcc
    do_package zip mingw     makefile.gcc config.gcc
    do_package zip dmars     makefile.dmc config.dmc makefile.dms config.dms
-    do_package zip watcom_msw    makefile.wat config.wat
+    do_package zip watcom    makefile.wat config.wat
    do_package zip msvc      makefile.vc config.vc
    do_package zip msvc6prj  '*.dsp' '*.dsw'
    do_package zip evcprj    '*.vcp' '*.vcw'
-  (cd ${WORKDIR}/wxWidgets/build/bakefiles && nice python -O /usr/local/bin/bakefile_gen -f watcom -d ../os2/Bakefiles.os2.bkgen)
-  do_package zip watcom_os2    makefile.wat config.wat
 }

 copy_files ()
 {
 ##delete old files and then copy new ones, add a symlink
+## CVS
+find ${FTPDIR}/CVS_HEAD/files -type f -name wx-cvs\* -mtime +6 | xargs rm -rf
+cp  ${WORKDIR}/archives/wx-cvs-* ${FTPDIR}/CVS_HEAD/files
+
+rm ${FTPDIR}/CVS_HEAD/wx* ${FTPDIR}/CVS_HEAD/MD5SUM
+for f in `find ${FTPDIR}/CVS_HEAD/files -type f -name wx-cvs\* -mmin -601` ; do
+       ln -s $f `echo $f | sed -e "s/-${CURDATE}//" | sed -e "s|/files||" `
+done
+md5sum ${FTPDIR}/CVS_HEAD/wx* > ${FTPDIR}/CVS_HEAD/MD5SUM
+## make sure updated at is really last
+sleep 10
+echo cvs checkout done at  `date -u` > ${FTPDIR}/CVS_HEAD/updated_at.txt

 ## Makefiles
 find ${FTPDIR}/CVS_Makefiles/files -type f -name wx-mk\* -mtime +3 | xargs rm -rf
 cp  ${WORKDIR}/archives/wx-mk-* ${FTPDIR}/CVS_Makefiles/files

-rm -f ${FTPDIR}/CVS_Makefiles/wx* ${FTPDIR}/CVS_Makefiles/MD5SUM
+rm ${FTPDIR}/CVS_Makefiles/wx* ${FTPDIR}/CVS_Makefiles/MD5SUM
 ##there must be an easier way of doing these links...
 for f in `find ${FTPDIR}/CVS_Makefiles/files -type f -name wx-mk\* -mmin -601` ; do
       ln -s $f `echo $f | sed -e "s/-${CURDATE}//" | sed -e "s|/files||" `
@@ -82,28 +96,14 @@ md5sum ${FTPDIR}/CVS_Makefiles/wx* > ${FTPDIR}/CVS_Makefiles/MD5SUM
 sleep 10
 echo CVS Makefiles generated from bakefiles last updated at `date -u` > ${FTPDIR}/CVS_Makefiles/updated_at.txt

-## Setup.exe
-find ${FTPDIR}/CVS_HEAD/v1/files -type f -name wx\* -mtime +3 | xargs rm -rf
-cp  ${WORKDIR}/archives/win/*.exe ${FTPDIR}/CVS_HEAD/v1/files
-
-rm -f ${FTPDIR}/CVS_HEAD/v1/*.exe ${FTPDIR}/CVS_HEAD/v1/MD5SUM
-##there must be an easier way of doing these links...
-for f in `find ${FTPDIR}/CVS_HEAD/v1/files -type f -name wx\*.exe -mmin -601` ; do
-       ln -s $f `echo $f | sed -e "s/-${CURDATE}//" | sed -e "s|/files||" `
-done
-md5sum ${FTPDIR}/CVS_HEAD/v1/wx* > ${FTPDIR}/CVS_HEAD/v1/MD5SUM
-sleep 10
-echo CVS HEAD  last updated at `date -u` > ${FTPDIR}/CVS_HEAD/v1/updated_at.txt
-

 ## Docs...
-find ${FTPDIR}/CVS_Docs/files -type f -name wx\* -mtime +3 | xargs rm -rf
-cp  ${WORKDIR}/archives/wx-doc* ${FTPDIR}/CVS_Docs/files
-cp  ${WORKDIR}/archives/win/wxW* ${FTPDIR}/CVS_Docs/files
+find ${FTPDIR}/CVS_Docs/files -type f -name wxWidgets-Do\* -mtime +3 | xargs rm -rf
+cp  ${WORKDIR}/archives/wxWidgets-Docs-* ${FTPDIR}/CVS_Docs/files

-rm -f ${FTPDIR}/CVS_Docs/wx* ${FTPDIR}/CVS_Docs/MD5SUM
+rm ${FTPDIR}/CVS_Docs/wx* ${FTPDIR}/CVS_Docs/MD5SUM
 ##there must be an easier way of doing these links...
-for f in `find ${FTPDIR}/CVS_Docs/files -type f -name wx\* -mmin -601` ; do
+for f in `find ${FTPDIR}/CVS_Docs/files -type f -name wxWidgets-Do\* -mmin -601` ; do
       ln -s $f `echo $f | sed -e "s/-${CURDATE}//" | sed -e "s|/files||" `
 done
 md5sum ${FTPDIR}/CVS_Docs/wx* > ${FTPDIR}/CVS_Docs/MD5SUM
@@ -115,12 +115,7 @@ do_texrtf ()
 {

 ##parameters : subdir_of_tex index.tex  dir_under_wxWidgets
-# need this first time only
-if [ ! -e ${WORKDIR}/archives/html/$1 ] ; then
-  mkdir ${WORKDIR}/archives/html/$1
-fi  
-
-rm -f ${WORKDIR}/archives/html/$1/*
+rm ${WORKDIR}/archives/html/$1/*
 /usr/local/bin/tex2rtf ${WORKDIR}/wxWidgets/$3/docs/latex/$1/$2  ${WORKDIR}/archives/html/$1/$1 -twice -html -macros ${WORKDIR}/wxWidgets/docs/latex/wx/tex2rtf_css.ini
 cp ${WORKDIR}/wxWidgets/$3/docs/latex/$1/*.gif ${WORKDIR}/archives/html/$1
 cp ${WORKDIR}/wxWidgets/$3/docs/latex/$1/*.css ${WORKDIR}/archives/html/$1
@@ -133,12 +128,7 @@ zip -q -9 ${WORKDIR}/archives/htb/$1.htb  *.gif
 do_util_texrtf ()
 {
 ##parameters : subdir_of_tex index.tex 
-# need this first time only
-if [ ! -e ${WORKDIR}/archives/html/$1 ] ; then
-  mkdir ${WORKDIR}/archives/html/$1
-fi
-  
-rm -f ${WORKDIR}/archives/html/$1/*
+rm ${WORKDIR}/archives/html/$1/*
 /usr/local/bin/tex2rtf ${WORKDIR}/wxWidgets/utils/$1/docs/$2  ${WORKDIR}/archives/html/$1/$1 -twice -html -macros ${WORKDIR}/wxWidgets/docs/latex/wx/tex2rtf_css.ini
 cp ${WORKDIR}/wxWidgets/utils/$1/docs/*.gif ${WORKDIR}/archives/html/$1
 cp ${WORKDIR}/wxWidgets/utils/$1/docs/*.css ${WORKDIR}/archives/html/$1
@@ -150,8 +140,7 @@ zip -q -9 ${WORKDIR}/archives/htb/$1.htb  *.gif
 do_docs ()
 {
 ##remove files, then regenerate
-rm ${WORKDIR}/archives/wx-do*
-rm ${WORKDIR}/archives/win/wx*
+rm ${WORKDIR}/archives/wxWidgets-Docs*
 rm ${WORKDIR}/archives/htb/*.*

 ######### dir index.tex rootdir
@@ -165,10 +154,13 @@ do_texrtf fl fl.tex contrib
 do_util_texrtf tex2rtf tex2rtf.tex 

 cd ${WORKDIR}/archives/
-tar zcvf ${WORKDIR}/archives/wx-docs-html-${CURDATE}.tar.gz `find . -name '*.gif' -print -o -name '*.html' -print` html/wx/*.css
+tar zcvf ${WORKDIR}/archives/wxWidgets-Docs-HTML-${CURDATE}.tar.gz  html/wx/*.html html/wx/*.gif html/wx/*.css
+# TODO: include the extra HTML docs into the above archive.
+# TODO: we need to add the version number to the doc archives
+# tar zcvf ${WORKDIR}/archives/wxWidgets-Docs-Extra-HTML-${CURDATE}.tar.gz `find . -name 'wx' -prune -o -name '*.html' -print`

-tar zcvf ${WORKDIR}/archives/wx-docs-htb-${CURDATE}.tar.gz  htb/*
-zip -q -9 ${WORKDIR}/archives/wx-docs-htb-${CURDATE}.zip htb/*
+tar zcvf ${WORKDIR}/archives/wxWidgets-Docs-HTB-${CURDATE}.tar.gz  htb/*.htb
+# tar zcvf ${WORKDIR}/archives/wxWidgets-Docs-Extra-HTB-${CURDATE}.tar.gz --exclude wx.htb htb/*.htb

 ##remove .con files
 rm ${WORKDIR}/*.con
@@ -178,14 +170,14 @@ rm ${WORKDIR}/*.con

 add_win_files ()
 {
-### starts with wx***.zip
-
-for f in `find ${WINSRCDIR}/ -name wx\*.zip ` ; do       
-       cp $f ${WORKDIR}/archives/win/`basename $f | sed -e "s/.zip//"`-${CURDATE}.zip
+### starts with wxWidgets-Docs-xxx.zip
+for f in `find ${WORKDIR}/archives/win/ -name wx\*.zip ` ; do       
+       mv $f ${WORKDIR}/archives/`basename $f | tr -d ".zip"`-${CURDATE}.zip
       done

-for f in `find ${WINSRCDIR}/ -name wx\*.exe ` ; do       
-       cp $f ${WORKDIR}/archives/win/`basename $f | sed -e "s/.exe//"`-${CURDATE}.exe
+rm ${WORKDIR}/archives/*.exe
+for f in `find ${WORKDIR}/archives/win/ -name wx\*.exe ` ; do       
+       mv $f ${WORKDIR}/archives/`basename $f | tr -d ".exe"`-${CURDATE}.exe
       done

 }
@@ -193,6 +185,8 @@ for f in `find ${WINSRCDIR}/ -name wx\*.exe ` ; do
 update_from_cvs
 regenerate_makefiles
 package_makefiles
+package_cvs All wxWidgets
+package_cvs Gtk wxGTK

 do_docs
 add_win_files
--- a/build/script/win_docs.bat
+++ b/build/script/win_docs.bat
@@ -1,16 +1,14 @@
 rem Uncomment the next line to set the version; used also in wxWidgets.iss
-SET WXW_VER=2.8.1
-if (%WXW_VER%)==() SET WXW_VER=CVS
-
-echo docs building for %WXW_VER%
+SET WXW_VER=2.8.0
+if %WXW_VER%=="" SET WXW_VER=CVS

 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:\

-echo Building wxWidgets-%WXW_VER% docs... > c:\temp.log
+echo Building wxWidgets docs... > c:\temp.log

 set WXWIN=c:\wx\wxWidgets
 set DAILY=c:\daily
@@ -18,30 +16,19 @@ 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...
-rem just build the formats not in the CVS to keep down the .#makefile...
 set PATH=%PATH%;C:\wx\Bakefile\src
 cd \wx\inno\wxWidgets\build\bakefiles
 del .bakefile_gen.state
-bakefile_gen -f dmars,dmars,msevc4prj,dmars_smake >> c:\temp.log
+bakefile_gen 


 rem add nmake to the path and build the docs
@@ -77,16 +64,17 @@ call ps2pdf tex2rtf.ps >> c:\temp.log

 echo Zipping
 cd %WXWIN%
-del %DAILY%\*.zip
-zip %DAILY%\wxWidgets-%WXW_VER%-CHM.zip docs\htmlhelp\wx.chm utils/tex2rtf/docs/*.chm docs/htmlhelp/*.chm
-zip %DAILY%\wxWidgets-%WXW_VER%-HLP.zip docs\winhelp\wx.hlp docs\winhelp\wx.cnt utils/tex2rtf/docs/*.HLP utils/tex2rtf/docs/*.cnt docs/winhelp/*.hlp docs/winhelp/*.cnt
+del %DAILY%\*.ZIP
+rem these need to be .ZIP so they will get date on Unix (rebuild_makefiles.sh)
+zip %DAILY%\wxWidgets-%WXW_VER%-CHM.ZIP docs\htmlhelp\wx.chm utils/tex2rtf/docs/*.chm docs/htmlhelp/*.chm
+zip %DAILY%\wxWidgets-%WXW_VER%-HLP.ZIP docs\winhelp\wx.hlp docs\winhelp\wx.cnt utils/tex2rtf/docs/*.HLP utils/tex2rtf/docs/*.cnt docs/winhelp/*.hlp docs/winhelp/*.cnt

 cd %DAILY%\
 mkdir docs
 mkdir docs\pdf
 del docs\pdf\*.pdf
 move in\*.pdf docs\pdf
-zip wxWidgets-%WXW_VER%-PDF.zip docs\pdf\*.pdf
+zip wxWidgets-%WXW_VER%-PDF.ZIP docs\pdf\*.pdf

 rem copy chm to inno
 cd %WXWIN%
@@ -95,14 +83,14 @@ copy docs\htmlhelp\wx.chm \wx\inno\wxWidgets\docs\htmlhelp\wx.chm
 cd %WXWIN%\build\script
 iscc wxwidgets.iss >> c:\temp.log

-rem echo setting S
-rem echo yes > net use s: /delete
-rem net use s: \\biolpc22\bake 
-rem net use >> c:\temp.log
+echo setting S
+echo yes > net use s: /delete
+net use s: \\biolpc22\bake 
+net use >> c:\temp.log

-rem copy %DAILY%\*.ZIP s:\bkl-cronjob\archives\win
-rem copy %DAILY%\*.exe s:\bkl-cronjob\archives\win\*.exe
-rem dir s: /od >> c:\temp.log
+copy %DAILY%\*.ZIP s:\bkl-cronjob\archives\win
+copy %DAILY%\*.exe s:\bkl-cronjob\archives\win\*.EXE
+dir s: /od >> c:\temp.log

 echo docs built for %WXW_VER%
 echo docs built for %WXW_VER% >> c:\temp.log
--- a/build/script/wxwidgets.iss
+++ b/build/script/wxwidgets.iss
@@ -22,7 +22,6 @@ AppSupportURL=http://www.wxwidgets.org
 AppUpdatesURL=http://www.wxwidgets.org
 DefaultDirName={sd}\wxWidgets-{#WX_VERSION}
 DefaultGroupName=wxWidgets {#WX_VERSION}
-UsePreviousAppDir=no
 DisableProgramGroupPage=yes
 LicenseFile=C:\wx\inno\wxWidgets\docs\licence.txt
 InfoBeforeFile=C:\wx\inno\wxWidgets\docs\readme.txt
--- a/build/wince/missing/widec.h
+++ b/build/wince/missing/widec.h
@@ -1 +0,0 @@
-
--- a/1051
+++ b/1051
--- a/configure.in
+++ b/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,8 +34,8 @@ dnl wx_release_number += 1

 wx_major_version_number=2
 wx_minor_version_number=8
-wx_release_number=1
-wx_subrelease_number=1
+wx_release_number=0
+wx_subrelease_number=0

 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
@@ -378,7 +378,6 @@ if test $DEBUG_CONFIGURE = 1; then
  DEFAULT_wxUSE_OPTIMISE=no
  DEFAULT_wxUSE_PROFILE=no
  DEFAULT_wxUSE_NO_DEPS=no
-  DEFAULT_wxUSE_VARARG_MACROS=no
  DEFAULT_wxUSE_NO_RTTI=no
  DEFAULT_wxUSE_NO_EXCEPTIONS=no
  DEFAULT_wxUSE_UNIVERSAL_BINARY=no
@@ -552,7 +551,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
@@ -603,7 +601,6 @@ else
  DEFAULT_wxUSE_OPTIMISE=yes
  DEFAULT_wxUSE_PROFILE=no
  DEFAULT_wxUSE_NO_DEPS=no
-  DEFAULT_wxUSE_VARARG_MACROS=yes
  DEFAULT_wxUSE_NO_RTTI=no
  DEFAULT_wxUSE_NO_EXCEPTIONS=no
  DEFAULT_wxUSE_UNIVERSAL_BINARY=no
@@ -635,7 +632,7 @@ else
  DEFAULT_wxUSE_LIBXPM=yes
  DEFAULT_wxUSE_LIBMSPACK=yes
  DEFAULT_wxUSE_LIBSDL=no
-  DEFAULT_wxUSE_LIBGNOMEPRINT=yes
+  DEFAULT_wxUSE_LIBGNOMEPRINT=no
  DEFAULT_wxUSE_LIBGNOMEVFS=no
  DEFAULT_wxUSE_LIBHILDON=no
  DEFAULT_wxUSE_ODBC=no
@@ -776,7 +773,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
@@ -934,7 +930,6 @@ WX_ARG_ENABLE(no_rtti,       [  --enable-no_rtti        create code without RTTI
 WX_ARG_ENABLE(no_exceptions, [  --enable-no_exceptions  create code without C++ exceptions handling], wxUSE_NO_EXCEPTIONS)
 WX_ARG_ENABLE(permissive,    [  --enable-permissive     compile code disregarding strict ANSI], wxUSE_PERMISSIVE)
 WX_ARG_ENABLE(no_deps,       [  --enable-no_deps        create code without dependency information], wxUSE_NO_DEPS)
-WX_ARG_ENABLE(vararg_macros, [  --disable-vararg_macros don't use vararg macros, even if they are supported], wxUSE_VARARG_MACROS)
 WX_ARG_ENABLE_PARAM(universal_binary, [[  --enable-universal_binary[=SDK] create Mac PowerPC and Intel Universal binary (not yet working)]], wxUSE_UNIVERSAL_BINARY)

 WX_ARG_ENABLE(compat24,      [  --enable-compat24       enable wxWidgets 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, enable)
@@ -1109,7 +1104,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 +1156,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
@@ -1206,7 +1199,7 @@ WX_ARG_ENABLE(filepicker,  [  --enable-filepicker     use wxFilePickerCtrl class
 WX_ARG_ENABLE(fontpicker,  [  --enable-fontpicker     use wxFontPickerCtrl class], wxUSE_FONTPICKERCTRL)
 WX_ARG_ENABLE(gauge,       [  --enable-gauge          use wxGauge class], wxUSE_GAUGE)
 WX_ARG_ENABLE(grid,        [  --enable-grid           use wxGrid class], wxUSE_GRID)
-WX_ARG_ENABLE(dataviewctrl,[  --enable-dataviewctrl   use wxDataViewCtrl class], wxUSE_DATAVIEWCTRL)
+WX_ARG_ENABLE(dataviewctrl,[  --enable-dataviewctrl,  use wxDataViewCtrl class], wxUSE_DATAVIEWCTRL)
 WX_ARG_ENABLE(hyperlink,   [  --enable-hyperlink      use wxHyperlinkCtrl class], wxUSE_HYPERLINKCTRL)
 WX_ARG_ENABLE(imaglist,    [  --enable-imaglist       use wxImageList class], wxUSE_IMAGLIST)
 WX_ARG_ENABLE(listbook,    [  --enable-listbook       use wxListbook class], wxUSE_LISTBOOK)
@@ -1218,7 +1211,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)
@@ -1331,8 +1323,6 @@ if test "$wxUSE_WINE" = "yes"; then
    DEFAULT_DEFAULT_wxUSE_MOTIF=0
    DEFAULT_DEFAULT_wxUSE_MSW=1
    wxUSE_SHARED=no
-    CC=${CC:-winegcc}
-    CXX=${CXX:-wineg++}
 fi


@@ -1470,13 +1460,9 @@ AC_PROG_RANLIB

 dnl ar command
 dnl   defines AR with the appropriate command
-dnl 
-dnl For Sun CC AC_BAKEFILE below sets AR to the compiler itself.
-if test "x$SUNCXX" != xyes; then
-    AC_CHECK_TOOL(AR, ar)
-    if test "x$AR" = "x" ; then
-        AC_MSG_ERROR([ar is needed to build wxWidgets])
-    fi
+AC_CHECK_TOOL(AR, ar)
+if test "x$AR" = "x" ; then
+    AC_MSG_ERROR([ar is needed to build wxWidgets])
 fi

 dnl install checks
@@ -1533,7 +1519,7 @@ dnl does make support "-include" (only GNU make does AFAIK)?
 AC_CACHE_CHECK([if make is GNU make], wx_cv_prog_makeisgnu,
 [
    if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
-            $EGREP -s GNU > /dev/null); then
+            egrep -s GNU > /dev/null); then
        wx_cv_prog_makeisgnu="yes"
    else
        wx_cv_prog_makeisgnu="no"
@@ -1684,6 +1670,9 @@ esac

 if test "$wxUSE_WINE" = "yes"; then
    wants_win32=1
+    dnl FIXME: we should do a better job of testing for these
+    CC=winegcc
+    CXX=wineg++
    LDFLAGS_GUI="-mwindows"
 fi

@@ -1980,11 +1969,6 @@ else
    fi
 fi

-dnl don't check for vararg macros if they're explicitly disabled: this is
-dnl useful if the user code using the library wants to limit itself to standard
-dnl C++ only (e.g. is compiled with g++ -std=c++98)
-if test "$wxUSE_VARARG_MACROS" = "yes"; then
-
 dnl Check if variadic macros (C99 feature) are supported:
 AC_CACHE_CHECK(
    [whether the compiler supports variadic macros],
@@ -2014,8 +1998,6 @@ if test $wx_cv_have_variadic_macros = "yes"; then
    AC_DEFINE(HAVE_VARIADIC_MACROS)
 fi

-fi dnl wxUSE_VARARG_MACROS == yes
-
 dnl check for large file support
 AC_SYS_LARGEFILE

@@ -2545,16 +2527,11 @@ fi

 dnl check for C99 string to long long conversion functions, assume that if we
 dnl have the unsigned variants, then we have the signed ones as well
-dnl
-dnl at least under SGI these functions are only available in C99 code and not
-dnl in C++ so do these tests using C++ compiler
-AC_LANG_PUSH(C++)
 if test "wxUSE_UNICODE" = "yes"; then
    WX_CHECK_FUNCS(wcstoull)
 else
    WX_CHECK_FUNCS(strtoull)
 fi
-AC_LANG_POP()

 dnl ---------------------------------------------------------------------------
 dnl Optional libraries
@@ -2802,30 +2779,6 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
            else
                dnl we are using the system library
                wxUSE_LIBJPEG=sys
-
-                if test "$wxUSE_MSW" = 1; then
-                    dnl boolean is defined by the jpeg headers and also by the
-                    dnl Windows headers of some compilers. This type has been
-                    dnl renamed in the builtin, so it is only an issue when
-                    dnl using an external jpeg lib on Windows.
-                    AC_CHECK_TYPES(
-                        [boolean],
-                        [
-                            AC_CHECK_SIZEOF(
-                                [boolean],
-                                [],
-                                [
-                                    #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
-                                    #include <jpeglib.h>
-                                ])
-                            AC_DEFINE_UNQUOTED(
-                                [wxHACK_BOOLEAN],
-                                [wxInt`expr 8 \* $ac_cv_sizeof_boolean`])
-                        ],
-                        [],
-                        [#include <windows.h>])
-                fi
            fi
        fi
    fi
@@ -3006,6 +2959,12 @@ if test "$USE_WIN32" = 1 ; then
    dnl install Win32-specific files in "make install"
    WIN32INSTALL=win32install

+    dnl the jpeg header jmorecfg.h delcares the type boolean, which conflicts
+    dnl on systems which declare it in the system headers. If HAVE_BOOLEAN is
+    dnl defined then jmorecfg.h doesn't declare it, so checking for it here
+    dnl solves the problem.
+    AC_CHECK_TYPES(boolean, [], [], [#include <windows.h>])
+
    dnl pbt.h is missing on Wine at least
    AC_CHECK_HEADERS(pbt.h, [], [AC_DEFINE(NEED_PBT_H)])
 fi
@@ -3209,12 +3168,12 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config

            dnl test for XIM support in libgdk
            AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_XIM))
+        fi

-            dnl we need poll() in src/gtk1/app.cpp (we know that Darwin doesn't
-            dnl have it but we do the check for the others)
-            if test "$USE_DARWIN" != 1; then
-                AC_CHECK_FUNCS(poll)
-            fi
+        dnl we need poll() in src/gtk/app.cpp (we know that Darwin doesn't
+        dnl have it but we do the check for the others)
+        if test "$USE_DARWIN" != 1; then
+            AC_CHECK_FUNCS(poll)
        fi

        TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
@@ -3323,7 +3282,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
       PKG_PROG_PKG_CONFIG()

       PKG_CHECK_MODULES(DIRECTFB,
-                         [directfb >= 0.9.23],
+                         [directfb >= 0.9.22],
                         [
                           wxUSE_UNIVERSAL="yes"
                           TOOLKIT_INCLUDE="$DIRECTFB_CFLAGS"
@@ -4562,7 +4521,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);
@@ -5710,40 +5669,37 @@ fi
 dnl Unix implementation needs additional checks because audio support
 dnl comes in many favours:
 if test "$USE_UNIX" = "1" ; then
-    dnl mmedia doesn't compile with wxMGL, remove this if this is ever fixed
-    if test "$wxUSE_MGL" != 1; then
-        dnl it's not enough to check for just the header because OSS under NetBSD
-        dnl redefines ioctl as oss_ioctrl inside it and so we also need to test
-        dnl whether we need -lossaudio at link-time
-        AC_CACHE_CHECK([for SNDCTL_DSP_SPEED in sys/soundcard.h], ac_cv_header_sys_soundcard, [
-            AC_TRY_LINK([
-                    #include <sys/ioctl.h>
-                    #include <sys/soundcard.h>
-                ],
-                [
-                    ioctl(0, SNDCTL_DSP_SPEED, 0);
-                ],
-                ac_cv_header_sys_soundcard=yes,
-                [
-                    saveLibs="$LIBS"
-                    LIBS="$saveLibs -lossaudio"
-                    AC_TRY_LINK([
-                            #include <sys/ioctl.h>
-                            #include <sys/soundcard.h>
-                        ],
-                        [
-                            ioctl(0, SNDCTL_DSP_SPEED, 0);
-                        ],
-                        ac_cv_header_sys_soundcard=yes,
-                        [
-                            LIBS="$saveLibs"
-                            ac_cv_header_sys_soundcard=no
-                        ]
-                    )
-                ]
-            )
-        ])
-    fi
+    dnl it's not enough to check for just the header because OSS under NetBSD
+    dnl redefines ioctl as oss_ioctrl inside it and so we also need to test
+    dnl whether we need -lossaudio at link-time
+    AC_CACHE_CHECK([for SNDCTL_DSP_SPEED in sys/soundcard.h], ac_cv_header_sys_soundcard, [
+        AC_TRY_LINK([
+                #include <sys/ioctl.h>
+                #include <sys/soundcard.h>
+            ],
+            [
+                ioctl(0, SNDCTL_DSP_SPEED, 0);
+            ],
+            ac_cv_header_sys_soundcard=yes,
+            [
+                saveLibs="$LIBS"
+                LIBS="$saveLibs -lossaudio"
+                AC_TRY_LINK([
+                        #include <sys/ioctl.h>
+                        #include <sys/soundcard.h>
+                    ],
+                    [
+                        ioctl(0, SNDCTL_DSP_SPEED, 0);
+                    ],
+                    ac_cv_header_sys_soundcard=yes,
+                    [
+                        LIBS="$saveLibs"
+                        ac_cv_header_sys_soundcard=no
+                    ]
+                )
+            ]
+        )
+    ])

    if test "$ac_cv_header_sys_soundcard" = "yes"; then
        AC_DEFINE(HAVE_SYS_SOUNDCARD_H)
@@ -5751,7 +5707,6 @@ if test "$USE_UNIX" = "1" ; then
        DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia"
    fi
 fi
-
 WITH_PLUGIN_SDL=0
 if test "$wxUSE_SOUND" = "yes"; then
  if test "$USE_UNIX" = "1" ; then
@@ -6427,13 +6382,7 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
    else
        dnl wxJoystick not supported by wxMGL at all
        if test "$wxUSE_MGL" != "1"; then
-            dnl notice the dummy includes argument: without it, AC_CHECK_HEADER
-            dnl checks only whether the header can be preprocessed, not that it
-            dnl can be compiled and in Linux 2.6.16 joystick.h is present but
-            dnl can't be compiled because of an error and with the default
-            dnl AC_CHECK_HEADER semantics we'd still detect it in this case and
-            dnl build would fail later
-            AC_CHECK_HEADER(linux/joystick.h, wxUSE_JOYSTICK=yes,,[#include <stdio.h>])
+            AC_CHECK_HEADERS(linux/joystick.h, wxUSE_JOYSTICK=yes)
        fi
    fi

@@ -6624,8 +6573,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)
@@ -6637,8 +6586,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

@@ -6655,9 +6604,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

@@ -6784,13 +6742,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
@@ -6888,11 +6841,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
@@ -7096,10 +7044,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)
@@ -7160,12 +7105,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
@@ -8082,7 +8022,7 @@ for subdir in `echo $SUBDIRS`; do
                disabled_var=DISABLED_`echo $subdir | tr [[a-z]] [[A-Z]]`;
                eval "disabled=\$$disabled_var"
                disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
-                makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"`
+                makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | egrep -v "$disabled"`
            fi
        else dnl we build wxBase only
            dnl don't take all samples/utils, just those which build with
--- a/contrib/src/deprecated/Makefile.in
+++ b/contrib/src/deprecated/Makefile.in
@@ -142,7 +142,7 @@ COND_PLATFORM_OS2_1___deprecateddll___importlib = -import \
 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_PLATFORM_OS2_1@__deprecateddll___importlib = $(COND_PLATFORM_OS2_1___deprecateddll___importlib)
 COND_WINDOWS_IMPLIB_1___deprecateddll___importlib = \
-	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__deprecateddll___importlib = $(COND_WINDOWS_IMPLIB_1___deprecateddll___importlib)
@COND_GCC_PCH_1@__deprecateddll_PCH_INC = -I.pch/wxprec_deprecateddll
@COND_ICC_PCH_1@__deprecateddll_PCH_INC = -use_pch \
--- a/contrib/src/fl/controlbar.cpp
+++ b/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 );
--- a/contrib/src/foldbar/Makefile.in
+++ b/contrib/src/foldbar/Makefile.in
@@ -116,7 +116,7 @@ COND_PLATFORM_OS2_1___foldbardll___importlib = -import \
 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_PLATFORM_OS2_1@__foldbardll___importlib = $(COND_PLATFORM_OS2_1___foldbardll___importlib)
 COND_WINDOWS_IMPLIB_1___foldbardll___importlib = \
-	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__foldbardll___importlib = $(COND_WINDOWS_IMPLIB_1___foldbardll___importlib)
@COND_GCC_PCH_1@__foldbardll_PCH_INC = -I.pch/wxprec_foldbardll
@COND_ICC_PCH_1@__foldbardll_PCH_INC = -use_pch \
--- a/contrib/src/gizmos/Makefile.in
+++ b/contrib/src/gizmos/Makefile.in
@@ -135,7 +135,7 @@ COND_PLATFORM_OS2_1___gizmosdll___importlib = -import \
 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_PLATFORM_OS2_1@__gizmosdll___importlib = $(COND_PLATFORM_OS2_1___gizmosdll___importlib)
 COND_WINDOWS_IMPLIB_1___gizmosdll___importlib = \
-	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__gizmosdll___importlib = $(COND_WINDOWS_IMPLIB_1___gizmosdll___importlib)
@COND_GCC_PCH_1@__gizmosdll_PCH_INC = -I.pch/wxprec_gizmosdll
@COND_ICC_PCH_1@__gizmosdll_PCH_INC = -use_pch \
@@ -187,7 +187,7 @@ COND_PLATFORM_OS2_1___gizmos_xrcdll___importlib = -import \
 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_PLATFORM_OS2_1@__gizmos_xrcdll___importlib = $(COND_PLATFORM_OS2_1___gizmos_xrcdll___importlib)
 COND_WINDOWS_IMPLIB_1___gizmos_xrcdll___importlib = \
-	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__gizmos_xrcdll___importlib = $(COND_WINDOWS_IMPLIB_1___gizmos_xrcdll___importlib)
@COND_GCC_PCH_1@__gizmos_xrcdll_PCH_INC = -I.pch/wxprec_gizmos_xrcdll
@COND_ICC_PCH_1@__gizmos_xrcdll_PCH_INC = -use_pch \
--- a/contrib/src/net/Makefile.in
+++ b/contrib/src/net/Makefile.in
@@ -116,7 +116,7 @@ COND_PLATFORM_OS2_1___netutilsdll___importlib = -import \
 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_PLATFORM_OS2_1@__netutilsdll___importlib = $(COND_PLATFORM_OS2_1___netutilsdll___importlib)
 COND_WINDOWS_IMPLIB_1___netutilsdll___importlib = \
-	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__netutilsdll___importlib = $(COND_WINDOWS_IMPLIB_1___netutilsdll___importlib)
@COND_GCC_PCH_1@__netutilsdll_PCH_INC = -I.pch/wxprec_netutilsdll
@COND_ICC_PCH_1@__netutilsdll_PCH_INC = -use_pch \
--- a/contrib/src/plot/Makefile.in
+++ b/contrib/src/plot/Makefile.in
@@ -112,7 +112,7 @@ COND_PLATFORM_OS2_1___plotdll___importlib = -import \
 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_PLATFORM_OS2_1@__plotdll___importlib = $(COND_PLATFORM_OS2_1___plotdll___importlib)
 COND_WINDOWS_IMPLIB_1___plotdll___importlib = \
-	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__plotdll___importlib = $(COND_WINDOWS_IMPLIB_1___plotdll___importlib)
@COND_GCC_PCH_1@__plotdll_PCH_INC = -I.pch/wxprec_plotdll
@COND_ICC_PCH_1@__plotdll_PCH_INC = -use_pch \
--- a/contrib/src/stc/Makefile.in
+++ b/contrib/src/stc/Makefile.in
@@ -278,7 +278,7 @@ COND_PLATFORM_OS2_1___stcdll___importlib = -import \
 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_PLATFORM_OS2_1@__stcdll___importlib = $(COND_PLATFORM_OS2_1___stcdll___importlib)
 COND_WINDOWS_IMPLIB_1___stcdll___importlib = \
-	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__stcdll___importlib = $(COND_WINDOWS_IMPLIB_1___stcdll___importlib)
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__stcdll___targetsuf2 \
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).0
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -791,10 +791,9 @@ public:
    wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point WXUNUSED(location)) :
        wxPopupWindow(parent, wxBORDER_NONE)
    {
-        
        SetBackgroundColour(*wxBLACK);  // for our simple border

-        lv = new wxSTCListBox(parent, id, wxPoint(-50,-50), wxDefaultSize,
+        lv = new wxSTCListBox(parent, id, wxDefaultPosition, wxDefaultSize,
                              wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxBORDER_NONE);
        lv->SetCursor(wxCursor(wxCURSOR_ARROW));
        lv->InsertColumn(0, wxEmptyString);
@@ -898,27 +897,17 @@ END_EVENT_TABLE()



-#else // !wxUSE_POPUPWIN -----------------------------------
+#else // wxUSE_POPUPWIN -----------------------------------

-// A normal window to place the wxSTCListBox upon, but make it behave as much
-// like a wxPopupWindow as possible
-class wxSTCListBoxWin : public wxFrame {
+// A normal window to place the wxSTCListBox upon.
+class wxSTCListBoxWin : public wxWindow {
 private:
    wxListView*         lv;
    CallBackAction      doubleClickAction;
    void*               doubleClickActionData;
 public:
    wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point location) :
-        wxFrame(parent, id, wxEmptyString, wxPoint(location.x, location.y), wxSize(0,0),
-                wxFRAME_NO_TASKBAR
-                | wxFRAME_FLOAT_ON_PARENT
-#ifdef __WXMAC__
-                | wxPOPUP_WINDOW 
-                | wxNO_BORDER
-#else
-                | wxSIMPLE_BORDER
-#endif
-            )
+        wxWindow(parent, id, wxPoint(location.x, location.y), wxSize(0,0), wxSIMPLE_BORDER )
    {

        lv = new wxSTCListBox(this, id, wxDefaultPosition, wxDefaultSize,
@@ -939,8 +928,7 @@ public:
    // messages/events for the list control when Scintilla wants to
    // close it, so do a pending delete of it instead of destroying
    // immediately.
-    bool Destroy()
-    {
+    bool Destroy() {
 #ifdef __WXMAC__
        // The bottom edge of this window is not getting properly
        // refreshed upon deletion, so help it out...
@@ -955,8 +943,7 @@ public:
    }


-    int IconWidth()
-    {
+    int IconWidth() {
        wxImageList* il = lv->GetImageList(wxIMAGE_LIST_SMALL);
        if (il != NULL) {
            int w, h;
@@ -967,22 +954,18 @@ public:
    }


-    void SetDoubleClickAction(CallBackAction action, void *data)
-    {
+    void SetDoubleClickAction(CallBackAction action, void *data) {
        doubleClickAction = action;
        doubleClickActionData = data;
    }


-    void OnFocus(wxFocusEvent& event)
-    {
-        ActivateParent();
+    void OnFocus(wxFocusEvent& event) {
        GetParent()->SetFocus();
        event.Skip();
    }

-    void OnSize(wxSizeEvent& event)
-    {
+    void OnSize(wxSizeEvent& event) {
        // resize the child
        wxSize sz = GetClientSize();
        lv->SetSize(sz);
@@ -993,44 +976,15 @@ public:
        event.Skip();
    }

-    void ActivateParent()
-    {
-        // Although we're a frame, we always want the parent to be active, so
-        // raise it whenever we get shown, focused, etc.
-        wxTopLevelWindow *frame = wxDynamicCast(
-            wxGetTopLevelParent(GetParent()), wxTopLevelWindow);
-        if (frame)
-            frame->Raise();
-    }
-        
-
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO)
-    {
-        // convert coords to screen coords since we're a top-level window
-        if (x != wxDefaultCoord) {
-            GetParent()->ClientToScreen(&x, NULL);
-        }
-        if (y != wxDefaultCoord) {
-            GetParent()->ClientToScreen(NULL, &y);
-        }
-        wxFrame::DoSetSize(x, y, width, height, sizeFlags);
-    }
-
-    virtual bool Show(bool show = true)
-    {
-        bool rv = wxFrame::Show(show);
-        if (rv && show)
-            ActivateParent();
 #ifdef __WXMAC__
+    virtual bool Show(bool show = true) {
+        bool rv = wxWindow::Show(show);
        GetParent()->Refresh(false);
-#endif
        return rv;
    }
+#endif

-    void OnActivate(wxListEvent& WXUNUSED(event))
-    {
+    void OnActivate(wxListEvent& WXUNUSED(event)) {
        doubleClickAction(doubleClickActionData);
    }

@@ -1239,7 +1193,7 @@ void ListBoxImpl::Select(int n) {
        n = 0;
        select = false;
    }
-    GETLB(id)->EnsureVisible(n);
+    GETLB(id)->Focus(n);
    GETLB(id)->Select(n, select);
 }

@@ -1376,6 +1330,9 @@ unsigned int Platform::DoubleClickTime() {
 bool Platform::MouseButtonBounce() {
    return false;
 }
+void Platform::DebugDisplay(const char *s) {
+    wxLogDebug(stc2wx(s));
+}

 bool Platform::IsKeyDown(int WXUNUSED(key)) {
    return false;  // I don't think we'll need this.
@@ -1416,15 +1373,7 @@ int Platform::Maximum(int a, int b) {
        return b;
 }

-//#define TRACE
-
-void Platform::DebugDisplay(const char *s) {
-#ifdef TRACE
-    wxLogDebug(stc2wx(s));
-#else
-    wxUnusedVar(s);
-#endif
-}
+#define TRACE

 void Platform::DebugPrintf(const char *format, ...) {
 #ifdef TRACE
@@ -1447,7 +1396,6 @@ bool Platform::ShowAssertionPopUps(bool assertionPopUps_) {
 }

 void Platform::Assert(const char *c, const char *file, int line) {
-#ifdef TRACE
    char buffer[2000];
    sprintf(buffer, "Assertion [%s] failed at %s %d", c, file, line);
    if (assertionPopUps) {
@@ -1455,16 +1403,18 @@ void Platform::Assert(const char *c, const char *file, int line) {
        wxMessageBox(stc2wx(buffer),
                     wxT("Assertion failure"),
                     wxICON_HAND | wxOK);
+//      if (idButton == IDRETRY) {
+//          ::DebugBreak();
+//      } else if (idButton == IDIGNORE) {
+//          // all OK
+//      } else {
+//          abort();
+//      }
    } else {
        strcat(buffer, "\r\n");
        Platform::DebugDisplay(buffer);
        abort();
    }
-#else
-    wxUnusedVar(c);
-    wxUnusedVar(file);
-    wxUnusedVar(line);
-#endif
 }


--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -87,7 +87,7 @@ void  wxSTCDropTarget::OnLeave() {
 #define wxSTCCallTipBase wxPopupWindow
 #define param2  wxBORDER_NONE  // popup's 2nd param is flags
 #else
-#define wxSTCCallTipBase wxFrame
+#define wxSTCCallTipBase wxWindow
 #define param2 -1 // wxWindow's 2nd param is ID
 #endif

@@ -95,19 +95,8 @@ void  wxSTCDropTarget::OnLeave() {

 class wxSTCCallTip : public wxSTCCallTipBase {
 public:
-    wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx) :
-#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
-        wxSTCCallTipBase(parent, wxBORDER_NONE),
-#else
-        wxSTCCallTipBase(parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize,
-                         wxFRAME_NO_TASKBAR
-                         | wxFRAME_FLOAT_ON_PARENT
-                         | wxBORDER_NONE
-#ifdef __WXMAC__
-                         | wxPOPUP_WINDOW  
-#endif
-            ), 
-#endif
+    wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx)
+        : wxSTCCallTipBase(parent, param2),
          m_ct(ct), m_swx(swx), m_cx(wxDefaultCoord), m_cy(wxDefaultCoord)
        {
        }
@@ -123,8 +112,7 @@ public:

    bool AcceptsFocus() const { return false; }

-    void OnPaint(wxPaintEvent& WXUNUSED(evt))
-    {
+    void OnPaint(wxPaintEvent& WXUNUSED(evt)) {
        wxBufferedPaintDC dc(this);
        Surface* surfaceWindow = Surface::Allocate();
        surfaceWindow->Init(&dc, m_ct->wDraw.GetID());
@@ -133,25 +121,22 @@ public:
        delete surfaceWindow;
    }

-    void OnFocus(wxFocusEvent& event)
-    {
+    void OnFocus(wxFocusEvent& event) {
        GetParent()->SetFocus();
        event.Skip();
    }

-    void OnLeftDown(wxMouseEvent& event)
-    {
+    void OnLeftDown(wxMouseEvent& event) {
        wxPoint pt = event.GetPosition();
        Point p(pt.x, pt.y);
        m_ct->MouseClick(p);
        m_swx->CallTipClick();
    }

+#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
    virtual void DoSetSize(int x, int y,
                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO)
-    {
-        // convert coords to screen coords since we're a top-level window
+                           int sizeFlags = wxSIZE_AUTO) {
        if (x != wxDefaultCoord) {
            m_cx = x;
            GetParent()->ClientToScreen(&x, NULL);
@@ -162,27 +147,9 @@ public:
        }
        wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags);
    }
-
-#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
-#else
-    virtual bool Show( bool show = true )
-    {
-        // Although we're a frame, we always want the parent to be active, so
-        // raise it whenever we get shown.
-        bool rv = wxSTCCallTipBase::Show(show);
-        if (rv && show)
-        {
-            wxTopLevelWindow *frame = wxDynamicCast(
-                wxGetTopLevelParent(GetParent()), wxTopLevelWindow);
-            if (frame)
-                frame->Raise();
-        }
-        return rv;
-    }
 #endif

-    wxPoint GetMyPosition()
-    {
+    wxPoint GetMyPosition() {
        return wxPoint(m_cx, m_cy);
    }

--- a/contrib/src/svg/Makefile.in
+++ b/contrib/src/svg/Makefile.in
@@ -112,7 +112,7 @@ COND_PLATFORM_OS2_1___svgdll___importlib = -import \
 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_PLATFORM_OS2_1@__svgdll___importlib = $(COND_PLATFORM_OS2_1___svgdll___importlib)
 COND_WINDOWS_IMPLIB_1___svgdll___importlib = \
-	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__svgdll___importlib = $(COND_WINDOWS_IMPLIB_1___svgdll___importlib)
@COND_GCC_PCH_1@__svgdll_PCH_INC = -I.pch/wxprec_svgdll
@COND_ICC_PCH_1@__svgdll_PCH_INC = -use_pch \
--- a/debian/README.HowToBuild.txt
+++ b/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
 ----------------------------
--- a/debian/build_all
+++ b/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
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,44 +1,3 @@
-wxwidgets2.8 (2.8.1.1-0) unstable; urgency=low
-
-  * 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)
-  * Don't crash if command line is not valid UTF-8 (Unicode build only)
-  * Added wxSizerFlags::Shaped() and FixedMinSize() methods
-  * Added wxCSConv::IsOk() (Manuel Martin)
-  * Added wxDateTime::GetDateOnly()
-  * Made wxTextFile work with unseekable files again (David Hart)
-  * Added wxCONFIG_USE_SUBDIR flag to wxFileConfig (Giuseppe Bilotta)
-  * Added wxSearchCtrl::[Get|Set]DescriptiveText
-
- -- Robin Dunn <robin@alldunn.com>  Fri, 19 Jan 2007 12:02:52 -0800
-
-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.
-  * Fixed wxCalendarCtrl::HitTest() when clicking on month change arrows.
-  * Added wxWindow::GetWindowBorderSize(), corrected wxTreeCtrl::GetBestSize().
-  * Allow dynamically changing most of text control styles.
-  * Enable use of libgnomeprintui by default in configure.
-
- -- Vadim Zeitlin <vadim@wxwindows.org>  Dec, 05 Tue 2006 14:41:22 +0100
-
 wxwidgets2.8 (2.8.0.0-0rc2) unstable; urgency=low

  * wxArrayString::Alloc() doesn't clear array contents any more
--- a/debian/rules
+++ b/debian/rules
@@ -112,6 +112,7 @@ BASE_CONFIGURE_OPTIONS = $(COMMON_CONFIGURE_OPTIONS) \

 GTK_CONFIGURE_OPTIONS = $(COMMON_CONFIGURE_OPTIONS) \
    --with-gtk \
+    --with-gnomeprint \
    --enable-mediactrl \
    --enable-sound \
    --with-sdl \
@@ -150,11 +151,11 @@ else
 endif

 # Packages to build:
-package_wxbase_lib      := libwxbase$(sorelease)$(unicode_suffix)
+package_wxbase_lib      := libwxbase$(release)$(unicode_suffix)
 package_wxbase_dev      := libwxbase$(release)$(unicode_suffix)-dev
 package_wxbase_dbg      := libwxbase$(release)$(unicode_suffix)-dbg

-package_gtk_lib         := libwxgtk$(sorelease)$(unicode_suffix)
+package_gtk_lib         := libwxgtk$(release)$(unicode_suffix)
 package_gtk_dev         := libwxgtk$(release)$(unicode_suffix)-dev
 package_gtk_dbg         := libwxgtk$(release)$(unicode_suffix)-dbg

@@ -469,13 +470,12 @@ build-gtk-py-stamp: build-gtk-shared-stamp purge-dbg-py

 build-doc-stamp: build-gtk-shared-stamp
 	dh_testdir
+	mkdir $(objdir_doc); 
 	# the tarball may already have the generated docs in it
 	if [ ! -e docs/html/wx/index.html ]; then \
 		cd $(objdir_gtk_shared)/utils/tex2rtf/src && $(FAST_MAKE); \
-		cd -; \
 		rm -rf $(objdir_doc); \
 		rm -rf $(objdir_doc_cruft); \
-		mkdir $(objdir_doc); \
 		mkdir $(objdir_doc_cruft); \
 		cd $(objdir_doc_cruft); \
 		LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib:$(LD_LIBRARY_PATH) \
@@ -483,12 +483,10 @@ build-doc-stamp: build-gtk-shared-stamp
 		   ../docs/latex/wx/manual.tex                                 \
 		   ../$(objdir_doc)/wx$(release)-manual.html                   \
 		   -twice -html;                                               \
-		cd -; \
 		cp docs/latex/wx/*.gif $(objdir_doc); \
 		rm -rf $(objdir_doc_cruft); \
 		rm -f $(objdir_doc)/wx$(release)-manual.{con,hh*,htx,ref}; \
 	else \
-		mkdir $(objdir_doc); \
 		cp docs/html/wx/* $(objdir_doc); \
 		mv $(objdir_doc)/index.html $(objdir_doc)/wx-$(release)-manual_contents.html; \
 	fi
--- a/debian/wx-config.1
+++ b/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
--- a/demos/forty/scorefil.cpp
+++ b/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
 }


--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -101,9 +101,9 @@ samples/image/image.dsp

 samples/internat/internat.dsp

-samples/ipc/ipc_ipcclient.dsp
+samples/ipc/ipc_client.dsp

-samples/ipc/ipc_ipcserver.dsp
+samples/ipc/ipc_server.dsp

 samples/keyboard/keyboard.dsp

--- a/distrib/msw/wince.rsp
+++ b/distrib/msw/wince.rsp
@@ -116,10 +116,10 @@ samples/internat/internat.vcw
 samples/keyboard/keyboard.vcp
 samples/keyboard/keyboard.vcw

-samples/ipc/ipc_ipcclient.vcp
-samples/ipc/ipc_ipcclient.vcw
-samples/ipc/ipc_ipcserver.vcp
-samples/ipc/ipc_ipcserver.vcw
+samples/ipc/ipc_client.vcp
+samples/ipc/ipc_client.vcw
+samples/ipc/ipc_server.vcp
+samples/ipc/ipc_server.vcw

 samples/joytest/joytest.vcp
 samples/joytest/joytest.vcw
--- a/distrib/scripts/build-environ.cfg
+++ b/distrib/scripts/build-environ.cfg
@@ -17,7 +17,7 @@ DOCDIR=${WX_TEMP_DIR}/wxWidgets/docs/
 CURDATE=`date -I`

 # build info
-BUILD_VERSION=2.8.2
+BUILD_VERSION=2.7.2-rc1
 BUILD_TAG=HEAD


--- a/distrib/scripts/create_archives.sh
+++ b/distrib/scripts/create_archives.sh
@@ -56,17 +56,13 @@ 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
    filelist="$filelist mgl.rsp" 
  fi
  
-  if [ $port = "dfb" ] || [ $port = "all" ]; then
-    filelist="$filelist dfb.rsp" 
-  fi
-  
  if [ $port = "gtk" ] || [ $port = "all" ]; then
    filelist="$filelist gtk.rsp"
  fi
@@ -128,7 +124,7 @@ dospinport(){
        mac)
            portname="Mac";;
        *)
-            # for all the others (DFB, GTK, MGL, DFB, MSW, X11) just use the
+            # for all the others (DFB, GTK, MGL, MSW, X11) just use the
            # upper-case version as they are abbreviations
            portname=`echo $port | tr '[a-z]' '[A-Z]'`;;
    esac
@@ -168,7 +164,7 @@ dospinport(){
    popd
    rm -rf /tmp/wx$port
    rm ${portfiles}
-    rm /tmp/textfiles
+#    rm /tmp/textfiles
 }

 prepareforrelease()
@@ -191,8 +187,6 @@ prepareforrelease()
    cp $APPDIR/docs/mgl/readme.txt $APPDIR/readme-mgl.txt
    cp $APPDIR/docs/mgl/install.txt $APPDIR/install-mgl.txt

-    cp $APPDIR/docs/dfb/install.txt $APPDIR/install-dfb.txt
-
    cp $APPDIR/docs/x11/readme.txt $APPDIR/readme-x11.txt
    cp $APPDIR/docs/x11/install.txt $APPDIR/install-x11.txt

@@ -291,7 +285,6 @@ fi

 if [ "$SPINALL" = "1" ]; then
    dospinport "mgl"
-    dospinport "dfb"
    dospinport "gtk"
    dospinport "x11"
    dospinport "motif"
--- a/distrib/scripts/is_text.sh
+++ b/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
--- a/distrib/scripts/mac/macbuild
+++ b/distrib/scripts/mac/macbuild
@@ -21,6 +21,7 @@ do_build
 make prefix=$INSTALLDIR install

 if [ "$WXPYTHON" == "1" ]; then
+  make -C contrib/src/animate prefix=$INSTALLDIR install
  make -C contrib/src/gizmos prefix=$INSTALLDIR install
  make -C contrib/src/stc prefix=$INSTALLDIR install
 fi
--- a/distrib/scripts/manifests/dfb.rsp
+++ b/distrib/scripts/manifests/dfb.rsp
@@ -1,6 +0,0 @@
-install-dfb.txt
-
-include/wx/dfb/*.h
-include/wx/dfb/private/*.h
-src/dfb/*.cpp
-docs/dfb/*.txt
--- a/distrib/scripts/manifests/generic.rsp
+++ b/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
--- a/distrib/scripts/manifests/mac.rsp
+++ b/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
--- a/distrib/scripts/manifests/mgl.rsp
+++ b/distrib/scripts/manifests/mgl.rsp
@@ -4,7 +4,6 @@ readme-mgl.txt
 build/mgl/*

 include/wx/mgl/*.h
-include/wx/mgl/private/*.h
 src/mgl/*.cpp
 src/mgl/*.lst

--- a/distrib/scripts/manifests/msw.rsp
+++ b/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
--- a/distrib/scripts/manifests/msw_minimal.rsp
+++ b/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/*.*
--- a/distrib/scripts/manifests/vc.rsp
+++ b/distrib/scripts/manifests/vc.rsp
@@ -1,5 +1,3 @@
-include/msvc/wx/setup.h
-
 build/msw/*.dsp
 build/msw/*.dsw

@@ -111,9 +109,9 @@ samples/image/image.dsp

 samples/internat/internat.dsp

-samples/ipc/ipc_ipcclient.dsp
+samples/ipc/ipc_client.dsp

-samples/ipc/ipc_ipcserver.dsp
+samples/ipc/ipc_server.dsp

 samples/keyboard/keyboard.dsp

--- a/distrib/scripts/manifests/wince.rsp
+++ b/distrib/scripts/manifests/wince.rsp
@@ -131,10 +131,10 @@ samples/internat/internat.vcw
 samples/keyboard/keyboard.vcp
 samples/keyboard/keyboard.vcw

-samples/ipc/ipc_ipcclient.vcp
-samples/ipc/ipc_ipcclient.vcw
-samples/ipc/ipc_ipcserver.vcp
-samples/ipc/ipc_ipcserver.vcw
+samples/ipc/ipc_client.vcp
+samples/ipc/ipc_client.vcw
+samples/ipc/ipc_server.vcp
+samples/ipc/ipc_server.vcw

 samples/joytest/joytest.vcp
 samples/joytest/joytest.vcw
--- a/distrib/scripts/manifests/x11.rsp
+++ b/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

--- a/distrib/scripts/pre-flight.sh
+++ b/distrib/scripts/pre-flight.sh
@@ -36,14 +36,10 @@ if [ ! -d $WX_SRC_DIR ]; then
  cvs -d:pserver:anoncvs:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets login
  echo "Grabbing wx CVS with tag $BUILD_TAG"
  cvs -d:pserver:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets checkout -r $BUILD_TAG wxWidgets
-  cd $WX_SRC_DIR
 else
    cd $WX_SRC_DIR
    cvs update -d -P
 fi
-#copy setup0.h setup.h for msw
-rm include/wx/msw/setup.h
-cp include/wx/msw/setup0.h include/wx/msw/setup.h

 # this is where we will store the wxAll tarball we create
 if [ ! -d $START_DIR/$DISTDIR ]; then
@@ -131,7 +127,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}/
--- a/distrib/scripts/utils.inc
+++ b/distrib/scripts/utils.inc
@@ -53,8 +53,6 @@ docopydocs()
    cp $APPDIR/docs/mgl/readme.txt $DESTDIR/readme-mgl-$VERSION.txt
    cp $APPDIR/docs/mgl/install.txt $DESTDIR/install-mgl-$VERSION.txt

-    cp $APPDIR/docs/dfb/install.txt $DESTDIR/install-dfb-$VERSION.txt
-
    cp $APPDIR/docs/cocoa/readme.txt $DESTDIR/readme-cocoa-$VERSION.txt
    cp $APPDIR/docs/cocoa/install.txt $DESTDIR/install-cocoa-$VERSION.txt

--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,6 +1,6 @@
-------------------------------------------------------------------------------
-                             wxWidgets Change Log
-------------------------------------------------------------------------------
+---------------------------------------------------------------
+wxWidgets Change Log - For more verbose changes, see the manual
+---------------------------------------------------------------

 INCOMPATIBLE CHANGES SINCE 2.6.x
 ================================
@@ -19,6 +19,8 @@ Changes in behaviour not resulting in compilation errors, please read this!
  wxEVT_MOUSE_CAPTURE_LOST event and not call ReleaseMouse() in this case.
 - wxInputStream::GetC() now returns an int in the range 0 - 255 on success
  instead of a char the range -128 - 127.
+- A sequence returned by wxFileSystem::FindFirst()/FindNext() may now be
+  be scoped to a single instance of wxFileSystem.


 Changes in behaviour which may result in compilation errors
@@ -64,12 +66,6 @@ Deprecated methods since 2.6.x and their replacements
 - wxDC::BeginDrawing() and wxDC::EndDrawing() deprecated, don't use them.
 - wxWindowBase::GetBestFittingSize --> wxWindowBase::GetEffectiveMinSize.
 - wxWindowBase::SetBestFittingSize --> wxWindowBase::SetInitialSize.
- Seeking on a zip stream returned from wxFileSystem without using the new
-  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
@@ -83,57 +79,9 @@ Major new features in 2.8 release
  comboboxes. Associated classes include wxOwnerDrawnComboBox, wxComboPopup
  and wxBitmapComboBox.
 - Further functionality including wxAnimationCtrl (moved from contrib/src/anim
-  and enhanced), wxSimpleHtmlListBox, wxHyperlinkCtrl, wxColourPickerCtrl,
+  and enhanced), wxHtmlSimpleListBox, wxHyperlinkCtrl, wxColourPickerCtrl,
  wxDirPickerCtrl, wxFilePickerCtrl, wxFontPickerCtrl, wxCollapsiblePane,
-  wxSearchCtrl, wxAboutBox, wxTreebook, tar streams.
-
-
-2.8.2
-----
-
-All:
-
- Added wxSizerFlags::Shaped() and FixedMinSize() methods
- Added wxCSConv::IsOk() (Manuel Martin)
- Added wxDateTime::GetDateOnly()
- Made wxTextFile work with unseekable files again (David Hart)
- Added wxCONFIG_USE_SUBDIR flag to wxFileConfig (Giuseppe Bilotta)
- Added wxSearchCtrl::[Get|Set]DescriptiveText
-
-wxMSW
-
- Fix lack of spin control update event when control lost focus
- Corrected drawing of bitmaps for disabled menu items
-
-wxMac
-
- Added support for the wxFRAME_FLOAT_ON_PARENT style
-
-
-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
@@ -141,28 +89,12 @@ 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).
- New option wxFS_READ | wxFS_SEEKABLE for wxFileSystem::OpenFile() to return
-  a stream that is seekable.
- Fixed bug in wxCalendarCtrl::HitTest() when clicking on month change arrows
- Added wxWindow::GetWindowBorderSize() and corrected wxTreeCtrl::GetBestSize()
-  for a control with borders (Tim Kosse)

 wxMSW:

 - Fixed version script problems when using configure with cygwin/mingw32.
- Use system default paper size for printing instead of A4.
- Fix (harmless) assert in virtual list control under Vista
- Fix colours when converting wxBitmap with alpha to wxImage (nusi).
-
-wxGTK:
-
- Allow dynamically changing most of text control styles
- Enable use of libgnomeprintui by default in configure
-

 2.7.2
 -----
--- a/docs/dfb/install.txt
+++ b/docs/dfb/install.txt
@@ -1,113 +0,0 @@
-wxWidgets for DirectFB installation
-===================================
-
-IMPORTANT NOTE:
-
-  wxDFB is currently incomplete and some parts of the wxWidgets library
-  don't yet compile and must be disabled during configuration. In particular,
-  the coverage of wxDC API is limited.
-
-
-Dependencies
------------
-
-wxDFB requires the DirectFB library (http://www.directfb.org), which must
-be installed before compiling wxDFB.
-
-
-Compiling
---------
-
-Compilation is done in the standard Unix fashion, using configure and make.
-Please refer to e.g. wxGTK's install.txt for details if you are unfamiliar
-with configure.
-
-When configuring, use the --with-directfb option instead of e.g. --with-gtk
-to specify that the wxDFB port should be built. You'll also need to disable
-wxWidgets features that don't work in wxDFB yet:
-
-$ ./configure --with-directfb \
-              --with-themes=mono \
-              --disable-accel \
-              --disable-popupwin \
-              --disable-help \
-              --disable-combobox \
-              --disable-menus \
-              --disable-mdi \
-              --disable-mdidoc \
-              --disable-docview \
-              --disable-printarch \
-              --disable-calendar \
-              --disable-choice \
-              --disable-choicebook \
-              --disable-dirdlg \
-              --disable-filedlg \
-              --disable-fontdlg \
-              --disable-filepicker \
-              --disable-dirpicker \
-              --disable-fontpicker \
-              --disable-datepick \
-              --disable-hyperlink \
-              --disable-aui \
-              --disable-richtext \
-              --disable-fontmap \
-              --disable-xrc \
-              --disable-html
-$ make
-
-
-Configuring fonts
-----------------
-
-DirectFB doesn't have native fonts configuration mechanism (such as
-fontconfig used by GTK+) and so wxDFB implements a simple configuration
-mechanism itself.
-
-No fonts are installed and configured by "make install", you have to manually
-configure fonts after you install the library.
-
-wxDFB looks the fonts up in directories specified in the WXDFB_FONTPATH
-environment variable (separated with :, similarly to the PATH variable).  If
-the variable is not set, $prefix/share/wx/fonts directory is used. All
-subdirectories of the directories on the path are scanned for FontsIndex
-files. These files are parsed and fonts defined in them are added to the fonts
-list.
-
-The FontsIndex file is standard wxFileConfig file text file. Each toplevel
-group specifies one font bundle, font's name is the name of group. Group's
-entries look like this:
-
-   [Font Name]
-   # font files (at least one of them must be present):
-   Regular=RegularFaceFile.ttf
-   Italic=ItalicFaceFile.ttf
-   Bold=BoldFaceFile.ttf
-   BoldItalic=BoldItalicFaceFile.ttf
-   # optional tag indicating this font is fixed-with (default is false):
-   IsFixed=1
-
-Additionally, there may be DefaultXXX entries at the toplevel for every family
-XXX and a Default entry that is shortcut for setting all families' default,
-their value is name of the default font:
-
-   # optional tags indicating the default font for given family:
-   DefaultDecorative=Font Name
-   DefaultRoman=Font Name
-   DefaultScript=Font Name
-   DefaultSwiss=Font Name
-   DefaultModern=Font Name
-   DefaultTeletype=Font Name
-   # indicate the font that is default for all families (optional):
-   Default=Font Name
-
-Any font formats supported by DirectFB (which typically includes formats
-supported by the FreeType library) can be used.
-
-
-Bug reports
-----------
-
-Please send bug reports with a description of your environment,
-compiler and the error message(s) to the wxwin-developers mailing list at:
-
-    wx-dev@lists.wxwidgets.org
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -1,5 +1,5 @@
-wxWidgets for GTK+ installation
-------------------------------
+wxWidgets 2.8 for GTK+ installation
+-----------------------------------

 IMPORTANT NOTE:

--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -1,24 +1,14 @@
-   Welcome to wxWidgets for GTK+
-   -----------------------------
+   Welcome to wxWidgets 2.8.0 for GTK+
+   -----------------------------------

-You have downloaded the GTK+ port of the wxWidgets GUI library.
+You have downloaded version 2.8 of the GTK+ port of the 
+wxWidgets GUI library.

-It is recommended to use at least GTK+ 2.2.3 to get the
-most out of wxWidgets and some features are only available
-when using GTK+ 2.4 or even from GTK+ 2.8. Note that if you
-compile wxWidgets against GTK+ 2.8 your app will still work
-with older GTK+ version down to version 2.2 as wxWidgets
-tests for the presence of newer features at run-time and it
-will fall back to a generic implementation if these features
-are not present in the GTK+ version used.
-
-wxWidgets 2.8 still supports GTK+ 1.2, but no developement
-is done on that port anymore and support for GTK+ 1.2 will
-probably be dropped entirely. Indeed, one of the major steps
-in the developement cycle leading up to wxWidgets 2.8 was
-that the codebase for GTK+ 1.2 and GTK+ 2.0 were separated
-so that improvements and clean-ups to the GTK+ 2.0 port 
-could be done without caring for GTK+ 1.2.
+wxWidgets no longer supports GTK 1.0.x (as did some early
+snapshots) and support for GTK 1.2.x will be phased out
+over time. Nearly all work is now done on GTK 2.0.x and
+quite a few of the enhancements of GTK+ 2.4.x and even
+GTK 2.8.x are used.

 More info about the wxWidgets project (including all the
 other ports and version of wxWidgets) can be found at the
@@ -49,6 +39,7 @@ different builds of it (for example with and without debug) in
 parallel. If you build in the source directory, don't forget to
 do "make clean" before changing the configuration!

+
 When you run into problems, please read the INSTALL.txt and 
 follow those instructions. If you still don't have any success,
 please send a bug report to one of our mailing list, INCLUDING 
@@ -61,6 +52,8 @@ bug reports or comments to the wxWidgets users list. These can
 be found at http://www.wxwidgets.org and more specifically at 
 http://lists.wxwidgets.org.

+Do NOT send any comments directly to me.
+
 wxWidgets doesn't come with any guarantee whatsoever. It 
 might crash your harddisk or destroy your monitor. It doesn't 
 claim to be suitable for any special or general purpose.
--- a/docs/latex/wx/animatctrl.tex
+++ b/docs/latex/wx/animatctrl.tex
@@ -80,7 +80,7 @@ all the parameters.

 \wxheading{Parameters}

-\docparam{parent}{Parent window, must be non-\NULL.}
+\docparam{parent}{Parent window, must not be non-\texttt{NULL}.}

 \docparam{id}{The identifier for the control.}

@@ -140,7 +140,7 @@ See \helpref{wxAnimation::LoadFile}{wxanimationloadfile} for more info.
 Starts playing the animation.
 The animation is always played in loop mode (unless the last frame of the animation
 has an infinite delay time) and always start from the first frame
-(even if you \helpref{stopped}{wxanimationctrlstop} it while some other frame was
+(even if you \helpref{atopped}{wxanimationctrlstop} it while some other frame was
 displayed).


@@ -170,10 +170,6 @@ If the control is not playing the animation, the given bitmap will be immediatel
 shown, otherwise it will be shown as soon as \helpref{Stop}{wxanimationctrlstop}
 is called.

-Note that the inactive bitmap, if smaller than the control's size, will be centered in
-the control; if bigger, it will be stretched to fit it.
-
-
 \membersection{wxAnimationCtrl::Stop}\label{wxanimationctrlstop}

 \func{void}{Stop}{\void}
--- a/docs/latex/wx/animation.tex
+++ b/docs/latex/wx/animation.tex
@@ -65,7 +65,7 @@ See \helpref{reference-counted object destruction}{refcountdestruct} for more in

 \membersection{wxAnimation::GetDelay}\label{wxanimationgetdelay}

-\constfunc{int}{GetDelay}{\param{unsigned int }{i}}
+\constfunc{int}{GetDelay}{\param{size\_t }{i}}

 Returns the delay for the i-th frame in milliseconds.
 If {\tt -1} is returned the frame is to be displayed forever.
@@ -73,14 +73,14 @@ If {\tt -1} is returned the frame is to be displayed forever.

 \membersection{wxAnimation::GetFrameCount}\label{wxanimationgetframecount}

-\constfunc{unsigned int}{GetFrameCount}{\void}
+\constfunc{size\_t}{GetFrameCount}{\void}

 Returns the number of frames for this animation.


 \membersection{wxAnimation::GetFrame}\label{wxanimationgetframe}

-\constfunc{wxImage}{GetFrame}{\param{unsigned int }{i}}
+\constfunc{wxImage}{GetFrame}{\param{size\_t }{i}}

 Returns the i-th frame as a \helpref{wxImage}{wximage}.

@@ -101,7 +101,7 @@ Returns \true if animation data is present.

 \membersection{wxAnimation::Load}\label{wxanimationload}

-\func{bool}{Load}{\param{wxInputStream\&}{ stream}, \param{wxAnimationType}{ type = wxANIMATION\_TYPE\_ANY}}
+\func{bool}{Load}{\param{wxInputStream&}{ stream}, \param{wxAnimationType}{ type = wxANIMATION\_TYPE\_ANY}}

 Loads an animation from the given stream.

@@ -113,9 +113,9 @@ Loads an animation from the given stream.

 \twocolwidtha{5cm}
 \begin{twocollist}
-\twocolitem{\indexit{wxANIMATION\_TYPE\_GIF}}{Load an animated GIF file.}
-\twocolitem{\indexit{wxANIMATION\_TYPE\_ANI}}{Load an ANI file.}
-\twocolitem{\indexit{wxANIMATION\_TYPE\_ANY}}{Try to autodetect the filetype.}
+\twocolitem{\indexit{wxANIM\_TYPE\_GIF}}{Load an animated GIF file.}
+\twocolitem{\indexit{wxANIM\_TYPE\_ANI}}{Load an ANI file.}
+\twocolitem{\indexit{wxANIM\_TYPE\_ANY}}{Try to autodetect the filetype.}
 \end{twocollist}
 }

@@ -138,9 +138,9 @@ Loads an animation from a file.

 \twocolwidtha{5cm}
 \begin{twocollist}
-\twocolitem{\indexit{wxANIMATION\_TYPE\_GIF}}{Load an animated GIF file.}
-\twocolitem{\indexit{wxANIMATION\_TYPE\_ANI}}{Load an ANI file.}
-\twocolitem{\indexit{wxANIMATION\_TYPE\_ANY}}{Try to autodetect the filetype.}
+\twocolitem{\indexit{wxANIM\_TYPE\_GIF}}{Load an animated GIF file.}
+\twocolitem{\indexit{wxANIM\_TYPE\_ANI}}{Load an ANI file.}
+\twocolitem{\indexit{wxANIM\_TYPE\_ANY}}{Try to autodetect the filetype.}
 \end{twocollist}
 }

--- a/docs/latex/wx/app.tex
+++ b/docs/latex/wx/app.tex
@@ -675,16 +675,13 @@ wxWidgets.

 \membersection{wxApp::SetUseBestVisual}\label{wxappsetusebestvisual}

-\func{void}{SetUseBestVisual}{\param{bool}{ flag}, \param{bool}{ forceTrueColour = false}}
+\func{void}{SetUseBestVisual}{\param{bool}{ flag}}

 Allows the programmer to specify whether the application will use the best visual
 on systems that support several visual on the same display. This is typically the
 case under Solaris and IRIX, where the default visual is only 8-bit whereas certain
 applications are supposed to run in TrueColour mode.

-If \arg{forceTrueColour} is true then the application will try to force
-using a TrueColour visual and abort the app if none is found.
-
 Note that this function has to be called in the constructor of the {\tt wxApp} 
 instance and won't have any effect when called later on.

--- a/docs/latex/wx/arrstrng.tex
+++ b/docs/latex/wx/arrstrng.tex
@@ -12,7 +12,7 @@ uses its knowledge of internals of wxString class to achieve this).
 This class is used in the same way as other dynamic \helpref{arrays}{wxarray},
 except that no {\it WX\_DEFINE\_ARRAY} declaration is needed for it. When a
 string is added or inserted in the array, a copy of the string is created, so
-the original string may be safely deleted (e.g. if it was a {\it wxChar *} 
+the original string may be safely deleted (e.g. if it was a {\it char *} 
 pointer the memory it was using can be freed immediately after this). In
 general, there is no need to worry about string memory deallocation when using
 this class - it will always free the memory it uses itself.
@@ -171,7 +171,7 @@ Returns the number of items in the array.

 \membersection{wxArrayString::Index}\label{wxarraystringindex}

-\func{int}{Index}{\param{const wxChar *}{ sz}, \param{bool}{ bCase = true}, \param{bool}{ bFromEnd = false}}
+\func{int}{Index}{\param{const char *}{ sz}, \param{bool}{ bCase = true}, \param{bool}{ bFromEnd = false}}

 Search the element in the array, starting from the beginning if
 {\it bFromEnd} is false or from end otherwise. If {\it bCase}, comparison is
@@ -229,7 +229,7 @@ are done in release mode.

 \membersection{wxArrayString::Remove}\label{wxarraystringremove}

-\func{void}{Remove}{\param{const wxChar *}{ sz}}
+\func{void}{Remove}{\param{const char *}{ sz}}

 Removes the first item matching this value. An assert failure is provoked by
 an attempt to remove an element which does not exist in debug build.
--- a/docs/latex/wx/auidockart.tex
+++ b/docs/latex/wx/auidockart.tex
@@ -38,23 +38,23 @@ No base class
 \begin{verbatim}
 enum wxAuiPaneDockArtSetting
 {
-    wxAUI_DOCKART_SASH_SIZE = 0,
-    wxAUI_DOCKART_CAPTION_SIZE = 1,
-    wxAUI_DOCKART_GRIPPER_SIZE = 2,
-    wxAUI_DOCKART_PANE_BORDER_SIZE = 3,
-    wxAUI_DOCKART_PANE_BUTTON_SIZE = 4,
-    wxAUI_DOCKART_BACKGROUND_COLOUR = 5,
-    wxAUI_DOCKART_SASH_COLOUR = 6,
-    wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR = 7,
-    wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR = 8,
-    wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR = 9,
-    wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR = 10,
-    wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR = 11,
-    wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR = 12,
-    wxAUI_DOCKART_BORDER_COLOUR = 13,
-    wxAUI_DOCKART_GRIPPER_COLOUR = 14,
-    wxAUI_DOCKART_CAPTION_FONT = 15,
-    wxAUI_DOCKART_GRADIENT_TYPE = 16
+    wxAUI_ART_SASH_SIZE = 0,
+    wxAUI_ART_CAPTION_SIZE = 1,
+    wxAUI_ART_GRIPPER_SIZE = 2,
+    wxAUI_ART_PANE_BORDER_SIZE = 3,
+    wxAUI_ART_PANE_BUTTON_SIZE = 4,
+    wxAUI_ART_BACKGROUND_COLOUR = 5,
+    wxAUI_ART_SASH_COLOUR = 6,
+    wxAUI_ART_ACTIVE_CAPTION_COLOUR = 7,
+    wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR = 8,
+    wxAUI_ART_INACTIVE_CAPTION_COLOUR = 9,
+    wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR = 10,
+    wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR = 11,
+    wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR = 12,
+    wxAUI_ART_BORDER_COLOUR = 13,
+    wxAUI_ART_GRIPPER_COLOUR = 14,
+    wxAUI_ART_CAPTION_FONT = 15,
+    wxAUI_ART_GRADIENT_TYPE = 16
 }
 \end{verbatim}

--- a/docs/latex/wx/auimanager.tex
+++ b/docs/latex/wx/auimanager.tex
@@ -10,9 +10,9 @@ determine each pane's docking and floating behavior. wxAuiManager
 uses wxWidgets' sizer mechanism to plan the layout of each frame. It
 uses a replaceable dock art class to do all drawing, so all drawing is
 localized in one area, and may be customized depending on an
-application's specific needs.
+applications' specific needs.

-wxAuiManager works as follows: the programmer adds panes to the class,
+wxAuiManager works as follows: The programmer adds panes to the class,
 or makes changes to existing pane properties (dock position, floating
 state, show state, etc.). To apply these changes, wxAuiManager's
 Update() function is called. This batch processing can be used to avoid
@@ -48,18 +48,19 @@ Center. This is fairly self-explanatory. The pane will be placed in the
 location specified by this variable.

 {\bf Position:}
-More than one pane can be placed inside of a dock. Imagine two panes
+More than one pane can be placed inside of a dock. Imagine to panes
 being docked on the left side of a window. One pane can be placed over
 another. In proportionally managed docks, the pane position indicates
-its sequential position, starting with zero. So, in our scenario with
+it's sequential position, starting with zero. So, in our scenario with
 two panes docked on the left side, the top pane in the dock would have
 position 0, and the second one would occupy position 1.

 {\bf Row:}
 A row can allow for two docks to be placed next to each other. One of
 the most common places for this to happen is in the toolbar. Multiple
-toolbar rows are allowed, the first row being row 0, and the second
-row 1. Rows can also be used on vertically docked panes.
+toolbar rows are allowed, the first row being in row 0, and the second
+in row 1. Rows can also be used on vertically docked panes.
+

 {\bf Layer:}
 A layer is akin to an onion. Layer 0 is the very center of the
@@ -72,7 +73,7 @@ understand layers is by running the wxAUI sample.

 \wxheading{Derived from}

-\helpref{wxEvtHandler}{wxevthandler}
+\helpref{wxEvent}{wxevent}

 \wxheading{Include files}

@@ -125,7 +126,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,12 +167,6 @@ 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.
-
 \membersection{wxAuiManager::GetFlags}\label{wxauimanagergetflags}

 \constfunc{unsigned int}{GetFlags}{\void}
@@ -184,16 +179,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
-specify any child window or sub-child window of the frame or window managed by wxAuiManager.
-The \arg{window} parameter need not be managed by the manager itself, nor does it even need to be a child
-or sub-child of a managed window.  It must however be inside the window hierarchy underneath the managed
-window.
-
 \membersection{wxAuiManager::GetPane}\label{wxauimanagergetpane}

 \func{wxAuiPaneInfo\&}{GetPane}{\param{wxWindow* }{window}}
@@ -273,17 +258,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
-window will create a dock that is unwieldly large.  wxAuiManager by default limits the size of any
-new dock to 1/3 of the window size.  For horizontal docks, this would be 1/3 of the window height.  For
-vertical docks, 1/3 of the width.  Calling this function will adjust this constraint value.  The numbers
-must be between 0.0 and 1.0.  For instance, calling SetDockSizeContraint with 0.5, 0.5 will cause new
-docks to be limited to half of the size of the entire managed window. 
-
 \membersection{wxAuiManager::SetFlags}\label{wxauimanagersetflags}

 \func{void}{SetFlags}{\param{unsigned int }{flags}}
--- a/docs/latex/wx/auinotebook.tex
+++ b/docs/latex/wx/auinotebook.tex
@@ -87,12 +87,6 @@ Returns the associated art provider.

 Returns the page specified by the given index.

-\membersection{wxAuiNotebook::GetPageBitmap}\label{wxauinotebookgetpagebitmap}
-
-\constfunc{wxBitmap}{GetPageBitmap}{\param{size\_t }{page}}
-
-Returns the tab bitmap for the page.
-
 \membersection{wxAuiNotebook::GetPageCount}\label{wxauinotebookgetpagecount}

 \constfunc{size\_t}{GetPageCount}{\void}
@@ -103,14 +97,7 @@ Returns the number of pages in the notebook.

 \constfunc{int}{GetPageIndex}{\param{wxWindow* }{page\_wnd}}

-Returns the page index for the specified window.  If the window is not found in
-the notebook, wxNOT\_FOUND is returned.
-
-\membersection{wxAuiNotebook::GetPageText}\label{wxauinotebookgetpagetext}
-
-\constfunc{wxString}{GetPageText}{\param{size\_t }{page}}
-
-Returns the tab label for the page.
+Returns the page index for the specified window.  If the window is not found in the notebook, wxNOT_FOUND is returned.

 \membersection{wxAuiNotebook::GetSelection}\label{wxauinotebookgetselection}

@@ -176,14 +163,3 @@ instruct the control to use dynamic tab height, which is the default behaviour.
 Under the default behaviour, when a tab with a large bitmap is added, the tab control's
 height will automatically increase to accommodate the larger bitmap.

-\func{void}{Split}{\param{size\_t }{page}, \param{int }{direction}}
-
-Split performs a split operation programmatically. The argument \arg{page} indicates
-the page that will be split off.  This page will also become the active page after the
-split.  The \arg{direction} argument specifies where the pane should go, it should be one
-of the following: wxTOP, wxBOTTOM, wxLEFT, or wxRIGHT.
-
-
-
-
-
--- a/docs/latex/wx/auipaneinfo.tex
+++ b/docs/latex/wx/auipaneinfo.tex
@@ -55,17 +55,15 @@ Copy constructor.
 \membersection{wxAuiPaneInfo::BestSize}\label{wxauipaneinfobestsize}

 \func{wxAuiPaneInfo\&}{BestSize}{\param{const wxSize\& }{size}}
-
 \func{wxAuiPaneInfo\&}{BestSize}{\param{int }{x}, \param{int }{y}}

-BestSize() sets the ideal size for the pane. The docking manager will attempt to use this size as much as possible when docking or floating the pane.
+BestSize() sets the ideal size for the pane.  The docking manager will attempt to use this size as much as possible when docking or floating the pane.

 \membersection{wxAuiPaneInfo::Bottom}\label{wxauipaneinfobottom}

 \func{wxAuiPaneInfo\&}{Bottom}{\void}

-Bottom() sets the pane dock position to the bottom side of the frame. This is
-the same thing as calling Direction(wxAUI\_DOCK\_BOTTOM).
+Bottom() sets the pane dock position to the bottom side of the frame.  This is the same thing as calling Direction(wxAUI_DOCK_BOTTOM).

 \membersection{wxAuiPaneInfo::BottomDockable}\label{wxauipaneinfobottomdockable}

@@ -83,26 +81,35 @@ Caption() sets the caption of the pane.

 \func{wxAuiPaneInfo\&}{CaptionVisible}{\param{bool }{visible = true}}

-CaptionVisible indicates that a pane caption should be visible. If false, no pane caption is drawn.
+CaptionVisible indicates that a pane caption should be visible.  If false, no pane caption is drawn.

 \membersection{wxAuiPaneInfo::Centre}\label{wxauipaneinfocentre}

 \func{wxAuiPaneInfo\&}{Centre}{\void}
-
 \func{wxAuiPaneInfo\&}{Center}{\void}

-Center() sets the pane dock position to the left side of the frame.
-The centre pane is the space in the middle after all border panes (left, top, right, bottom) are subtracted from the layout.
-
-This is the same thing as calling Direction(wxAUI\_DOCK\_CENTRE). 
+Center() sets the pane dock position to the left side of the frame.  This is the same thing as calling Direction(wxAUI_DOCK_CENTRE).

 \membersection{wxAuiPaneInfo::CentrePane}\label{wxauipaneinfocentrepane}

 \func{wxAuiPaneInfo\&}{CentrePane}{\void}
-
 \func{wxAuiPaneInfo\&}{CenterPane}{\void}

-CentrePane() specifies that the pane should adopt the default center pane settings. Centre panes usually do not have caption bars. This function provides an easy way of preparing a pane to be displayed in the center dock position.
+CentrePane() specifies that the pane should adopt the default centre pane settings.
+
+\membersection{wxAuiPaneInfo::Centre}\label{wxauipaneinfocentre}
+
+\func{wxAuiPaneInfo\&}{Centre}{\void}
+\func{wxAuiPaneInfo\&}{Center}{\void}
+
+Centre() sets the pane to the center position of the frame.  The centre pane is the space in the middle after all border panes (left, top, right, bottom) are subtracted from the layout.
+
+\membersection{wxAuiPaneInfo::CentrePane}\label{wxauipaneinfocentrepane}
+
+\func{wxAuiPaneInfo\&}{CentrePane}{\void}
+\func{wxAuiPaneInfo\&}{CenterPane}{\void}
+
+CentrePane() specifies that the pane should adopt the default center pane settings.  Centre panes usually do not have caption bars.  This function provides an easy way of preparing a pane to be displayed in the center dock position.

 \membersection{wxAuiPaneInfo::CloseButton}\label{wxauipaneinfoclosebutton}

@@ -120,13 +127,13 @@ DefaultPane() specifies that the pane should adopt the default pane settings.

 \func{wxAuiPaneInfo\&}{DestroyOnClose}{\param{bool }{b = true}}

-DestroyOnClose() indicates whether a pane should be detroyed when it is closed. Normally a pane is simply hidden when the close button is clicked. Setting DestroyOnClose to true will cause the window to be destroyed when the user clicks the pane's close button.
+DestroyOnClose() indicates whether a pane should be detroyed when it is closed.  Normally a pane is simply hidden when the close button is clicked.  Setting DestroyOnClose to true will cause the window to be destroyed when the user clicks the pane's close button.

 \membersection{wxAuiPaneInfo::Direction}\label{wxauipaneinfodirection}

 \func{wxAuiPaneInfo\&}{Direction}{\param{int }{direction}}

-Direction() determines the direction of the docked pane. It is functionally the same as calling Left(), Right(), Top() or Bottom(), except that docking direction may be specified programmatically via the parameter.
+Direction() determines the direction of the docked pane.  It is functionally the same as calling Left(), Right(), Top() or Bottom(), except that docking direction may be specified programmatically via the parameter.

 \membersection{wxAuiPaneInfo::Dock}\label{wxauipaneinfodock}

@@ -137,13 +144,13 @@ Direction() determines the direction of the docked pane. It is functionally the

 \func{wxAuiPaneInfo\&}{Dockable}{\param{bool }{b = true}}

-Dockable() specifies whether a frame can be docked or not. It is the same as specifying TopDockable(b).BottomDockable(b).LeftDockable(b).RightDockable(b).
+Dockable() specifies whether a frame can be docked or not.  It is the same as specifying TopDockable(b).BottomDockable(b).LeftDockable(b).RightDockable(b).

 \membersection{wxAuiPaneInfo::Fixed}\label{wxauipaneinfofixed}

 \func{wxAuiPaneInfo\&}{Fixed}{\void}

-Fixed() forces a pane to be fixed size so that it cannot be resized. After calling Fixed(), IsFixed() will return true.
+Fixed() forces a pane to be fixed size so that it cannot be resized.  After calling Fixed(), IsFixed() will return true.

 \membersection{wxAuiPaneInfo::Float}\label{wxauipaneinfofloat}

@@ -160,7 +167,6 @@ Floatable() sets whether the user will be able to undock a pane and turn it into
 \membersection{wxAuiPaneInfo::FloatingPosition}\label{wxauipaneinfofloatingposition}

 \func{wxAuiPaneInfo\&}{FloatingPosition}{\param{const wxPoint\& }{pos}}
-
 \func{wxAuiPaneInfo\&}{FloatingPosition}{\param{int }{x}, \param{int }{y}}

 FloatingPosition() sets the position of the floating pane.
@@ -168,7 +174,6 @@ FloatingPosition() sets the position of the floating pane.
 \membersection{wxAuiPaneInfo::FloatingSize}\label{wxauipaneinfofloatingsize}

 \func{wxAuiPaneInfo\&}{FloatingSize}{\param{const wxSize\& }{size}}
-
 \func{wxAuiPaneInfo\&}{FloatingSize}{\param{int }{x}, \param{int }{y}}

 FloatingSize() sets the size of the floating pane.
@@ -291,7 +296,7 @@ IsMoveable() returns true if the docked frame can be undocked or moved to anothe

 \constfunc{bool}{IsOk}{\void}

-IsOk() returns true if the wxAuiPaneInfo structure is valid. A pane structure is valid if it has an associated window.
+IsOk() returns true if the wxAuiPaneInfo structure is valid.  A pane structure is valid if it has an associated window.

 \membersection{wxAuiPaneInfo::IsResizable}\label{wxauipaneinfoisresizable}

@@ -327,14 +332,13 @@ IsTopDockable() returns true if the pane can be docked at the top of the managed

 \func{wxAuiPaneInfo\&}{Layer}{\param{int }{layer}}

-Layer() determines the layer of the docked pane. The dock layer is similar to an onion, the inner-most layer being layer 0. Each shell moving in the outward direction has a higher layer number. This allows for more complex docking layout formation.
+Layer() determines the layer of the docked pane.  The dock layer is similar to an onion, the inner-most layer being layer 0.  Each shell moving in the outward direction has a higher layer number.  This allows for more complex docking layout formation.

 \membersection{wxAuiPaneInfo::Left}\label{wxauipaneinfoleft}

 \func{wxAuiPaneInfo\&}{Left}{\void}

-Left() sets the pane dock position to the left side of the frame. This is the
-same thing as calling Direction(wxAUI\_DOCK\_LEFT).
+Left() sets the pane dock position to the left side of the frame.  This is the same thing as calling Direction(wxAUI_DOCK_LEFT).

 \membersection{wxAuiPaneInfo::LeftDockable}\label{wxauipaneinfoleftdockable}

@@ -345,7 +349,6 @@ LeftDockable() indicates whether a pane can be docked on the left of the frame.
 \membersection{wxAuiPaneInfo::MaxSize}\label{wxauipaneinfomaxsize}

 \func{wxAuiPaneInfo\&}{MaxSize}{\param{const wxSize\& }{size}}
-
 \func{wxAuiPaneInfo\&}{MaxSize}{\param{int }{x}, \param{int }{y}}

 MaxSize() sets the maximum size of the pane.
@@ -359,10 +362,9 @@ MaximizeButton() indicates that a maximize button should be drawn for the pane.
 \membersection{wxAuiPaneInfo::MinSize}\label{wxauipaneinfominsize}

 \func{wxAuiPaneInfo\&}{MinSize}{\param{const wxSize\& }{size}}
-
 \func{wxAuiPaneInfo\&}{MinSize}{\param{int }{x}, \param{int }{y}}

-MinSize() sets the minimum size of the pane. Please note that this is only partially supported as of this writing.
+MinSize() sets the minimum size of the pane.  Please note that this is only partially supported as of this writing.

 \membersection{wxAuiPaneInfo::MinimizeButton}\label{wxauipaneinfominimizebutton}

@@ -380,7 +382,7 @@ Movable indicates whether a frame can be moved.

 \func{wxAuiPaneInfo\&}{Name}{\param{const wxString\& }{n}}

-Name() sets the name of the pane so it can be referenced in lookup functions. If a name is not specified by the user, a random name is assigned to the pane when it is added to the manager.
+Name() sets the name of the pane so it can be referenced in lookup functions.  If a name is not specified by the user, a random name is assigned to the pane when it is added to the manager.

 \membersection{wxAuiPaneInfo::PaneBorder}\label{wxauipaneinfopaneborder}

@@ -404,7 +406,7 @@ Position() determines the position of the docked pane.

 \func{wxAuiPaneInfo\&}{Resizable}{\param{bool }{resizable = true}}

-Resizable() allows a pane to be resized if the parameter is true, and forces it to be a fixed size if the parameter is false. This is simply an antonym for Fixed().
+Resizable() allows a pane to be resized if the parameter is true, and forces it to be a fixed size if the parameter is false.  This is simply an antonym for Fixed().

 \membersection{wxAuiPaneInfo::Right}\label{wxauipaneinforight}

@@ -435,7 +437,7 @@ used on loading perspectives etc.

 \func{wxAuiPaneInfo\&}{SetFlag}{\param{unsigned int }{flag}, \param{bool }{option\_state}}

-SetFlag() turns the property given by flag on or off with the option\_state parameter.
+SetFlag() turns the property given by flag on or off with the option_state parameter.

 \membersection{wxAuiPaneInfo::Show}\label{wxauipaneinfoshow}

@@ -465,7 +467,7 @@ TopDockable() indicates whether a pane can be docked at the top of the frame.

 \func{wxAuiPaneInfo\&}{Window}{\param{wxWindow* }{w}}

-Window() assigns the window pointer that the wxAuiPaneInfo should use. This normally does not need to be specified, as the window pointer is automatically assigned to the wxAuiPaneInfo structure as soon as it is added to the manager.
+Window() assigns the window pointer that the wxAuiPaneInfo should use.  This normally does not need to be specified, as the window pointer is automatically assigned to the wxAuiPaneInfo structure as soon as it is added to the manager.

 \membersection{wxAuiPaneInfo::operator=}\label{wxauipaneinfooperatorassign}

--- a/docs/latex/wx/body.tex
+++ b/docs/latex/wx/body.tex
@@ -592,7 +592,7 @@ it can alert you to problems later on.

 \subsection{Use wxString in preference to character arrays}\label{usewxstring}

-Using wxString can be much safer and more convenient than using wxChar *.
+Using wxString can be much safer and more convenient than using char *.
 Again, I haven't practiced what I'm preaching, but I'm now trying to use
 wxString wherever possible. You can reduce the possibility of memory
 leaks substantially, and it is much more convenient to use the overloaded
--- a/docs/latex/wx/brush.tex
+++ b/docs/latex/wx/brush.tex
@@ -60,11 +60,10 @@ application may wish to get a pointer to a brush by using the global
 list of brushes {\bf wxTheBrushList}, and calling the member function
 \rtfsp{\bf FindOrCreateBrush}.

-This class uses \helpref{reference counting and copy-on-write}{trefcount}
-internally so that assignments between two instances of this class are very
-cheap. You can therefore use actual objects instead of pointers without
-efficiency problems. If an instance of this class is changed it will create
-its own data internally so that other instances, which previously shared the
+wxBrush uses a reference counting system, so assignments between brushes are very
+cheap. You can therefore use actual wxBrush objects instead of pointers without
+efficiency problems. Once one wxBrush object changes its data it will create its
+own brush data internally so that other brushes, which previously shared the
 data using the reference counting, are not affected.

 %TODO: an overview for wxBrush.
--- a/docs/latex/wx/category.tex
+++ b/docs/latex/wx/category.tex
@@ -107,7 +107,7 @@ that are not static can have \helpref{validators}{wxvalidator} associated with t
 \twocolitem{\helpref{wxStaticBox}{wxstaticbox}}{A static, or group box for visually grouping related controls}
 \twocolitem{\helpref{wxListBox}{wxlistbox}}{A list of strings for single or multiple selection}
 \twocolitem{\helpref{wxListCtrl}{wxlistctrl}}{A control for displaying lists of strings and/or icons, plus a multicolumn report view}
-\twocolitem{\helpref{wxListView}{wxlistview}}{A simpler interface ({\it fa\c{c}ade}) for wxListCtrl in report mode}
+\twocolitem{\helpref{wxListView}{wxlistview}}{A simpler interface ({\it fa\c{c}ade} for wxListCtrl in report mode}
 \twocolitem{\helpref{wxOwnerDrawnComboBox}{wxownerdrawncombobox}}{A combobox with owner-drawn list items}
 \twocolitem{\helpref{wxRichTextCtrl}{wxrichtextctrl}}{Generic rich text editing control}
 \twocolitem{\helpref{wxTextCtrl}{wxtextctrl}}{Single or multiline text editing control}
@@ -617,7 +617,6 @@ and paragraph formatting.
 \twocolitem{\helpref{wxRichTextStyleSheet}{wxrichtextstylesheet}}{A set of style definitions.}
 \twocolitem{\helpref{wxRichTextStyleComboCtrl}{wxrichtextstylecomboctrl}}{A drop-down control for applying styles.}
 \twocolitem{\helpref{wxRichTextStyleListBox}{wxrichtextstylelistbox}}{A listbox for applying styles.}
-\twocolitem{\helpref{wxRichTextStyleOrganiserDialog}{wxrichtextstyleorganiserdialog}}{A dialog that can be used for managing or browsing styles.}
 \twocolitem{\helpref{wxRichTextEvent}{wxrichtextevent}}{A rich text event.}
 \twocolitem{\helpref{wxRichTextRange}{wxrichtextrange}}{Specification for ranges in a rich text control or buffer.}
 \twocolitem{\helpref{wxRichTextFileHandler}{wxrichtextfilehandler}}{File handler base class.}
--- a/docs/latex/wx/classes.tex
+++ b/docs/latex/wx/classes.tex
@@ -330,7 +330,6 @@
 \input richtextrange.tex
 \input richtextstyledefinition.tex
 \input richtextstylelistbox.tex
-\input richtextstyleorganiserdialog.tex
 \input richtextstylesheet.tex
 \input richtextxmlhandler.tex

@@ -348,7 +347,6 @@
 \input setcursorevt.tex
 \input ipcservr.tex
 \input hprovsmp.tex
-\input srchctrl.tex
 \input sngchdlg.tex
 \input snglinst.tex
 \input size.tex
--- a/docs/latex/wx/clrpicker.tex
+++ b/docs/latex/wx/clrpicker.tex
@@ -43,9 +43,6 @@ The text control is automatically synchronized with button's value. Use function

 \wxheading{Event handling}

-To process a colour picker event, use these event handler macros to direct input to member
-functions that take a \helpref{wxColourPickerEvent}{wxcolourpickerevent} argument.
-
 \twocolwidtha{7cm}%
 \begin{twocollist}\itemsep=0pt
 \twocolitem{{\bf EVT\_COLOURPICKER\_CHANGED(id, func)}}{The user changed the
--- a/docs/latex/wx/collpane.tex
+++ b/docs/latex/wx/collpane.tex
@@ -65,9 +65,6 @@ It is only available if \texttt{wxUSE\_COLLPANE} is set to $1$ (the default).

 \wxheading{Event handling}

-To process a collapsible pane event, use these event handler macros to direct input to member
-functions that take a \helpref{wxCollapsiblePaneEvent}{wxcollapsiblepaneevent} argument.
-
 \twocolwidtha{7cm}%
 \begin{twocollist}\itemsep=0pt
 \twocolitem{{\bf EVT\_COLLAPSIBLEPANE\_CHANGED(id, func)}}{The user showed or hidden the collapsible pane. }
@@ -76,8 +73,7 @@ functions that take a \helpref{wxCollapsiblePaneEvent}{wxcollapsiblepaneevent} a

 \wxheading{See also}

-\helpref{wxPanel}{wxpanel},\\
-\helpref{wxCollapsiblePaneEvent}{wxcollapsiblepaneevent}
+\helpref{wxPanel}{wxpanel}

 \latexignore{\rtfignore{\wxheading{Members}}}

@@ -167,63 +163,3 @@ Same as \texttt{\helpref{Collapse}{wxcollapsiblepanecollapse}(false)}.
 Returns a pointer to the pane window. Add controls to the returned \helpref{wxWindow}{wxwindow}
 to make them collapsible.

-
-
-
-
-%% wxCollapsiblePaneEvent documentation
-
-\section{\class{wxCollapsiblePaneEvent}}\label{wxcollapsiblepaneevent}
-
-This event class is used for the events generated by
-\helpref{wxCollapsiblePane}{wxcollapsiblepane}.
-
-\wxheading{Derived from}
-
-\helpref{wxCommandEvent}{wxcommandevent}\\
-\helpref{wxEvent}{wxevent}\\
-\helpref{wxObject}{wxobject}
-
-\wxheading{Include files}
-
-<wx/collpane.h>
-
-\wxheading{Event handling}
-
-To process input from a wxCollapsiblePane, use one of these event handler macros to
-direct input to member function that take a
-\helpref{wxCollapsiblePaneEvent}{wxcollapsiblepaneevent} argument:
-
-\twocolwidtha{7cm}
-\begin{twocollist}
-\twocolitem{{\bf EVT\_COLLAPSIBLEPANE\_CHANGED(id, func)}}{The user showed or hidden the collapsible pane.}
-\end{twocollist}%
-
-
-\wxheading{See also}
-
-\helpref{wxCollapsiblePane}{wxcollapsiblepane}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxCollapsiblePaneEvent::wxCollapsiblePaneEvent}\label{wxcollapsiblepaneeventctor}
-
-\func{}{wxCollapsiblePaneEvent}{\param{wxObject *}{ generator}, \param{int}{ id}, \param{bool}{ collapsed}}
-
-The constructor is not normally used by the user code.
-
-
-\membersection{wxCollapsiblePaneEvent::GetCollapsed}\label{wxcollapsiblepaneeventgetcollapsed}
-
-\constfunc{bool}{GetCollapsed}{\void}
-
-Returns \true if the pane has been collapsed.
-
-
-\membersection{wxCollapsiblePaneEvent::SetCollapsed}\label{wxcollapsiblepaneeventsetcollapsed}
-
-\func{void}{SetCollapsed}{\param{bool}{ collapsed}}
-
-Sets this as a collapsed pane event (if \arg{collapsed} is \true) or as an expanded
-pane event (if \arg{collapsed} is \false).
-
--- a/docs/latex/wx/combobox.tex
+++ b/docs/latex/wx/combobox.tex
@@ -218,17 +218,6 @@ doesn't have the focus.
 Returns the last position in the combobox text field.


-\membersection{wxComboBox::GetSelection}\label{wxcomboboxgetselection}
-
-\constfunc{void}{GetSelection}{\param{long *}{from}, \param{long *}{to}}
-
-This is the same as \helpref{wxTextCtrl::GetSelection}{wxtextctrlgetselection} 
-for the text control which is part of the combobox. Notice that this is a
-different method from \helpref{wxControlWithItems::GetSelection}{wxcontrolwithitemsgetselection}.
-
-Currently this method is only implemented in wxMSW and wxGTK.
-
-
 \membersection{wxComboBox::GetValue}\label{wxcomboboxgetvalue}

 \constfunc{wxString}{GetValue}{\void}
--- a/docs/latex/wx/config.tex
+++ b/docs/latex/wx/config.tex
@@ -377,30 +377,18 @@ this is not present, but required, the application name will be used instead.}

 \docparam{style}{Can be one of wxCONFIG\_USE\_LOCAL\_FILE and
 wxCONFIG\_USE\_GLOBAL\_FILE. The style interpretation depends on the config
-class and is ignored by some implementations. For wxFileConfig, these styles
-determine whether a local or global config file is created or used. If the
-flag is present but the parameter is empty, the parameter will be set to a
-default. If the parameter is present but the style flag not, the relevant flag
-will be added to the style. For wxRegConfig, thie GLOBAL flag refers to HKLM
-key while LOCAL one is for the usual HKCU one.
-
-For wxFileConfig you can also add wxCONFIG\_USE\_RELATIVE\_PATH by logically
-or'ing it to either of the \_FILE options to tell wxFileConfig to use relative
-instead of absolute paths.
-
-On non-VMS Unix systems, the default local configuration file is \tt{~/.appname}.
-However, this path may be also used as user data directory
-(see \helpref{wxStandardPaths::GetUserDataDir}{wxstandardpathsgetuserdatadir}) if
-the application has several data files. In this case wxCONFIG\_USE\_SUBDIR
-flag, which changes the default local configuration file to \tt{~/.appname/appname}
-should be used. Notice that this flag is ignored on non-Unix system, including
-VMS, or if a non-default \textit{localFilename} is provided. \newsince{2.8.2}
-
-For wxFileConfig, you can also add wxCONFIG\_USE\_NO\_ESCAPE\_CHARACTERS which
-will turn off character escaping for the values of entries stored in the config
-file: for example a {\it foo} key with some backslash characters will be stored
-as {\tt foo=C:$\backslash$mydir} instead of the usual storage of {\tt
-foo=C:$\backslash\backslash$mydir}.
+class and is ignored by some. For wxFileConfig, these styles determine whether
+a local or global config file is created or used. If the flag is present but
+the parameter is empty, the parameter will be set to a default. If the
+parameter is present but the style flag not, the relevant flag will be added
+to the style. For wxFileConfig you can also add wxCONFIG\_USE\_RELATIVE\_PATH 
+by logically or'ing it to either of the \_FILE options to tell wxFileConfig to 
+use relative instead of absolute paths.  For wxFileConfig, you can also 
+add wxCONFIG\_USE\_NO\_ESCAPE\_CHARACTERS which will turn off character 
+escaping for the values of entries stored in the config file: for example 
+a {\it foo} key with some backslash characters will be stored as {\tt foo=C:$\backslash$mydir} instead
+of the usual storage of {\tt foo=C:$\backslash\backslash$mydir}.
+For wxRegConfig, this flag refers to HKLM, and provides read-only access.

 The wxCONFIG\_USE\_NO\_ESCAPE\_CHARACTERS style can be helpful if your config 
 file must be read or written to by a non-wxWidgets program (which might not 
--- a/docs/latex/wx/csconv.tex
+++ b/docs/latex/wx/csconv.tex
@@ -32,8 +32,8 @@ default user character set.
 \func{}{wxCSConv}{\param{wxFontEncoding }{encoding}}

 Constructor. You may specify either the name of the character set you want to
-convert from/to or an encoding constant. If the character set name (or the
-encoding) is not recognized, ISO 8859-1 is used as fall back.
+convert from/to or an encoding constant. If the character set name is not
+recognized, ISO 8859-1 is used as fall back.


 \membersection{wxCSConv::\destruct{wxCSConv}}\label{wxcsconvdtor}
@@ -43,26 +43,12 @@ encoding) is not recognized, ISO 8859-1 is used as fall back.
 Destructor frees any resources needed to perform the conversion.


-\membersection{wxCSConv::IsOk}\label{wxcsconvisok}
-
-\constfunc{bool}{IsOk}{\void}
-
-Returns \true if the charset (or the encoding) given at constructor is really
-available to use. Returns \false if ISO 8859-1 will be used instead.
-
-Note this does \emph{not} mean that a given string will be correctly converted.
-A malformed string may still make conversion functions return \texttt{wxCONV\_FAILED}.
-
-\newsince{2.8.2}
-
-
 \membersection{wxCSConv::MB2WC}\label{wxcsconvmb2wc}

 \constfunc{size\_t}{MB2WC}{\param{wchar\_t* }{buf}, \param{const char* }{psz}, \param{size\_t }{n}}

 Converts from the selected character set to Unicode. Returns length of string written to destination buffer.

-
 \membersection{wxCSConv::WC2MB}\label{wxcsconvwc2mb}

 \constfunc{size\_t}{WC2MB}{\param{char* }{buf}, \param{const wchar\_t* }{psz}, \param{size\_t }{n}}
--- a/docs/latex/wx/datectrl.tex
+++ b/docs/latex/wx/datectrl.tex
@@ -154,11 +154,7 @@ outside of the current range, an invalid object is returned.

 \func{void}{SetFormat}{\param{const wxChar*}{ format}}

-Please note that this function is only available in the generic version of this
-control. The native version always uses the current system locale.
-
-Sets the display format for the date in the control. See wxDateTime for the
-meaning of format strings.
+Sets the display format for the date in the control. See wxDateTime for the meaning of format strings.

 \wxheading{Remarks}

--- a/docs/latex/wx/datetime.tex
+++ b/docs/latex/wx/datetime.tex
@@ -862,20 +862,6 @@ Same as \helpref{Set}{wxdatetimesettm}.
 Returns {\tt true} if the object represents a valid time moment.


-\membersection{wxDateTime::GetDateOnly}\label{wxdatetimegetdateonly}
-
-\constfunc{wxDateTime}{GetDateOnly}{\void}
-
-Returns the object having the same date component as this one but time of
-00:00:00.
-
-\newsince{2.8.2}
-
-\wxheading{See also}
-
-\helpref{ResetTime}{wxdatetimeresettime}
-
-
 \membersection{wxDateTime::GetTm}\label{wxdatetimegettm}

 \constfunc{Tm}{GetTm}{\param{const TimeZone\& }{tz = Local}}
--- a/docs/latex/wx/db.tex
+++ b/docs/latex/wx/db.tex
@@ -1383,7 +1383,7 @@ When called with {\it sqlLogOFF}, the logging file is closed, and any calls to \

 \membersection{wxDb::SQLColumnName}\label{wxdbsqlcolumnname}

-\func{const wxString}{SQLColumnName}{\param{const wxChar *}{ colName}}
+\func{const wxString}{SQLColumnName}{\param{const char *}{ colName}}

 Returns the column name in a form ready for use in SQL statements.
 In most cases, the column name is returned verbatim.  But some databases
@@ -1405,7 +1405,7 @@ before including the column name in a SQL statement}

 \membersection{wxDb::SQLTableName}\label{wxdbsqltablename}

-\func{const wxString}{SQLTableName}{\param{const wxChar *}{ tableName}}
+\func{const wxString}{SQLTableName}{\param{const char *}{ tableName}}

 Returns the table name in a form ready for use in SQL statements.
 In most cases, the table name is returned verbatim.  But some databases
--- a/docs/latex/wx/dc.tex
+++ b/docs/latex/wx/dc.tex
@@ -662,33 +662,6 @@ Gets the current logical function (see \helpref{wxDC::SetLogicalFunction}{wxdcse
 Gets the {\it mapping mode} for the device context (see \helpref{wxDC::SetMapMode}{wxdcsetmapmode}).


-\membersection{wxDC::GetMultiLineTextExtent}\label{wxdcgetmultilinetextextent}
-
-\constfunc{void}{GetMultiLineTextExtent}{\param{const wxString\& }{string}, \param{wxCoord *}{w},\\
-  \param{wxCoord *}{h}, \param{wxCoord *}{heightLine = NULL}, \param{wxFont *}{font = NULL}}
-
-\constfunc{wxSize}{GetMultiLineTextExtent}{\param{const wxString\& }{string}}
-
-Gets the dimensions of the string using the currently selected font.
-\rtfsp{\it string} is the text string to measure, {\it heightLine}, if non NULL,
-is where to store the height of a single line.
-
-The text extent is returned in {\it w} and {\it h} pointers (first form) or as
-a \helpref{wxSize}{wxsize} object (second form).
-
-If the optional parameter {\it font} is specified and valid, then it is used
-for the text extent calculation. Otherwise the currently selected font is.
-
-Note that this function works both with single-line and multi-line strings.
-
-\wxheading{See also}
-
-\helpref{wxFont}{wxfont},\rtfsp
-\helpref{wxDC::SetFont}{wxdcsetfont},\rtfsp
-\helpref{wxDC::GetPartialTextExtents}{wxdcgetpartialtextextents},\rtfsp
-\helpref{wxDC::GetTextExtent}{wxdcgettextextent}
-
-
 \membersection{wxDC::GetPartialTextExtents}\label{wxdcgetpartialtextextents}

 \constfunc{bool}{GetPartialTextExtents}{\param{const wxString\&  }{text}, 
@@ -702,11 +675,6 @@ various platforms have a native API function that is faster or more
 accurate than the generic implementation then it should be used
 instead. 

-\wxheading{See also}
-
-\helpref{wxDC::GetMultiLineTextExtent}{wxdcgetmultilinetextextent},\rtfsp
-\helpref{wxDC::GetTextExtent}{wxdcgettextextent}
-
 \pythonnote{This method only takes the {\it text} parameter and
  returns a Python list of integers.}

@@ -792,31 +760,20 @@ Gets the current text background colour (see \helpref{wxDC::SetTextBackground}{w

 \membersection{wxDC::GetTextExtent}\label{wxdcgettextextent}

-\constfunc{void}{GetTextExtent}{\param{const wxString\& }{string}, \param{wxCoord *}{w}, \param{wxCoord *}{h},\\
+\func{void}{GetTextExtent}{\param{const wxString\& }{string}, \param{wxCoord *}{w}, \param{wxCoord *}{h},\\
  \param{wxCoord *}{descent = NULL}, \param{wxCoord *}{externalLeading = NULL}, \param{wxFont *}{font = NULL}}

-\constfunc{wxSize}{GetTextExtent}{\param{const wxString\& }{string}}
-
 Gets the dimensions of the string using the currently selected font.
-\rtfsp{\it string} is the text string to measure, {\it descent} is the
+\rtfsp{\it string} is the text string to measure, {\it w} and {\it h} are
+the total width and height respectively, {\it descent} is the
 dimension from the baseline of the font to the bottom of the
 descender, and {\it externalLeading} is any extra vertical space added
 to the font by the font designer (usually is zero).

-The text extent is returned in {\it w} and {\it h} pointers (first form) or as
-a \helpref{wxSize}{wxsize} object (second form).
-
 If the optional parameter {\it font} is specified and valid, then it is used
 for the text extent calculation. Otherwise the currently selected font is.

-Note that this function only works with single-line strings.
-
-\wxheading{See also}
-
-\helpref{wxFont}{wxfont},\rtfsp
-\helpref{wxDC::SetFont}{wxdcsetfont},\rtfsp
-\helpref{wxDC::GetPartialTextExtents}{wxdcgetpartialtextextents},\rtfsp
-\helpref{wxDC::GetMultiLineTextExtent}{wxdcgetmultilinetextextent}
+See also \helpref{wxFont}{wxfont}, \helpref{wxDC::SetFont}{wxdcsetfont}.

 \pythonnote{The following methods are implemented in wxPython:\par
 \indented{2cm}{\begin{twocollist}
--- a/docs/latex/wx/dirctrl.tex
+++ b/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.}
-
--- a/docs/latex/wx/dirpicker.tex
+++ b/docs/latex/wx/dirpicker.tex
@@ -46,9 +46,6 @@ The text control is automatically synchronized with button's value. Use function

 \wxheading{Event handling}

-To process a directory picker event, use these event handler macros to direct input to member
-functions that take a \helpref{wxFileDirPickerEvent}{wxfiledirpickerevent} argument.
-
 \twocolwidtha{7cm}%
 \begin{twocollist}\itemsep=0pt
 \twocolitem{{\bf EVT\_DIRPICKER\_CHANGED(id, func)}}{The user changed the
--- a/docs/latex/wx/dirtrav.tex
+++ b/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,
--- a/docs/latex/wx/file.tex
+++ b/docs/latex/wx/file.tex
@@ -20,8 +20,8 @@ wxFile is a wrapper around {\tt file descriptor.} - see also
 \helpref{wxFFile}{wxffile} for a wrapper around {\tt FILE} structure.

 {\tt wxFileOffset} is used by the wxFile functions which require offsets as 
-parameter or return them. If the platform supports it, wxFileOffset is a typedef
-for a native 64 bit integer, otherwise a 32 bit integer is used for wxFileOffset.
+parameter or return them. If the platform supports it, wxFileOffset if a typedef
+for a native 64 bit integer, else a 32 bit integer is used for wxFileOffset.

 \wxheading{Derived from}

--- a/docs/latex/wx/filehist.tex
+++ b/docs/latex/wx/filehist.tex
@@ -89,13 +89,6 @@ Appends the files in the history list, to all menus managed by the file history
 Appends the files in the history list, to the given menu only.


-\membersection{wxFileHistory::GetBaseId}\label{wxfilehistorygetbaseid}
-
-\constfunc{wxWindowID}{GetBaseId}{\void}
-
-Returns the base identifier for the range used for appending items.
-
-
 \membersection{wxFileHistory::GetCount}\label{wxfilehistorygetcount}

 \constfunc{size\_t}{GetCount}{\void}
@@ -164,13 +157,6 @@ explicitly by the application.
 \helpref{wxConfig}{wxconfigbase}


-\membersection{wxFileHistory::SetBaseId}\label{wxfilehistorysetbaseid}
-
-\func{void}{SetBaseId}{\param{wxWindowID}{ baseId}}
-
-Sets the base identifier for the range used for appending items.
-
-
 \membersection{wxFileHistory::UseMenu}\label{wxfilehistoryusemenu}

 \func{void}{UseMenu}{\param{wxMenu* }{menu}}
--- a/docs/latex/wx/filename.tex
+++ b/docs/latex/wx/filename.tex
@@ -19,47 +19,6 @@ Second, it includes the functions for working with the files itself. Note that
 to change the file data you should use \helpref{wxFile}{wxfile} class instead.
 wxFileName provides functions for working with the file attributes.

-When working with directory names (i.e. without filename and extension)
-make sure not to misuse the file name part of this class with the last
-directory. Instead initialize the wxFileName instance like this:
-
-\begin{verbatim}
-wxFileName dirname( wxT("C:\mydir"), wxEmptyString );
-MyMethod( dirname.GetPath() );
-\end{verbatim}
-
-The same can be done using the static method \helpref{wxFileName::DirName}{wxfilenamedirname}:
-
-\begin{verbatim}
-wxFileName dirname = wxFileName::DirName( wxT("C:\mydir") );
-MyMethod( dirname.GetPath() );
-\end{verbatim}
-
-Accordingly, methods dealing with directories or directory names
-like \helpref{IsDirReadable}{wxfilenameisdirreadable} use
-\helpref{GetPath}{wxfilenamegetpath} whereas methods dealing 
-with file names like \helpref{IsFileReadable}{wxfilenameisfilereadable}
-use \helpref{GetFullPath}{wxfilenamegetfullpath}.
-
-If it is not known wether a string contains a directory name or
-a complete file name (such as when interpreting user input) you need to use
-the static function \helpref{wxFileName::DirExists}{wxfilenamedirexists}
-(or its identical variants \helpref{wxDir::Exists}{wxdirexists} and
-\helpref{wxDirExists}{functionwxdirexists}) and construct the wxFileName
-instance accordingly. This will only work if the directory actually exists,
-of course:
-
-\begin{verbatim}
-wxString user_input;
-// get input from user
-
-wxFileName fname;
-if (wxDirExists(user_input))
-    fname.AssignDir( user_input );
-else
-    fname.Assign( user_input );
-\end{verbatim}
-
 \wxheading{Derived from}

 No base class
@@ -142,8 +101,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}


@@ -618,12 +575,6 @@ under Windows and the inode change time under Unix (as it is impossible to
 retrieve the real file creation time there anyhow) which can also be changed
 by many operations after the file creation.

-If no filename or extension is specified in this instance of wxFileName
-(and therefore \helpref{IsDir}{wxfilenameisdir} returns {\tt true}) then
-this function will return the directory times of the path specified by
-\helpref{GetPath}{wxfilenamegetpath}, otherwise the file times of the
-file specified by \helpref{GetFullPath}{wxfilenamegetfullpath}.
-
 Any of the pointers may be {\tt NULL} if the corresponding time is not
 needed.

--- a/docs/latex/wx/filepicker.tex
+++ b/docs/latex/wx/filepicker.tex
@@ -51,9 +51,6 @@ NB: the wxFD\_MULTIPLE style of wxFileDialog is not supported!

 \wxheading{Event handling}

-To process a file picker event, use these event handler macros to direct input to member
-functions that take a \helpref{wxFileDirPickerEvent}{wxfiledirpickerevent} argument.
-
 \twocolwidtha{7cm}%
 \begin{twocollist}\itemsep=0pt
 \twocolitem{{\bf EVT\_FILEPICKER\_CHANGED(id, func)}}{The user changed the file
--- a/docs/latex/wx/filesys.tex
+++ b/docs/latex/wx/filesys.tex
@@ -153,7 +153,7 @@ Returns the next filename that matches parameters passed to \helpref{FindFirst}{

 \membersection{wxFileSystem::OpenFile}\label{wxfilesystemopenfile}

-\func{wxFSFile*}{OpenFile}{\param{const wxString\& }{location}, \param{int }{flags = wxFS\_READ}}
+\func{wxFSFile*}{OpenFile}{\param{const wxString\& }{location}}

 Opens the file and returns a pointer to a \helpref{wxFSFile}{wxfsfile} object
 or NULL if failed. It first tries to open the file in relative scope
@@ -161,22 +161,6 @@ or NULL if failed. It first tries to open the file in relative scope
 absolute path.  Note that the user is responsible for deleting the returned
 wxFSFile.  

-{\it flags} can be one or more of the following bit values ored together:
-
-\begin{verbatim}
-// Open Bit Flags
-enum {
-    wxFS_READ = 1,      // Open for reading
-    wxFS_SEEKABLE = 4   // Returned stream will be seekable
-};
-\end{verbatim}
-
-A stream opened with just the default {\it wxFS\_READ} flag may
-or may not be seekable depending on the underlying source.
-Passing {\it wxFS\_READ | wxFS\_SEEKABLE} for {\it flags} will
-back a stream that is not natively seekable with memory or a file
-and return a stream that is always seekable.
-

 \membersection{wxFileSystem::URLToFileName}\label{wxfilesystemurltofilename}

--- a/docs/latex/wx/font.tex
+++ b/docs/latex/wx/font.tex
@@ -4,13 +4,6 @@ A font is an object which determines the appearance of text. Fonts are
 used for drawing text to a device context, and setting the appearance of
 a window's text.

-This class uses \helpref{reference counting and copy-on-write}{trefcount}
-internally so that assignments between two instances of this class are very
-cheap. You can therefore use actual objects instead of pointers without
-efficiency problems. If an instance of this class is changed it will create
-its own data internally so that other instances, which previously shared the
-data using the reference counting, are not affected.
-
 You can retrieve the current system font settings with \helpref{wxSystemSettings}{wxsystemsettings}.

 \helpref{wxSystemSettings}{wxsystemsettings}
--- a/docs/latex/wx/fontpicker.tex
+++ b/docs/latex/wx/fontpicker.tex
@@ -44,9 +44,6 @@ The text control is automatically synchronized with button's value. Use function

 \wxheading{Event handling}

-To process a font picker event, use these event handler macros to direct input to member
-functions that take a \helpref{wxFontPickerEvent}{wxfontpickerevent} argument.
-
 \twocolwidtha{7cm}%
 \begin{twocollist}\itemsep=0pt
 \twocolitem{{\bf EVT\_FONTPICKER\_CHANGED(id, func)}}{The user changed the font
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -312,10 +312,10 @@ and so normally is not useful.

 \membersection{wxCHECK\_GCC\_VERSION}\label{wxcheckgccversion}

-\func{bool}{wxCHECK\_GCC\_VERSION}{\param{}{major, minor}}
+\func{bool}{wxCHECK\_GCC\_VERSION}{\param{}{major, minor, release}}

 Returns $1$ if the compiler being used to compile the code is GNU C++
-compiler (g++) version major.minor or greater. Otherwise, and also if
+compiler (g++) version major.minor.release or greater. Otherwise, and also if
 the compiler is not GNU C++ at all, returns $0$.


@@ -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}

@@ -3095,7 +3089,7 @@ always returns \NULL in the other ports).

 \wxheading{Include files}

-<wx/window.h>
+<wx/windows.h>


 \membersection{::wxGetBatteryState}\label{wxgetbatterystate}
--- a/docs/latex/wx/graphicsmatrix.tex
+++ b/docs/latex/wx/graphicsmatrix.tex
@@ -11,7 +11,7 @@

 \section{\class{wxGraphicsMatrix}}\label{wxgraphicsmatrix}

-A wxGraphicsMatrix is a native representation of an affine matrix. The contents are specific and private to the respective renderer. Instances are ref counted and can therefore be assigned as usual. The only way to get a valid instance is via a CreateMatrix call on the graphics context or the renderer instance.
+A wxGraphicsMatrix is a native representation of an affine matrix. The contents are specific an private to the respective renderer. Instances are ref counted and can therefore be assigned as usual. The only way to get a valid instance is via a CreateMatrix call on the graphics context or the renderer instance.

 \wxheading{Derived from}

@@ -32,17 +32,6 @@ Concatenates the matrix passed with the current matrix.
 \func{void}{Concat}{\param{const wxGraphicsMatrix\& }{t}}


-\membersection{wxGraphicsMatrix::Get}\label{wxgraphicsmatrixget}
-
-\constfunc{void }{Get}{\param{wxDouble* }{a=NULL}, 
-                       \param{wxDouble* }{b=NULL}, 
-                       \param{wxDouble* }{c=NULL}, 
-                       \param{wxDouble* }{d=NULL}, 
-                       \param{wxDouble* }{tx=NULL}, 
-                       \param{wxDouble* }{ty=NULL}}
-
-Returns the component values of the matrix via the argument pointers.
-
 \membersection{wxGraphicsMatrix::GetNativeMatrix}\label{wxgraphicsmatrixgetnativematrix}

 \constfunc{void *}{GetNativeMatrix}{\void}
--- a/docs/latex/wx/hthlpfrm.tex
+++ b/docs/latex/wx/hthlpfrm.tex
@@ -186,17 +186,17 @@ the embedded window to be destroyed independently of the help controller.

 \func{}{wxHtmlHelpWindow}{\param{wxHtmlHelpData* }{data = NULL}}

-\func{}{wxHtmlHelpWindow}{\param{wxWindow* }{parent}, \param{int }{wxWindowID}, \param{const wxPoint\&}{ pos = wxDefaultPosition}, \param{const wxSize\&}{ pos = wxDefaultSize}, \param{int }{style = wxTAB\_TRAVERSAL|wxTAB\_wxNO_BORDER}, \param{int }{helpStyle = wxHF\_DEFAULT\_STYLE}, \param{wxHtmlHelpData* }{data = NULL}}
+\func{}{wxHtmlHelpWindow}{\param{wxWindow* }{parent}, \param{int }{wxWindowID}, \param{int }{style = wxHF\_DEFAULT\_STYLE}, \param{wxHtmlHelpData* }{data = NULL}}

 Constructor.

-Constructor. For the values of {\it helpStyle}, please see the documentation for \helpref{wxHtmlHelpController}{wxhtmlhelpcontroller}.
+Constructor. For the values of {\it style}, please see the documentation for \helpref{wxHtmlHelpController}{wxhtmlhelpcontroller}.

 \membersection{wxHtmlHelpWindow::Create}\label{wxhtmlhelpwindowcreate}

-\func{bool}{Create}{\param{wxWindow* }{parent}, \param{wxWindowID }{id}, \param{const wxPoint\&}{ pos = wxDefaultPosition}, \param{const wxSize\&}{ pos = wxDefaultSize}, \param{int }{style = wxTAB\_TRAVERSAL|wxTAB\_wxNO_BORDER}, \param{int }{helpStyle = wxHF\_DEFAULT\_STYLE}, \param{wxHtmlHelpData* }{data = NULL}}
+\func{bool}{Create}{\param{wxWindow* }{parent}, \param{wxWindowID }{id}, \param{const wxString\& }{title = wxEmptyString}, \param{int }{style = wxHF\_DEFAULT\_STYLE}}

-Creates the help window. See \helpref{the constructor}{wxhtmlhelpwindowwxhtmlhelpwindow}
+Creates the frame. See \helpref{the constructor}{wxhtmlhelpwindowwxhtmlhelpwindow}
 for a description of the parameters.

 \membersection{wxHtmlHelpWindow::CreateContents}\label{wxhtmlhelpwindowcreatecontents}
--- a/docs/latex/wx/htmllbox.tex
+++ b/docs/latex/wx/htmllbox.tex
@@ -42,9 +42,9 @@ functions that take a \helpref{wxHtmlCellEvent}{wxhtmlcellevent} argument or a \

 \twocolwidtha{7cm}
 \begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf EVT\_HTML\_CELL\_CLICKED(id, func)}}{A \helpref{wxHtmlCell}{wxhtmlcell} was clicked.}
-\twocolitem{{\bf EVT\_HTML\_CELL\_HOVER(id, func)}}{The mouse passed over a \helpref{wxHtmlCell}{wxhtmlcell}.}
-\twocolitem{{\bf EVT\_HTML\_LINK\_CLICKED(id, func)}}{A \helpref{wxHtmlCell}{wxhtmlcell} which contains an hyperlink was clicked.}
+\twocolitem{{\bf EVT\_HTMLWINDOW\_CELL\_CLICKED(id, func)}}{A \helpref{wxHtmlCell}{wxhtmlcell} was clicked.}
+\twocolitem{{\bf EVT\_HTMLWINDOW\_CELL\_HOVER(id, func)}}{The mouse passed over a {\helpref{wxHtmlCell}{wxhtmlcell}.}
+\twocolitem{{\bf EVT\_HTMLWINDOW\_LINK\_CLICKED(id, func)}}{A \helpref{wxHtmlCell}{wxhtmlcell} which contains an hyperlink was clicked.}
 \end{twocollist}


@@ -80,7 +80,7 @@ Creates the control and optionally sets the initial number of items in it
 \helpref{SetItemCount()}{wxvlistboxsetitemcount}).

 There are no special styles defined for wxHtmlListBox, in particular the
-wxListBox styles (with the exception of {\tt wxLB\_MULTIPLE}) can not be used here.
+wxListBox styles (with the exception of {\tt wxLB_MULTIPLE}) can not be used here.

 Returns {\tt true} on success or {\tt false} if the control couldn't be created

@@ -231,7 +231,7 @@ or {\tt <body>} tags.

 \twocolwidtha{5cm}%
 \begin{twocollist}\itemsep=0pt
-\twocolitem{\windowstyle{wxHLB\_DEFAULT\_STYLE}}{The default style: wxSUNKEN\_BORDER}
+\twocolitem{\windowstyle{wxHLB\_DEFAULT\_STYLE}}{The default style: wxSUNKEN_BORDER}
 \twocolitem{\windowstyle{wxHLB\_MULTIPLE}}{Multiple-selection list: the user can toggle multiple
 items on and off.}
 \end{twocollist}
@@ -258,9 +258,9 @@ or a \helpref{wxHtmlLinkEvent}{wxhtmllinkevent}:

 \twocolwidtha{7cm}
 \begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf EVT\_HTML\_CELL\_CLICKED(id, func)}}{A \helpref{wxHtmlCell}{wxhtmlcell} was clicked.}
-\twocolitem{{\bf EVT\_HTML\_CELL\_HOVER(id, func)}}{The mouse passed over a \helpref{wxHtmlCell}{wxhtmlcell}.}
-\twocolitem{{\bf EVT\_HTML\_LINK\_CLICKED(id, func)}}{A \helpref{wxHtmlCell}{wxhtmlcell} which contains an hyperlink was clicked.}
+\twocolitem{{\bf EVT\_HTMLWINDOW\_CELL\_CLICKED(id, func)}}{A \helpref{wxHtmlCell}{wxhtmlcell} was clicked.}
+\twocolitem{{\bf EVT\_HTMLWINDOW\_CELL\_HOVER(id, func)}}{The mouse passed over a {\helpref{wxHtmlCell}{wxhtmlcell}.}
+\twocolitem{{\bf EVT\_HTMLWINDOW\_LINK\_CLICKED(id, func)}}{A \helpref{wxHtmlCell}{wxhtmlcell} which contains an hyperlink was clicked.}
 \end{twocollist}


--- a/docs/latex/wx/htwindow.tex
+++ b/docs/latex/wx/htwindow.tex
@@ -53,9 +53,9 @@ functions that take a \helpref{wxHtmlCellEvent}{wxhtmlcellevent} argument or a \

 \twocolwidtha{7cm}
 \begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf EVT\_HTML\_CELL\_CLICKED(id, func)}}{A \helpref{wxHtmlCell}{wxhtmlcell} was clicked.}
-\twocolitem{{\bf EVT\_HTML\_CELL\_HOVER(id, func)}}{The mouse passed over a \helpref{wxHtmlCell}{wxhtmlcell}.}
-\twocolitem{{\bf EVT\_HTML\_LINK\_CLICKED(id, func)}}{A \helpref{wxHtmlCell}{wxhtmlcell} which contains an hyperlink was clicked.}
+\twocolitem{{\bf EVT\_HTMLWINDOW\_CELL\_CLICKED(id, func)}}{A \helpref{wxHtmlCell}{wxhtmlcell} was clicked.}
+\twocolitem{{\bf EVT\_HTMLWINDOW\_CELL\_HOVER(id, func)}}{The mouse passed over a {\helpref{wxHtmlCell}{wxhtmlcell}.}
+\twocolitem{{\bf EVT\_HTMLWINDOW\_LINK\_CLICKED(id, func)}}{A \helpref{wxHtmlCell}{wxhtmlcell} which contains an hyperlink was clicked.}
 \end{twocollist}


@@ -503,7 +503,7 @@ direct input to member function that take a \helpref{wxHtmlLinkEvent}{wxhtmllink

 \twocolwidtha{7cm}
 \begin{twocollist}
-\twocolitem{{\bf EVT\_HTML\_LINK\_CLICKED(id, func)}}{User clicked on an hyperlink.}
+\twocolitem{{\bf EVT\_HTMLWINDOW\_LINK\_CLICKED(id, func)}}{User clicked on an hyperlink.}
 \end{twocollist}


@@ -548,8 +548,8 @@ direct input to member function that take a \helpref{wxHtmlCellEvent}{wxhtmlcell

 \twocolwidtha{7cm}
 \begin{twocollist}
-\twocolitem{{\bf EVT\_HTML\_CELL\_HOVER(id, func)}}{User moved the mouse over a \helpref{wxHtmlCell}{wxhtmlcell}.}
-\twocolitem{{\bf EVT\_HTML\_CELL\_CLICKED(id, func)}}{User clicked on a \helpref{wxHtmlCell}{wxhtmlcell}. When handling this event, remember to use \helpref{wxHtmlCell::SetLinkClicked(true)}{wxhtmlcelleventsetlinkclicked} if the cell contains a link.}
+\twocolitem{{\bf EVT\_HTMLWINDOW\_CELL\_HOVER(id, func)}}{User moved the mouse over a \helpref{wxHtmlCell}{wxhtmlcell}.}
+\twocolitem{{\bf EVT\_HTMLWINDOW\_CELL\_CLICKED(id, func)}}{User clicked on a \helpref{wxHtmlCell}{wxhtmlcell}. When handling this event, remember to use \helpref{wxHtmlCell::SetLinkClicked(true)}{wxhtmlcelleventsetlinkclicked} if the cell contains a link.}
 \end{twocollist}


--- a/docs/latex/wx/listctrl.tex
+++ b/docs/latex/wx/listctrl.tex
@@ -38,12 +38,6 @@ Using many of wxListCtrl features is shown in the
 To intercept events from a list control, use the event table macros described
 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.
-
 \wxheading{Derived from}

 \helpref{wxControl}{wxcontrol}\\
@@ -259,9 +253,7 @@ Ensures this item is visible.
 \func{long}{FindItem}{\param{long }{start}, \param{const wxString\& }{str}, \param{const bool }{partial = false}}

 Find an item whose label matches this string, starting from {\it start} or
-the beginning if {\it start} is -1. The string comparison is case
-insensitive. If {\it partial} is true then this method will look for
-items which begin with {\it str}.
+the beginning if {\it start} is -1.

 \func{long}{FindItem}{\param{long }{start}, \param{long }{data}}

@@ -334,8 +326,7 @@ or small icon view).
 Returns the edit control being currently used to edit a label. Returns {\tt NULL}
 if no label is being edited.

-{\bf NB:} It is currently only implemented for wxMSW and the generic version,
-not for the native Mac OS X version.
+{\bf NB:} It is currently only implemented for wxMSW.


 \membersection{wxListCtrl::GetImageList}\label{wxlistctrlgetimagelist}
--- a/docs/latex/wx/locale.tex
+++ b/docs/latex/wx/locale.tex
@@ -433,7 +433,7 @@ given a two letter ISO language code, use
 wxLanguageInfo structure. See \helpref{AddLanguage}{wxlocaleaddlanguage} for
 the wxLanguageInfo description.

-\newsince{2.7.1}. 
+\newsince{2.7.1}. Currently only implemented under Windows.


 \membersection{wxLocale::IsLoaded}\label{wxlocaleisloaded}
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -26,13 +26,13 @@
 %\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}$$}
 }}
 \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
 Robin Dunn, et al}
-\date{January, 2007}
+\date{November, 2006}
 }
 \makeindex
 \begin{document}
@@ -668,7 +668,6 @@ That's all there is to it!
 \input constant.tex
 \input category.tex
 \input topics.tex
-\input topics2.tex
 \input portnote.tex
 % Deprecated classes
 %\input proplist.tex
--- a/Show More
+++ b/Show More