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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxPy_2_8_1_0@44177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
don't use default style
2007-01-08 23:54:11 +00:00 · 2007-01-08 23:54:11 +00:00 · 2007-01-08 23:45:11 +00:00 · 2007-01-08 23:31:44 +00:00 · 2007-01-08 23:10:39 +00:00 · 2007-01-08 22:58:22 +00:00
402 changed files with 23584 additions and 6515 deletions
--- a/Makefile.in
+++ b/Makefile.in
@@ -2157,6 +2157,7 @@ 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 \
@@ -2230,6 +2231,9 @@ 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 \
@@ -2237,6 +2241,7 @@ 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 \
@@ -2871,6 +2876,7 @@ 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 \
@@ -2988,6 +2994,7 @@ 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 \
@@ -3096,6 +3103,7 @@ 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 \
@@ -3497,6 +3505,7 @@ 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 \
@@ -3532,6 +3541,7 @@ 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 \
@@ -3670,6 +3680,7 @@ 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 \
@@ -3705,6 +3716,7 @@ 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 \
@@ -3717,6 +3729,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
@COND_TOOLKIT_COCOA@	monodll_gsockosx.o monodll_hid.o monodll_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_fontmgrcmn.o \
+	monodll_socketevtdispatch.o \
 	monodll_caret.o \
 	monodll_colour.o \
 	monodll_icon.o \
@@ -3981,6 +3994,7 @@ 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 \
@@ -3997,7 +4011,6 @@ 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 \
@@ -4263,6 +4276,7 @@ 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 \
@@ -4548,6 +4562,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS =  \
@COND_TOOLKIT_COCOA@	monodll_gsockosx.o monodll_hid.o monodll_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_fontmgrcmn.o \
+	monodll_socketevtdispatch.o \
 	monodll_caret.o \
 	monodll_colour.o \
 	monodll_icon.o \
@@ -4812,6 +4827,7 @@ 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 \
@@ -4828,7 +4844,6 @@ 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 \
@@ -5271,6 +5286,7 @@ 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 \
@@ -5306,6 +5322,7 @@ 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 \
@@ -5444,6 +5461,7 @@ 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 \
@@ -5479,6 +5497,7 @@ 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 \
@@ -5491,6 +5510,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
@COND_TOOLKIT_COCOA@	monolib_gsockosx.o monolib_hid.o monolib_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_fontmgrcmn.o \
+	monolib_socketevtdispatch.o \
 	monolib_caret.o \
 	monolib_colour.o \
 	monolib_icon.o \
@@ -5756,6 +5776,7 @@ 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 \
@@ -5772,7 +5793,6 @@ 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 \
@@ -6038,6 +6058,7 @@ 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 \
@@ -6323,6 +6344,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 =  \
@COND_TOOLKIT_COCOA@	monolib_gsockosx.o monolib_hid.o monolib_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_fontmgrcmn.o \
+	monolib_socketevtdispatch.o \
 	monolib_caret.o \
 	monolib_colour.o \
 	monolib_icon.o \
@@ -6588,6 +6610,7 @@ 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 \
@@ -6604,7 +6627,6 @@ 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 \
@@ -7275,6 +7297,7 @@ 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 \
@@ -7310,6 +7333,7 @@ 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 \
@@ -7448,6 +7472,7 @@ 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 \
@@ -7483,6 +7508,7 @@ 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 \
@@ -7495,6 +7521,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
@COND_TOOLKIT_COCOA@	coredll_gsockosx.o coredll_hid.o coredll_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_fontmgrcmn.o \
+	coredll_socketevtdispatch.o \
 	coredll_caret.o \
 	coredll_colour.o \
 	coredll_icon.o \
@@ -7760,6 +7787,7 @@ 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 \
@@ -7776,7 +7804,6 @@ 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 \
@@ -8042,6 +8069,7 @@ 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 \
@@ -8327,6 +8355,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 =  \
@COND_TOOLKIT_COCOA@	coredll_gsockosx.o coredll_hid.o coredll_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_fontmgrcmn.o \
+	coredll_socketevtdispatch.o \
 	coredll_caret.o \
 	coredll_colour.o \
 	coredll_icon.o \
@@ -8592,6 +8621,7 @@ 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 \
@@ -8608,7 +8638,6 @@ 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 \
@@ -8723,6 +8752,7 @@ 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 \
@@ -8758,6 +8788,7 @@ 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 \
@@ -8896,6 +8927,7 @@ 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 \
@@ -8931,6 +8963,7 @@ 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 \
@@ -8943,6 +8976,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
@COND_TOOLKIT_COCOA@	corelib_gsockosx.o corelib_hid.o corelib_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_fontmgrcmn.o \
+	corelib_socketevtdispatch.o \
 	corelib_caret.o \
 	corelib_colour.o \
 	corelib_icon.o \
@@ -9208,6 +9242,7 @@ 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 \
@@ -9224,7 +9259,6 @@ 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 \
@@ -9490,6 +9524,7 @@ 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 \
@@ -9775,6 +9810,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 =  \
@COND_TOOLKIT_COCOA@	corelib_gsockosx.o corelib_hid.o corelib_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_fontmgrcmn.o \
+	corelib_socketevtdispatch.o \
 	corelib_caret.o \
 	corelib_colour.o \
 	corelib_icon.o \
@@ -10040,6 +10076,7 @@ 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 \
@@ -10056,7 +10093,6 @@ 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 \
@@ -12852,6 +12888,9 @@ 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

@@ -14781,8 +14820,11 @@ 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_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_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_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
@@ -16224,6 +16266,9 @@ 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

@@ -16329,6 +16374,9 @@ 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

@@ -16959,6 +17007,9 @@ 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

@@ -18888,8 +18939,11 @@ 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_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_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_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
@@ -20331,6 +20385,9 @@ 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

@@ -20436,6 +20493,9 @@ 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

@@ -22065,6 +22125,9 @@ 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

@@ -23376,8 +23439,11 @@ 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_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_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_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
@@ -24783,6 +24849,9 @@ 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

@@ -24888,6 +24957,9 @@ 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

@@ -25008,6 +25080,9 @@ 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

@@ -26319,8 +26394,11 @@ 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_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_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_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
@@ -27726,6 +27804,9 @@ 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

@@ -27831,6 +27912,9 @@ 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=$CXX
+        AR=${AR:-"$CXX"}
        AC_SUBST(AR)
-        AROPTIONS="-xar -o"
+        AROPTIONS=${AROPTIONS:-"-xar -o"}
    else
        AC_CHECK_TOOL(AR, ar, ar)
        AROPTIONS=rcu
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -638,6 +638,7 @@ 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
@@ -673,6 +674,7 @@ 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
@@ -736,6 +738,7 @@ 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
@@ -854,6 +857,7 @@ 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
@@ -1395,6 +1399,7 @@ 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
@@ -1411,7 +1416,6 @@ 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
@@ -1814,6 +1818,7 @@ 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
@@ -2135,6 +2140,7 @@ 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
@@ -2227,6 +2233,7 @@ 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
@@ -2303,6 +2310,9 @@ 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
@@ -2310,6 +2320,7 @@ 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
@@ -3158,6 +3169,7 @@ 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/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1490,6 +1490,7 @@ ____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 \
@@ -1525,6 +1526,7 @@ ____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 \
@@ -1713,6 +1715,7 @@ ____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 \
@@ -1748,6 +1751,7 @@ ____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 \
@@ -2102,6 +2106,7 @@ ____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 \
@@ -2137,6 +2142,7 @@ ____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 \
@@ -2325,6 +2331,7 @@ ____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 \
@@ -2360,6 +2367,7 @@ ____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 \
@@ -2622,6 +2630,7 @@ ____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 \
@@ -2657,6 +2666,7 @@ ____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 \
@@ -2845,6 +2855,7 @@ ____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 \
@@ -2880,6 +2891,7 @@ ____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 \
@@ -3069,6 +3081,7 @@ ____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 \
@@ -3104,6 +3117,7 @@ ____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 \
@@ -3292,6 +3306,7 @@ ____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 \
@@ -3327,6 +3342,7 @@ ____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 \
@@ -6161,6 +6177,11 @@ $(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) $**
@@ -6336,6 +6357,11 @@ $(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) $**
@@ -8148,6 +8174,11 @@ $(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) $**
@@ -8323,6 +8354,11 @@ $(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) $**
@@ -10159,6 +10195,11 @@ $(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) $**
@@ -10334,6 +10375,11 @@ $(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) $**
@@ -11424,6 +11470,11 @@ $(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) $**
@@ -11599,6 +11650,11 @@ $(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,6 +1500,7 @@ ____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 \
@@ -1535,6 +1536,7 @@ ____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 \
@@ -1725,6 +1727,7 @@ ____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 \
@@ -1760,6 +1763,7 @@ ____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 \
@@ -2118,6 +2122,7 @@ ____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 \
@@ -2153,6 +2158,7 @@ ____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 \
@@ -2343,6 +2349,7 @@ ____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 \
@@ -2378,6 +2385,7 @@ ____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 \
@@ -2654,6 +2662,7 @@ ____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 \
@@ -2689,6 +2698,7 @@ ____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 \
@@ -2879,6 +2889,7 @@ ____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 \
@@ -2914,6 +2925,7 @@ ____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 \
@@ -3109,6 +3121,7 @@ ____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 \
@@ -3144,6 +3157,7 @@ ____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 \
@@ -3334,6 +3348,7 @@ ____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 \
@@ -3369,6 +3384,7 @@ ____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 \
@@ -6378,6 +6394,11 @@ $(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) $<
@@ -6553,6 +6574,11 @@ $(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) $<
@@ -8465,6 +8491,11 @@ $(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) $<
@@ -8640,6 +8671,11 @@ $(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) $<
@@ -10576,6 +10612,11 @@ $(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) $<
@@ -10751,6 +10792,11 @@ $(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) $<
@@ -11941,6 +11987,11 @@ $(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) $<
@@ -12116,6 +12167,11 @@ $(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,6 +1657,7 @@ ____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 \
@@ -1692,6 +1693,7 @@ ____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 \
@@ -1880,6 +1882,7 @@ ____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 \
@@ -1915,6 +1918,7 @@ ____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 \
@@ -2275,6 +2279,7 @@ ____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 \
@@ -2310,6 +2315,7 @@ ____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 \
@@ -2498,6 +2504,7 @@ ____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 \
@@ -2533,6 +2540,7 @@ ____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 \
@@ -2825,6 +2833,7 @@ ____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 \
@@ -2860,6 +2869,7 @@ ____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 \
@@ -3048,6 +3058,7 @@ ____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 \
@@ -3083,6 +3094,7 @@ ____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 \
@@ -3278,6 +3290,7 @@ ____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 \
@@ -3313,6 +3326,7 @@ ____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 \
@@ -3501,6 +3515,7 @@ ____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 \
@@ -3536,6 +3551,7 @@ ____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 \
@@ -6494,6 +6510,11 @@ $(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) $**
@@ -6669,6 +6690,11 @@ $(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) $**
@@ -8481,6 +8507,11 @@ $(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) $**
@@ -8656,6 +8687,11 @@ $(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) $**
@@ -10492,6 +10528,11 @@ $(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) $**
@@ -10667,6 +10708,11 @@ $(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) $**
@@ -11757,6 +11803,11 @@ $(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) $**
@@ -11932,6 +11983,11 @@ $(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,6 +383,7 @@ ____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 &
@@ -418,6 +419,7 @@ ____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 &
@@ -608,6 +610,7 @@ ____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 &
@@ -643,6 +646,7 @@ ____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 &
@@ -1005,6 +1009,7 @@ ____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 &
@@ -1040,6 +1045,7 @@ ____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 &
@@ -1230,6 +1236,7 @@ ____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 &
@@ -1265,6 +1272,7 @@ ____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 &
@@ -1548,6 +1556,7 @@ ____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 &
@@ -1583,6 +1592,7 @@ ____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 &
@@ -1773,6 +1783,7 @@ ____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 &
@@ -1808,6 +1819,7 @@ ____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 &
@@ -2005,6 +2017,7 @@ ____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 &
@@ -2040,6 +2053,7 @@ ____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 &
@@ -2230,6 +2244,7 @@ ____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 &
@@ -2265,6 +2280,7 @@ ____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 &
@@ -6606,6 +6622,11 @@ $(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) $<
@@ -6781,6 +6802,11 @@ $(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) $<
@@ -8693,6 +8719,11 @@ $(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) $<
@@ -8868,6 +8899,11 @@ $(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) $<
@@ -10804,6 +10840,11 @@ $(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) $<
@@ -10979,6 +11020,11 @@ $(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) $<
@@ -12169,6 +12215,11 @@ $(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) $<
@@ -12344,6 +12395,11 @@ $(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,6 +778,10 @@ 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
@@ -4674,6 +4678,10 @@ 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"
@@ -8353,6 +8361,10 @@ 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
@@ -9193,6 +9205,10 @@ 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
@@ -9265,6 +9281,10 @@ 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,6 +970,10 @@ 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,6 +352,7 @@ ____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 &
@@ -387,6 +388,7 @@ ____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 &
@@ -527,6 +529,7 @@ ____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 &
@@ -562,6 +565,7 @@ ____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 &
@@ -893,6 +897,7 @@ ____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 &
@@ -928,6 +933,7 @@ ____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 &
@@ -1068,6 +1074,7 @@ ____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 &
@@ -1103,6 +1110,7 @@ ____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 &
@@ -1360,6 +1368,7 @@ ____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 &
@@ -1395,6 +1404,7 @@ ____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 &
@@ -1535,6 +1545,7 @@ ____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 &
@@ -1570,6 +1581,7 @@ ____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 &
@@ -1748,6 +1760,7 @@ ____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 &
@@ -1783,6 +1796,7 @@ ____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 &
@@ -1923,6 +1937,7 @@ ____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 &
@@ -1958,6 +1973,7 @@ ____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 &
@@ -5986,6 +6002,11 @@ $(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) $<
@@ -6161,6 +6182,11 @@ $(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) $<
@@ -7844,6 +7870,11 @@ $(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) $<
@@ -8019,6 +8050,11 @@ $(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) $<
@@ -9684,6 +9720,11 @@ $(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) $<
@@ -9859,6 +9900,11 @@ $(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) $<
@@ -10886,6 +10932,11 @@ $(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) $<
@@ -11061,6 +11112,11 @@ $(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/win_docs.bat
+++ b/build/script/win_docs.bat
@@ -1,12 +1,12 @@
 rem Uncomment the next line to set the version; used also in wxWidgets.iss
-rem SET WXW_VER=2.8.0
+SET WXW_VER=2.8.1
 if (%WXW_VER%)==() SET WXW_VER=CVS

 echo docs building for %WXW_VER%

 rem  This builds the docs in %WXWIN% in a number of formats 
 rem  and a clean inno setup in a second tree
-rem  it uses a number of tools nmake, gnuwin32 zip, ghostscript, MS word, cvsNT
+rem  it uses a number of tools nmake, gnuwin32 zip & dos2unix, ghostscript, MS word, cvsNT
 rem  cvs is in the path already from CVSNT install
 rem  writes a log file in c:\

@@ -18,14 +18,22 @@ 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 module only)
+rem update wxwidgets (holds docs) and inno (cvs wxMSW setup.exe 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...
--- a/242
+++ b/242
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Id: configure.in.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.0.
+# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.1.
 #
 # Report bugs to <wx-dev@lists.wxwidgets.org>.
 #
@@ -270,8 +270,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='wxWidgets'
 PACKAGE_TARNAME='wxwidgets'
-PACKAGE_VERSION='2.8.0'
-PACKAGE_STRING='wxWidgets 2.8.0'
+PACKAGE_VERSION='2.8.1'
+PACKAGE_STRING='wxWidgets 2.8.1'
 PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'

 ac_unique_file="wx-config.in"
@@ -870,7 +870,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures wxWidgets 2.8.0 to adapt to many kinds of systems.
+\`configure' configures wxWidgets 2.8.1 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -936,7 +936,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of wxWidgets 2.8.0:";;
+     short | recursive ) echo "Configuration of wxWidgets 2.8.1:";;
   esac
  cat <<\_ACEOF

@@ -1086,6 +1086,7 @@ Optional Features:
  --enable-radiobtn       use wxRadioButton class
  --enable-sash           use wxSashWindow class
  --enable-scrollbar      use wxScrollBar class and scrollable windows
+  --enable-searchctrl     use wxSearchCtrl class
  --enable-slider         use wxSlider class
  --enable-spinbtn        use wxSpinButton class
  --enable-spinctrl       use wxSpinCtrl class
@@ -1338,7 +1339,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
  cat <<\_ACEOF
-wxWidgets configure 2.8.0
+wxWidgets configure 2.8.1
 generated by GNU Autoconf 2.59

 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1352,7 +1353,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by wxWidgets $as_me 2.8.0, which was
+It was created by wxWidgets $as_me 2.8.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was

  $ $0 $@
@@ -1803,7 +1804,7 @@ test -n "$target_alias" &&

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

 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
@@ -2365,6 +2366,7 @@ 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
@@ -2588,6 +2590,7 @@ 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
@@ -7997,6 +8000,7 @@ 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
@@ -8049,6 +8053,7 @@ 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
@@ -9505,6 +9510,47 @@ echo "${ECHO_T}no" >&6
          fi


+          enablestring=
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-searchctrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-searchctrl... $ECHO_C" >&6
+          no_cache=0
+          # Check whether --enable-searchctrl or --disable-searchctrl was given.
+if test "${enable_searchctrl+set}" = set; then
+  enableval="$enable_searchctrl"
+
+                          if test "$enableval" = yes; then
+                            ac_cv_use_searchctrl='wxUSE_SEARCHCTRL=yes'
+                          else
+                            ac_cv_use_searchctrl='wxUSE_SEARCHCTRL=no'
+                          fi
+
+else
+
+                          LINE=`grep "wxUSE_SEARCHCTRL" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_searchctrl='wxUSE_SEARCHCTRL='$DEFAULT_wxUSE_SEARCHCTRL
+
+fi;
+
+          eval "$ac_cv_use_searchctrl"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_searchctrl >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_SEARCHCTRL" = yes; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+          else
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+          fi
+
+
          enablestring=
          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-slider" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-slider... $ECHO_C" >&6
@@ -13001,17 +13047,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___INTEL_COMPILER" >&5
 echo "${ECHO_T}$bakefile_cv_c_compiler___INTEL_COMPILER" >&6
+    if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then
+        :; INTELCC=yes
+    else
+        :;
+    fi
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu

-    if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then
-        :; INTELCC=yes
-    else
-        :;
-    fi


        if test "x$GCC" != "xyes"; then
@@ -13440,17 +13486,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&5
 echo "${ECHO_T}$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&6
+    if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then
+        :; SGICC=yes
+    else
+        :;
+    fi
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu

-    if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then
-        :; SGICC=yes
-    else
-        :;
-    fi


                ;;
@@ -13523,17 +13569,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___HP_cc" >&5
 echo "${ECHO_T}$bakefile_cv_c_compiler___HP_cc" >&6
+    if test "x$bakefile_cv_c_compiler___HP_cc" = "xyes"; then
+        :; HPCC=yes
+    else
+        :;
+    fi
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu

-    if test "x$bakefile_cv_c_compiler___HP_cc" = "xyes"; then
-        :; HPCC=yes
-    else
-        :;
-    fi


                ;;
@@ -13606,17 +13652,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___DECC" >&5
 echo "${ECHO_T}$bakefile_cv_c_compiler___DECC" >&6
+    if test "x$bakefile_cv_c_compiler___DECC" = "xyes"; then
+        :; COMPAQCC=yes
+    else
+        :;
+    fi
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu

-    if test "x$bakefile_cv_c_compiler___DECC" = "xyes"; then
-        :; COMPAQCC=yes
-    else
-        :;
-    fi


                ;;
@@ -13689,17 +13735,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5
 echo "${ECHO_T}$bakefile_cv_c_compiler___SUNPRO_C" >&6
+    if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then
+        :; SUNCC=yes
+    else
+        :;
+    fi
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu

-    if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then
-        :; SUNCC=yes
-    else
-        :;
-    fi


                ;;
@@ -14431,17 +14477,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER" >&5
 echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER" >&6
+    if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER" = "xyes"; then
+        :; INTELCXX=yes
+    else
+        :;
+    fi
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu

-    if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then
-        :; INTELCXX=yes
-    else
-        :;
-    fi


        if test "x$GCXX" != "xyes"; then
@@ -14870,17 +14916,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&5
 echo "${ECHO_T}$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&6
+    if test "x$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" = "xyes"; then
+        :; SGICXX=yes
+    else
+        :;
+    fi
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu

-    if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then
-        :; SGICXX=yes
-    else
-        :;
-    fi


                ;;
@@ -14953,17 +14999,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___HP_aCC" >&5
 echo "${ECHO_T}$bakefile_cv_cxx_compiler___HP_aCC" >&6
+    if test "x$bakefile_cv_cxx_compiler___HP_aCC" = "xyes"; then
+        :; HPCXX=yes
+    else
+        :;
+    fi
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu

-    if test "x$bakefile_cv_c_compiler___HP_aCC" = "xyes"; then
-        :; HPCXX=yes
-    else
-        :;
-    fi


                ;;
@@ -15036,17 +15082,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___DECCXX" >&5
 echo "${ECHO_T}$bakefile_cv_cxx_compiler___DECCXX" >&6
+    if test "x$bakefile_cv_cxx_compiler___DECCXX" = "xyes"; then
+        :; COMPAQCXX=yes
+    else
+        :;
+    fi
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu

-    if test "x$bakefile_cv_c_compiler___DECCXX" = "xyes"; then
-        :; COMPAQCXX=yes
-    else
-        :;
-    fi


                ;;
@@ -15119,17 +15165,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5
 echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6
+    if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then
+        :; SUNCXX=yes
+    else
+        :;
+    fi
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu

-    if test "x$bakefile_cv_c_compiler___SUNPRO_CC" = "xyes"; then
-        :; SUNCXX=yes
-    else
-        :;
-    fi


                ;;
@@ -15219,7 +15265,8 @@ else
 fi


-if test -n "$ac_tool_prefix"; then
+if test "x$SUNCXX" != xyes; then
+    if test -n "$ac_tool_prefix"; then
  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -15298,10 +15345,11 @@ else
  AR="$ac_cv_prog_AR"
 fi

-if test "x$AR" = "x" ; then
-    { { echo "$as_me:$LINENO: error: ar is needed to build wxWidgets" >&5
+    if test "x$AR" = "x" ; then
+        { { echo "$as_me:$LINENO: error: ar is needed to build wxWidgets" >&5
 echo "$as_me: error: ar is needed to build wxWidgets" >&2;}
   { (exit 1); exit 1; }; }
+    fi
 fi

 # Find a good install program.  We prefer a C program (faster),
@@ -35850,7 +35898,7 @@ cat >>conftest.$ac_ext <<_ACEOF
                        int main (void)
                        {
                            char buffer[128];
-                            snprintf (buffer, 128, "%2\$d %3\$d %1\$d", 1, 2, 3);
+                            snprintf (buffer, 128, "%2$d %3$d %1$d", 1, 2, 3);
                            if (strcmp ("2 3 1", buffer) == 0)
                                exit (0);
                            exit (1);
@@ -46015,9 +46063,9 @@ _ACEOF
 fi

 if test "$wxUSE_DATAOBJ" = "yes"; then
-    if test "$wxUSE_MGL" = 1; then
-        { echo "$as_me:$LINENO: WARNING: wxDataObject not yet supported under MGL... disabled" >&5
-echo "$as_me: WARNING: wxDataObject not yet supported under MGL... disabled" >&2;}
+    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
+        { echo "$as_me:$LINENO: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&5
+echo "$as_me: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&2;}
        wxUSE_DATAOBJ=no
    else
        cat >>confdefs.h <<\_ACEOF
@@ -46033,9 +46081,9 @@ echo "$as_me: WARNING: Clipboard and drag-and-drop require wxDataObject -- disab
 fi

 if test "$wxUSE_CLIPBOARD" = "yes"; then
-    if test "$wxUSE_MGL" = 1; then
-        { echo "$as_me:$LINENO: WARNING: Clipboard not yet supported under MGL... disabled" >&5
-echo "$as_me: WARNING: Clipboard not yet supported under MGL... disabled" >&2;}
+    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
+        { echo "$as_me:$LINENO: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&5
+echo "$as_me: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&2;}
        wxUSE_CLIPBOARD=no
    fi

@@ -46056,21 +46104,10 @@ echo "$as_me: WARNING: Drag and drop is only supported under GTK+ 1.2... disable
        fi
    fi

-    if test "$wxUSE_MOTIF" = 1; then
-        { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under Motif... disabled" >&5
-echo "$as_me: WARNING: Drag and drop not yet supported under Motif... disabled" >&2;}
-        wxUSE_DRAG_AND_DROP=no
-    fi
-
-    if test "$wxUSE_X11" = 1; then
-        { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under X11... disabled" >&5
-echo "$as_me: WARNING: Drag and drop not yet supported under X11... disabled" >&2;}
-        wxUSE_DRAG_AND_DROP=no
-    fi
-
-    if test "$wxUSE_MGL" = 1; then
-        { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under MGL... disabled" >&5
-echo "$as_me: WARNING: Drag and drop not yet supported under MGL... disabled" >&2;}
+    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MGL" = 1 -o \
+            "$wxUSE_DFB" = 1; then
+        { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&5
+echo "$as_me: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&2;}
        wxUSE_DRAG_AND_DROP=no
    fi

@@ -46257,11 +46294,17 @@ _ACEOF
 fi

 if test "$wxUSE_DISPLAY" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
+    if test "$wxUSE_DFB" = 1 -o "$wxUSE_MGL" = 1; then
+        { echo "$as_me:$LINENO: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&5
+echo "$as_me: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&2;}
+        wxUSE_DISPLAY=no
+    else
+        cat >>confdefs.h <<\_ACEOF
 #define wxUSE_DISPLAY 1
 _ACEOF

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
+    fi
 fi

 if test "$wxUSE_DETECT_SM" = "yes"; then
@@ -46403,6 +46446,14 @@ _ACEOF
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
 fi

+if test "$wxUSE_SEARCHCTRL" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_SEARCHCTRL 1
+_ACEOF
+
+    USES_CONTROLS=1
+fi
+
 if test "$wxUSE_SLIDER" = "yes"; then
    cat >>confdefs.h <<\_ACEOF
 #define wxUSE_SLIDER 1
@@ -46696,7 +46747,10 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <Carbon/Carbon.h>
+
+                           #include <Carbon/Carbon.h>
+                           #include <WebKit/WebKit.h>
+

 #include <WebKit/HIWebView.h>
 _ACEOF
@@ -46837,10 +46891,16 @@ _ACEOF
 fi

 if test "$wxUSE_PALETTE" = "yes" ; then
-  cat >>confdefs.h <<\_ACEOF
+    if test "$wxUSE_DFB" = 1; then
+        { echo "$as_me:$LINENO: WARNING: wxPalette not yet supported under DFB... disabled" >&5
+echo "$as_me: WARNING: wxPalette not yet supported under DFB... disabled" >&2;}
+        wxUSE_PALETTE=no
+    else
+        cat >>confdefs.h <<\_ACEOF
 #define wxUSE_PALETTE 1
 _ACEOF

+    fi
 fi

 if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
@@ -47931,9 +47991,9 @@ fi


    if test "x$SUNCXX" = "xyes"; then
-                                AR=$CXX
+                                AR=${AR:-"$CXX"}

-        AROPTIONS="-xar -o"
+        AROPTIONS=${AROPTIONS:-"-xar -o"}
    else
        if test -n "$ac_tool_prefix"; then
  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
@@ -51382,7 +51442,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF

-This file was extended by wxWidgets $as_me 2.8.0, which was
+This file was extended by wxWidgets $as_me 2.8.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -51445,7 +51505,7 @@ _ACEOF

 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-wxWidgets config.status 2.8.0
+wxWidgets config.status 2.8.1
 configured by $0, generated by GNU Autoconf 2.59,
  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ dnl ---------------------------------------------------------------------------
 dnl initialization
 dnl ---------------------------------------------------------------------------

-AC_INIT([wxWidgets], [2.8.0], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [2.8.1], [wx-dev@lists.wxwidgets.org])

 dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
 AC_CONFIG_SRCDIR([wx-config.in])
@@ -34,7 +34,7 @@ dnl wx_release_number += 1

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

 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
@@ -552,6 +552,7 @@ 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
@@ -775,6 +776,7 @@ 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
@@ -1107,6 +1109,7 @@ 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
@@ -1159,6 +1162,7 @@ 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
@@ -1214,6 +1218,7 @@ 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)
@@ -1465,9 +1470,13 @@ AC_PROG_RANLIB

 dnl ar command
 dnl   defines AR with the appropriate command
-AC_CHECK_TOOL(AR, ar)
-if test "x$AR" = "x" ; then
-    AC_MSG_ERROR([ar is needed to build wxWidgets])
+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
 fi

 dnl install checks
@@ -4548,7 +4557,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);
@@ -6610,8 +6619,8 @@ if test "$wxUSE_IPC" = "yes"; then
 fi

 if test "$wxUSE_DATAOBJ" = "yes"; then
-    if test "$wxUSE_MGL" = 1; then
-        AC_MSG_WARN([wxDataObject not yet supported under MGL... disabled])
+    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
+        AC_MSG_WARN([wxDataObject not yet supported under $TOOLKIT... disabled])
        wxUSE_DATAOBJ=no
    else
        AC_DEFINE(wxUSE_DATAOBJ)
@@ -6623,8 +6632,8 @@ else
 fi

 if test "$wxUSE_CLIPBOARD" = "yes"; then
-    if test "$wxUSE_MGL" = 1; then
-        AC_MSG_WARN([Clipboard not yet supported under MGL... disabled])
+    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
+        AC_MSG_WARN([Clipboard not yet supported under $TOOLKIT... disabled])
        wxUSE_CLIPBOARD=no
    fi

@@ -6641,18 +6650,9 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
        fi
    fi

-    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])
+    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])
        wxUSE_DRAG_AND_DROP=no
    fi

@@ -6779,8 +6779,13 @@ if test "$wxUSE_FONTPICKERCTRL" = "yes"; then
 fi

 if test "$wxUSE_DISPLAY" = "yes"; then
-    AC_DEFINE(wxUSE_DISPLAY)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
+    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
 fi

 if test "$wxUSE_DETECT_SM" = "yes"; then
@@ -6878,6 +6883,11 @@ 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
@@ -7081,7 +7091,10 @@ if test "$wxUSE_WEBKIT" = "yes"; then
                           AC_MSG_WARN([WebKit headers not found; disabling wxWebKit])
                           wxUSE_WEBKIT=no
                        ],
-                        [#include <Carbon/Carbon.h>])
+                        [
+                           #include <Carbon/Carbon.h>
+                           #include <WebKit/WebKit.h>
+                        ])
        CPPFLAGS="$old_CPPFLAGS"
    elif test "$wxUSE_COCOA" = 1; then
        AC_DEFINE(wxUSE_WEBKIT)
@@ -7142,7 +7155,12 @@ if test "$wxUSE_VALIDATORS" = "yes"; then
 fi

 if test "$wxUSE_PALETTE" = "yes" ; then
-  AC_DEFINE(wxUSE_PALETTE)
+    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
 fi

 if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
--- a/contrib/src/fl/controlbar.cpp
+++ b/contrib/src/fl/controlbar.cpp
@@ -887,9 +887,7 @@ void wxFrameLayout::DoSetBarState( cbBarInfo* pBar )
        pMiniFrm->Create( &GetParentFrame(), wxID_ANY, pBar->mName,
                          wxPoint( 50,50 ),
                          wxSize ( 0, 0  ),
-                          wxFRAME_FLOAT_ON_PARENT |
-                          wxNO_BORDER |
-                          wxFRAME_NO_TASKBAR
+                          wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT
                        );

        pMiniFrm->SetClient( pBar->mpBarWnd );
--- a/debian/README.HowToBuild.txt
+++ b/debian/README.HowToBuild.txt
@@ -149,6 +149,14 @@ 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
@@ -0,0 +1,49 @@
+#!/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,3 +1,26 @@
+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
@@ -35,7 +58,7 @@ wxwidgets2.7 (2.7.1.2-0) unstable; urgency=low
 wxwidgets2.7 (2.7.1.1-0) unstable; urgency=low

  * First 2.7.x release from wxPython team.
-  * Many enhancements, changes, fixes and updates.  See 
+  * Many enhancements, changes, fixes and updates.  See
    http://wxpython.org/CHANGES.txt for details.

 -- Robin Dunn <robin@alldunn.com>  Wed, 18 Oct 2006 17:09:53 -0700
--- a/debian/rules
+++ b/debian/rules
@@ -469,12 +469,13 @@ 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) \
@@ -482,10 +483,12 @@ 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,6 +70,11 @@ 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,34 +33,6 @@

 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
 }
@@ -68,11 +40,6 @@ 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/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.0-rc1
+BUILD_VERSION=2.8.1-rc1
 BUILD_TAG=HEAD


--- a/distrib/scripts/create_archives.sh
+++ b/distrib/scripts/create_archives.sh
@@ -37,56 +37,56 @@ fi
 getfilelist(){
  port=$1
  outfile=$2
-  
+
  filelist="base.rsp"
  contribfiles="stc.rsp contrib.rsp ogl.rsp"
  utilsfiles="tex2rtf.rsp utils.rsp utilmake.rsp"
  commonfiles="generic.rsp jpeg.rsp tiff.rsp xml.rsp deprecated.rsp makefile.rsp $utilsfiles $contribfiles"
-  
+
  if [ ! $port = "base" ]; then
-    filelist="$filelist $commonfiles" 
-  fi 
-  
+    filelist="$filelist $commonfiles"
+  fi
+
  if [ $port = "msw" ] || [ $port = "all" ]; then
    filelist="$filelist msw.rsp univ.rsp vc.rsp mmedia.rsp wince.rsp dmc.rsp"
  fi
-  
+
  if [ $port = "os2" ] || [ $port = "all" ]; then
    filelist="$filelist os2.rsp"
  fi
-  
+
  if [ $port = "x11" ] || [ $port = "all" ]; then
-    filelist="$filelist x11.rsp"
+    filelist="$filelist univ.rsp x11.rsp"
  fi
-  
+
  if [ $port = "mgl" ] || [ $port = "all" ]; then
-    filelist="$filelist mgl.rsp" 
+    filelist="$filelist mgl.rsp"
  fi
-  
+
  if [ $port = "gtk" ] || [ $port = "all" ]; then
    filelist="$filelist gtk.rsp"
  fi
-  
+
  if [ $port = "motif" ] || [ $port = "all" ]; then
    filelist="$filelist motif.rsp"
  fi
-  
+
  if [ $port = "mac" ] || [ $port = "all" ]; then
    filelist="$filelist mac.rsp cocoa.rsp"
  fi
-  
+
  if [ $port = "all" ]; then
    filelist="$filelist gtk1.rsp palmos.rsp docsrc.rsp"
  fi
-  
+
  tempfile="/tmp/wx$port.files.in"
  rm -f $outfile
-  
+
  olddir=$PWD
  cd $MANIFESTDIR
-  
+
  cat $filelist > $outfile
-  
+
  cd $olddir
 }

@@ -94,12 +94,12 @@ copyfilelist(){
    FILELIST=$1
    APPDIR=$2
    DESTDIR=$3
-    
+
    for line in `cat $FILELIST` ; do
      if [ "$line" != "" ]; then
        subdir=`dirname $line`
        mkdir -p $DESTDIR/$subdir
-        cp -rf $APPDIR/$line $DESTDIR/$subdir 
+        cp -rf $APPDIR/$line $DESTDIR/$subdir
      fi
    done
 }
@@ -113,7 +113,7 @@ doinit()

 dospinport(){
    port=$1
-    
+
    case "$port" in
        all)
            portname="Widgets";;
@@ -128,13 +128,13 @@ dospinport(){
            # upper-case version as they are abbreviations
            portname=`echo $port | tr '[a-z]' '[A-Z]'`;;
    esac
-    
+
    echo "Creating wx$portname distribution..."

    cd $APPDIR
    portfiles="/tmp/wx$port.files"
    getfilelist "$port" "$portfiles"
-    
+
    TMPFILESDIR=/tmp/wx$port/wx$portname-$VERSION
    rm -rf $TMPFILESDIR
    mkdir -p $TMPFILESDIR
@@ -164,7 +164,7 @@ dospinport(){
    popd
    rm -rf /tmp/wx$port
    rm ${portfiles}
-#    rm /tmp/textfiles
+    rm /tmp/textfiles
 }

 prepareforrelease()
@@ -174,7 +174,7 @@ prepareforrelease()
    cp $WEBFILES/site/faq*.htm $APPDIR/docs/html
    cp $WEBFILES/site/platform.htm $APPDIR/docs/html
    cp $WEBFILES/site/i18n.htm $APPDIR/docs/html
-    
+
    echo Copying readme files...
    cp $APPDIR/docs/msw/readme.txt README-MSW.txt
    cp $APPDIR/docs/msw/install.txt INSTALL-MSW.txt
@@ -201,7 +201,7 @@ prepareforrelease()

    cp $APPDIR/docs/cocoa/readme.txt $APPDIR/readme-cocoa.txt
    cp $APPDIR/docs/cocoa/install.txt $APPDIR/install-cocoa.txt
-    
+
    # Now delete a few files that are unnecessary
    rm -f BuildCVS.txt descrip.mms
    rm -f setup.h_vms
@@ -210,16 +210,16 @@ prepareforrelease()
    rm -f src/mingegcs.bat
 #    rm -f *.spec
    rm -f src/gtk/descrip.mms src/motif/descrip.mms
-    
+
    # Copy setup0.h files to setup.h
    # OS/2 always built with configure now
    # cp $APPDIR/include/wx/os2/setup0.h $APPDIR/include/wx/os2/setup.h
    cp $APPDIR/include/wx/msw/setup0.h $APPDIR/include/wx/msw/setup.h
    cp $APPDIR/include/wx/univ/setup0.h $APPDIR/include/wx/univ/setup.h
-    
+
    # Make MSW project files always have DOS line endings.
-    unix2dos `cat $MANIFESTDIR/vc.rsp` 
-    
+    unix2dos `cat $MANIFESTDIR/vc.rsp`
+
    popd
 }

@@ -280,7 +280,7 @@ fi

 # Do wxAll spin
 if [ "$SPINWXALL" = "1" ] || [ "$SPINALL" = "1" ]; then
-    dospinport "all" 
+    dospinport "all"
 fi

 if [ "$SPINALL" = "1" ]; then
--- a/distrib/scripts/is_text.sh
+++ b/distrib/scripts/is_text.sh
@@ -14,6 +14,17 @@ 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/manifests/generic.rsp
+++ b/distrib/scripts/manifests/generic.rsp
@@ -118,8 +118,6 @@ 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,6 +3,8 @@ readme-mac.txt

 lib/dummy

+distrib/mac/pbsetup-sh 
+
 docs/licence.txt
 docs/mac/*.txt
 docs/mac/*.hqx
--- a/distrib/scripts/manifests/msw.rsp
+++ b/distrib/scripts/manifests/msw.rsp
@@ -16,9 +16,6 @@ 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,8 +125,6 @@ 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,3 +1,5 @@
+include/msvc/wx/setup.h
+
 build/msw/*.dsp
 build/msw/*.dsw

--- a/distrib/scripts/manifests/x11.rsp
+++ b/distrib/scripts/manifests/x11.rsp
@@ -21,13 +21,6 @@ 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
@@ -131,7 +131,7 @@ else
     cp $g $START_DIR/$DIST_DIR/readme-`echo $g | sed -e "s|${DOCDIR}||g" | sed -e "s|msw/wince|wince|g" | sed -e "s|/readme.txt||g"`-${BUILD_VERSION}.txt
   done
   # Rename double readme
-   mv $START_DIR/$DIST_DIR/readme-readme-${BUILD_VERSION}.txt $START_DIR/$DIST_DIR/readme-${BUILD_VERSION}.txt
+   mv $START_DIR/$DIST_DIR/readme-readme.txt-${BUILD_VERSION}.txt $START_DIR/$DIST_DIR/readme-${BUILD_VERSION}.txt
   ## copy files ...
   mkdir ${FTPDIR}/
   cp  $START_DIR/$DIST_DIR/* ${FTPDIR}/
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -68,7 +68,8 @@ Deprecated methods since 2.6.x and their replacements
  wxFS_SEEKABLE flags is deprecated. You can still seek, but use the flag.
 - Constructor wxZipInputStream(const wxString& archive, const wxString& file)
  deprecated in favour of wxFileSystem (other zip ctors are not deprecated).
- 
+- wx{Dir|File}Dialog::{Set|Get}Style deprecated in favour of the generic
+  wxWindow::{Set|Get}WindowStyle()


 Major new features in 2.8 release
@@ -84,7 +85,33 @@ Major new features in 2.8 release
 - Further functionality including wxAnimationCtrl (moved from contrib/src/anim
  and enhanced), wxSimpleHtmlListBox, wxHyperlinkCtrl, wxColourPickerCtrl,
  wxDirPickerCtrl, wxFilePickerCtrl, wxFontPickerCtrl, wxCollapsiblePane,
-  wxAboutBox, wxTreebook, tar streams.
+  wxSearchCtrl, wxAboutBox, wxTreebook, tar streams.
+
+
+2.8.1
+-----
+
+All:
+
+- Fix compilation with wxUSE_STL=1
+- wxGrid::GetBestSize() returns same size the grid would have after AutoSize()
+- Added wxTreeCtrl::CollapseAll[Children]() and IsEmpty() (Francesco Montorsi)
+- Several RTL-related positioning fixes (Diaa Sami)
+- Fix wxConfig::DeleteGroup() for arguments with trailing slash (David Hart)
+- Fix memory leak in wxGrid::ShowCellEditControl() (Christian Sturmlechner)
+
+wxMSW:
+
+- Fixed compilation with Borland C++ in Unicode mode but without MSLU
+- Show taskbar icon menu on right button release, not press
+
+wxGTK:
+
+- Don't crash if command line is not valid UTF-8 (Unicode build only)
+
+wxUniv:
+
+- It is now possible to set background colour of wxStaticText


 2.8.0
@@ -92,6 +119,8 @@ Major new features in 2.8 release

 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
@@ -124,7 +153,7 @@ All:
 - Added wxFilterFSHandler and wxArchiveFSHandler.
 - Added wxString::ToLongLong() and ToULongLong().

-All (GUI): 
+All (GUI):

 - wxMemoryDC constructor now optionally accepts a wxBitmap parameter,
  calling SelectObject itself if a valid bitmap is passed.
--- a/docs/dfb/install.txt
+++ b/docs/dfb/install.txt
@@ -0,0 +1,113 @@
+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/readme.txt
+++ b/docs/gtk/readme.txt
@@ -4,11 +4,22 @@
 You have downloaded version 2.8 of the GTK+ port of the 
 wxWidgets GUI library.

-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.
+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.

 More info about the wxWidgets project (including all the
 other ports and version of wxWidgets) can be found at the
@@ -39,7 +50,6 @@ 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 
@@ -52,8 +62,6 @@ 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/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{size\_t }{i}}
+\constfunc{int}{GetDelay}{\param{unsigned int }{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{size\_t}{GetFrameCount}{\void}
+\constfunc{unsigned int}{GetFrameCount}{\void}

 Returns the number of frames for this animation.


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

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

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

--- a/docs/latex/wx/auimanager.tex
+++ b/docs/latex/wx/auimanager.tex
@@ -125,7 +125,7 @@ enum wxAuiManagerOption

 \func{}{wxAuiManager}{\param{wxWindow* }{managed\_wnd = NULL}, \param{unsigned int }{flags = wxAUI\_MGR\_DEFAULT}}

-Constructor. \arg{frame} specifies the wxFrame which should be managed.
+Constructor. \arg{managed\_wnd} specifies the wxFrame which should be managed.
 \arg{flags}  specifies options which allow the frame management behavior
 to be modified.

@@ -166,9 +166,11 @@ 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 SetDockSizeConstraint() for more information.
+Returns the current dock constraint values.  See \helpref{SetDockSizeConstraint()}{wxauimanagersetdocksizeconstraint} for more information.

 \membersection{wxAuiManager::GetFlags}\label{wxauimanagergetflags}

@@ -182,6 +184,8 @@ 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
@@ -269,6 +273,8 @@ 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
--- a/docs/latex/wx/classes.tex
+++ b/docs/latex/wx/classes.tex
@@ -348,6 +348,7 @@
 \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/dirctrl.tex
+++ b/docs/latex/wx/dirctrl.tex
@@ -188,3 +188,12 @@ 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/dirtrav.tex
+++ b/docs/latex/wx/dirtrav.tex
@@ -71,6 +71,7 @@ enum wxDirTraverseResult

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

+
 \membersection{wxDirTraverser::OnDir}\label{wxdirtraverserondir}

 \func{virtual wxDirTraverseResult}{OnDir}{\param{const wxString\& }{dirname}}
@@ -82,6 +83,7 @@ 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}}
@@ -92,9 +94,10 @@ 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}

-\func{virtual wxOpenErrorTraverseResult}{OnOpenError}{\param{const wxString\& }{openerrorname}}
+\membersection{wxDirTraverser::OnOpenError}\label{wxopenerrortraverseronopenerror}
+
+\func{virtual wxDirTraverseResult}{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/filename.tex
+++ b/docs/latex/wx/filename.tex
@@ -142,6 +142,8 @@ 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}


--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -996,7 +996,8 @@ Returns true if the file exists and is a plain file.

 Returns time of last modification of given file.

-The return value is $0$ if an error occured (e.g. file not found).
+The function returns \texttt{(time\_t)}$-1$ if an error occurred (e.g. file not
+found).


 \membersection{::wxFileNameFromPath}\label{wxfilenamefrompath}
@@ -1273,6 +1274,11 @@ 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}

--- 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 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.
+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.

 \wxheading{Derived from}

@@ -32,6 +32,17 @@ 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/listctrl.tex
+++ b/docs/latex/wx/listctrl.tex
@@ -40,8 +40,9 @@ 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.
+generic implementation for report mode as well by setting the
+mac.listctrl.always\_use\_generic \helpref{wxSystemOption}{wxsystemoptions} to
+1.

 \wxheading{Derived from}

@@ -333,7 +334,8 @@ 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.
+{\bf NB:} It is currently only implemented for wxMSW and the generic version,
+not for the native Mac OS X version.


 \membersection{wxListCtrl::GetImageList}\label{wxlistctrlgetimagelist}
--- 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.0: A portable C++ and Python GUI toolkit}
+\title{wxWidgets 2.8.1: 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{November, 2006}
+\date{December, 2006}
 }
 \makeindex
 \begin{document}
--- a/docs/latex/wx/size.tex
+++ b/docs/latex/wx/size.tex
@@ -198,9 +198,9 @@ Sets the width.
 Assignment operator.


-\func{bool}{operator $==$}{\param{const wxSize\& }{sz}}
+\constfunc{bool}{operator $==$}{\param{const wxSize\& }{sz}}

-\func{bool}{operator $!=$}{\param{const wxSize\& }{sz}}
+\constfunc{bool}{operator $!=$}{\param{const wxSize\& }{sz}}

 \func{wxSize}{operator $+$}{\param{const wxSize\& }{sz}}

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

 Example return values:
 \begin{itemize}
-    \item Unix: \texttt{\textit{prefix}/share/\textit{appname}}
-    \item Windows: the directory where the executable file is located
-    \item Mac: \texttt{\textit{appname}.app/Contents/Resources} bundle subdirectory
+    \item Unix: \texttt{\textit{prefix}/lib/\textit{appname}}
+    \item Windows: the directory of the executable file
+    \item Mac: \texttt{\textit{appname}.app/Contents/PlugIns} bundle subdirectory
 \end{itemize}

 \wxheading{See also}
@@ -199,9 +199,9 @@ all platforms except Mac OS X.

 Example return values:
 \begin{itemize}
-    \item Unix: \texttt{\textit{prefix}/lib/\textit{appname}}
-    \item Windows: the directory of the executable file
-    \item Mac: \texttt{\textit{appname}.app/Contents/PlugIns} bundle subdirectory
+    \item Unix: \texttt{\textit{prefix}/share/\textit{appname}}
+    \item Windows: the directory where the executable file is located
+    \item Mac: \texttt{\textit{appname}.app/Contents/Resources} bundle subdirectory
 \end{itemize}

 \newsince{2.7.0}
--- a/docs/latex/wx/sysopt.tex
+++ b/docs/latex/wx/sysopt.tex
@@ -42,7 +42,7 @@ used.}
 a window. You can also use the symbol wxMAC\_WINDOW\_PLAIN\_TRANSITION.}
 \twocolitem{window-default-variant}{The default variant used by windows (cast to integer from the wxWindowVariant enum).
 Also known as wxWINDOW\_DEFAULT\_VARIANT.}
-\twocolitem{mac.listctrl.always_use_generic}{Tells wxListCtrl to use the generic 
+\twocolitem{mac.listctrl.always\_use\_generic}{Tells wxListCtrl to use the generic 
 control even when it is capable of using the native control instead. 
 Also knwon as wxMAC\_ALWAYS\_USE\_GENERIC\_LISTCTRL.}
 \end{twocollist}
--- a/docs/latex/wx/taskbar.tex
+++ b/docs/latex/wx/taskbar.tex
@@ -51,6 +51,10 @@ wxEVT\_TASKBAR\_RIGHT\_UP event.}
 wxEVT\_TASKBAR\_LEFT\_DCLICK event.}
 \twocolitem{{\bf EVT\_TASKBAR\_RIGHT\_DCLICK(func)}}{Process a
 wxEVT\_TASKBAR\_RIGHT\_DCLICK event.}
+\twocolitem{{\bf EVT\_TASKBAR\_CLICK(func)}}{This is a synonym for either
+EVT\_TASKBAR\_RIGHT\_DOWN or UP depending on the platform, use this event macro
+to catch the event which should result in the menu being displayed on the
+current platform.}
 \end{twocollist}%

 \latexignore{\rtfignore{\wxheading{Members}}}
--- a/docs/latex/wx/taui.tex
+++ b/docs/latex/wx/taui.tex
@@ -2,7 +2,7 @@

 Class: \helpref{wxAuiManager}{wxauimanager}, \helpref{wxAuiPaneInfo}{wxauipaneinfo}

-wxAUI stands for Advances User Interface and the wxAUI framework
+wxAUI stands for Advanced User Interface and the wxAUI framework
 aims to give its user a cutting edge interface for use with the
 wxWidgets based applications. The original wxAUI sources have
 kindly been made available under the wxWindows licence
--- a/docs/latex/wx/treectrl.tex
+++ b/docs/latex/wx/treectrl.tex
@@ -13,7 +13,7 @@

 A tree control presents information as a hierarchy, with items that may be expanded
 to show further items. Items in a tree control are referenced by wxTreeItemId handles,
-which may be tested for validity by calling wxTreeItemId::IsOk.
+which may be tested for validity by calling \helpref{wxTreeItemId::IsOk}{wxtreeitemidisok}.

 To intercept events from a tree control, use the event table macros described in \helpref{wxTreeEvent}{wxtreeevent}.

@@ -238,6 +238,28 @@ See also \helpref{SetStateImageList}{wxtreectrlsetstateimagelist}.
 Collapses the given item.


+\membersection{wxTreeCtrl::CollapseAll}\label{wxtreectrlcollapseall}
+
+\func{void}{CollapseAll}{\void}
+
+Collapses the root item.
+
+\wxheading{See also}
+
+\helpref{ExpandAll}{wxtreectrlexpandall}
+
+
+\membersection{wxTreeCtrl::CollapseAllChildren}\label{wxtreectrlcollapseallchildren}
+
+\func{void}{CollapseAllChildren}{\param{const wxTreeItemId\&}{ item}}
+
+Collapses this item and all of its children, recursively.
+
+\wxheading{See also}
+
+\helpref{ExpandAllChildren}{wxtreectrlexpandallchildren}
+
+
 \membersection{wxTreeCtrl::CollapseAndReset}\label{wxtreectrlcollapseandreset}

 \func{void}{CollapseAndReset}{\param{const wxTreeItemId\&}{ item}}
@@ -333,7 +355,7 @@ Expands the given item.

 \membersection{wxTreeCtrl::ExpandAll}\label{wxtreectrlexpandall}

-\func{void}{Expand}{\void}
+\func{void}{ExpandAll}{\void}

 Expands all items in the tree.

@@ -728,6 +750,13 @@ Returns {\tt true} if the given item is in bold state.
 See also: \helpref{SetItemBold}{wxtreectrlsetitembold}


+\membersection{wxTreeCtrl::IsEmpty}\label{wxtreectrlisempty}
+
+\constfunc{bool}{IsEmpty}{}
+
+Returns \true if the control is empty (i.e. has no items, even no root one).
+
+
 \membersection{wxTreeCtrl::IsExpanded}\label{wxtreectrlisexpanded}

 \constfunc{bool}{IsExpanded}{\param{const wxTreeItemId\&}{ item}}
@@ -1023,3 +1052,59 @@ all items if it does have this style.

 Unselects the given item. This works in multiselection controls only.

+
+
+
+
+%% the wxTreeItemId opaque class
+
+
+\section{\class{wxTreeItemId}}\label{wxtreeitemid}
+
+An opaque reference to a tree item.
+
+
+\wxheading{Derived from}
+
+None
+
+\wxheading{Include files}
+
+<wx/treebase.h>
+
+\wxheading{See also}
+
+\helpref{wxTreeItemCtrl}{wxtreeitemctrl}, \helpref{wxTreeItemData}{wxtreeitemdata},\\
+\helpref{wxTreeCtrl overview}{wxtreectrloverview}
+
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxTreeItemId::wxTreeItemId}\label{wxtreeitemidconstr}
+
+\func{}{wxTreeItemId}{\void}
+
+Default constructor. wxTreemItemIds are not meant to be constructed explicitly by
+the user; they are returned by the \helpref{wxTreeItemCtrl}{wxtreeitemctrl} functions instead.
+
+
+\membersection{wxTreeItemId::IsOk}\label{wxtreeitemidisok}
+
+\constfunc{bool}{IsOk}{}
+
+Returns \true if this instance is referencing a valid tree item.
+
+
+\membersection{Operators}\label{wxtreeitemidoperators}
+
+\constfunc{void}{operator $!$}{}
+
+Synonim for \helpref{IsOk}{wxtreeitemidisok}
+
+
+\constfunc{bool}{operator $==$}{\param{const wxTreeItemId\& }{item}}
+
+\constfunc{bool}{operator $!=$}{\param{const wxTreeItemId\& }{item}}
+
+Operators for comparison between \helpref{wxTreeItemId}{wxtreeitemid} objects.
+
--- a/docs/latex/wx/treeevt.tex
+++ b/docs/latex/wx/treeevt.tex
@@ -52,11 +52,13 @@ is being given to the application (call wxTreeEvent::SetToolTip). Windows only.}

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

+
 \membersection{wxTreeEvent::wxTreeEvent}\label{wxtreeeventctor}

-\func{}{wxTreeEvent}{\param{WXTYPE }{commandType = 0}, \param{int }{id = 0}}
+\func{}{wxTreeEvent}{\param{wxEventType }{commandType}, \param{wxTreeCtrl *}{tree}, \param{const wxTreeItemId\&}{item = wxTreeItemId()}}
+
+Constructor, used by wxWidgets itself only.

-Constructor.

 \membersection{wxTreeEvent::GetKeyCode}\label{wxtreeeventgetkeycode}

@@ -66,43 +68,52 @@ Returns the key code if the event is a key event. Use
 \helpref{GetKeyEvent}{wxtreeeventgetkeyevent} to get the values of the
 modifier keys for this event (i.e. Shift or Ctrl).

+
 \membersection{wxTreeEvent::GetItem}\label{wxtreeeventgetitem}

 \constfunc{wxTreeItemId}{GetItem}{}

 Returns the item (valid for all events).

+
 \membersection{wxTreeEvent::GetKeyEvent}\label{wxtreeeventgetkeyevent}

 \constfunc{const wxKeyEvent\&}{GetKeyEvent}{}

 Returns the key event for {\tt EVT\_TREE\_KEY\_DOWN} events.

+
 \membersection{wxTreeEvent::GetLabel}\label{wxtreeeventgetlabel}

 \constfunc{const wxString\&}{GetLabel}{}

 Returns the label if the event is a begin or end edit label event.

+
 \membersection{wxTreeEvent::GetOldItem}\label{wxtreeeventgetolditem}

 \constfunc{wxTreeItemId}{GetOldItem}{}

 Returns the old item index (valid for EVT\_TREE\_ITEM\_CHANGING and CHANGED events)

-\membersection{wxTreeEvent::GetPoint()}\label{wxtreeeventgetpoint}
+
+\membersection{wxTreeEvent::GetPoint}\label{wxtreeeventgetpoint}

 \constfunc{wxPoint}{GetPoint}{}

-Returns the position of the mouse pointer if the event is a drag event.
+Returns the position of the mouse pointer if the event is a drag or menu-context event.
+In both cases the position is in client coordinates - i.e. relative to the wxTreeCtrl
+window (so that you can pass it directly to e.g. \helpref{wxWindow::PopupMenu}{wxwindowpopupmenu}).

-\membersection{wxTreeEvent::IsEditCancelled()}\label{wxtreeeventiseditcancelled}
+
+\membersection{wxTreeEvent::IsEditCancelled}\label{wxtreeeventiseditcancelled}

 \constfunc{bool}{IsEditCancelled}{}

 Returns true if the label edit was cancelled. This should be
 called from within an EVT\_TREE\_END\_LABEL\_EDIT handler.

+
 \membersection{wxTreeEvent::SetToolTip}\label{wxtreeeventsettooltip}

 \func{void}{SetToolTip}{\param{const wxString\&}{ tooltip}}
--- a/docs/latex/wx/trefcount.tex
+++ b/docs/latex/wx/trefcount.tex
@@ -64,7 +64,9 @@ and copy constructors since they are reference-counted:
 \helpref{wxPalette}{wxpalette}\\
 \helpref{wxPen}{wxpen}\\
 \helpref{wxRegion}{wxregion}\\
-\helpref{wxString}{wxstring}
+\helpref{wxString}{wxstring}\\
+\helpref{wxVariant}{wxvariant}\\
+\helpref{wxVariantData}{wxvariantdata}

 Note that the list above reports the objects which are reference-counted in all ports of
 wxWidgets; some ports may use this tecnique also for other classes.
--- a/docs/latex/wx/tunicode.tex
+++ b/docs/latex/wx/tunicode.tex
@@ -17,7 +17,7 @@ characters from languages other than English.

 \subsection{What is Unicode?}\label{whatisunicode}

-Starting with release 2.1 wxWidgets has support for compiling in Unicode mode
+wxWidgets has support for compiling in Unicode mode
 on the platforms which support it. Unicode is a standard for character
 encoding which addresses the shortcomings of the previous, 8 bit standards, by
 using at least 16 (and possibly 32) bits for encoding each character. This
@@ -189,9 +189,7 @@ the \helpref{wxMBConv classes overview}{mbconvclasses}.
 \subsection{Unicode-related compilation settings}\label{unicodesettings}

 You should define {\tt wxUSE\_UNICODE} to $1$ to compile your program in
-Unicode mode. Note that it currently only works in Win32 and GTK 2.0 and
-that some parts of
-wxWidgets are not Unicode-compliant yet. If you
+Unicode mode. This currently works for wxMSW, wxGTK, wxMac and wxX11. If you
 compile your program in ANSI mode you can still define {\tt wxUSE\_WCHAR\_T} 
 to get some limited support for {\tt wchar\_t} type.

--- a/docs/latex/wx/variant.tex
+++ b/docs/latex/wx/variant.tex
@@ -34,12 +34,12 @@ for different data types, or a remote procedure call protocol.
 An optional name member is associated with a wxVariant. This might be used, for example,
 in CORBA or OLE automation classes, where named parameters are required.

-Note that as of wxWidgets 2.7.1, wxVariant is reference counted. Additionally, the
-conveniance macros {\bf DECLARE\_VARIANT\_OBJECT} and {\bf IMPLEMENT\_VARIANT\_OBJECT}
-were added so that adding (limited) support for conversion to and from wxVariant
-can be very easily implemented without modifiying either wxVariant or the class
-to be stored by wxVariant. Since assignement operators cannot be declared outside
-the class, the shift left operators are used like this:
+Note that as of wxWidgets 2.7.1, wxVariant is \helpref{reference counted}{trefcount}. 
+Additionally, the convenience macros {\bf DECLARE\_VARIANT\_OBJECT} and 
+{\bf IMPLEMENT\_VARIANT\_OBJECT} were added so that adding (limited) support 
+for conversion to and from wxVariant can be very easily implemented without modifying 
+either wxVariant or the class to be stored by wxVariant. Since assignment operators 
+cannot be declared outside the class, the shift left operators are used like this:

 \begin{verbatim}
    // in the header file
@@ -94,7 +94,7 @@ Default constructor.

 \func{}{wxVariant}{\param{const wxVariant\& }{variant}}

-Copy constructor.
+Copy constructor, uses \helpref{reference counting}{trefcount}.

 \func{}{wxVariant}{\param{const wxChar*}{ value}, \param{const wxString\& }{name = ``"}}

@@ -165,6 +165,7 @@ Destructor.

 Note that destructor is protected, so wxVariantData cannot usually
 be deleted. Instead, \helpref{DecRef}{wxvariantdatadecref} should be called.
+See \helpref{reference-counted object destruction}{refcountdestruct} for more info.


 \membersection{wxVariant::Append}\label{wxvariantappend}
@@ -382,7 +383,7 @@ Sets the internal variant data, deleting the existing data if there is any.

 \func{void}{operator $=$}{\param{const TIMESTAMP\_STRUCT* }{value}}

-Assignment operators.
+Assignment operators, using \helpref{reference counting}{trefcount} when possible.

 \membersection{wxVariant::operator $==$}\label{wxvarianteq}

@@ -485,13 +486,18 @@ Operator for implicit conversion to a pointer to a void, using \helpref{wxVarian

 Operator for implicit conversion to a pointer to a \helpref{wxDateTime}{wxdatetime}, using \helpref{wxVariant::GetDateTime}{wxvariantgetdatetime}.

+
+
+%% wxVariantData
+
+
 \section{\class{wxVariantData}}\label{wxvariantdata}

-The {\bf wxVariantData} is used to implement a new type for wxVariant. Derive from wxVariantData,
-and override the pure virtual functions.
+The {\bf wxVariantData} class is used to implement a new type for \helpref{wxVariant}{wxvariant}. 
+Derive from wxVariantData, and override the pure virtual functions.

-wxVariantData is reference counted, but you don't normally have to care about this, as
-wxVariant manages the count automatically. However, incase your application needs to take
+wxVariantData is \helpref{reference counted}{refcount}, but you don't normally have to care about this, 
+as wxVariant manages the count automatically. However, in case your application needs to take
 ownership of wxVariantData, be aware that the object is created with reference count of 1,
 and passing it to wxVariant will not increase this. In other words, \helpref{IncRef}{wxvariantdataincref}
 needs to be called only if you both take ownership of wxVariantData and pass it to a wxVariant.
@@ -527,7 +533,9 @@ Decreases reference count. If the count reaches zero, the object is
 automatically deleted.

 Note that destructor of wxVariantData is protected, so delete
-cannot be used as normal. Instead, DecRef should be called.
+cannot be used as normal. Instead, \helpref{DecRef}{wxvariantdatadecref} should be called.
+
+

 \membersection{wxVariantData::Eq}\label{wxvariantdataeq}

--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -79,21 +79,21 @@ build ('d'). Last component of them name is name of wxWidgets component
 "Configuring the build" below). This is a typical set of release ANSI build
 libraries (release versions on left, debug on right side):

-  wxbase25.lib              wxbase25d.lib
-  wxbase25_net.lib          wxbase25d_net.lib
-  wxbase25_xml.lib          wxbase25d_xml.lib
-  wxmsw25_core.lib          wxmsw25d_core.lib
-  wxmsw25_html.lib          wxmsw25d_html.lib
-  wxmsw25_adv.lib           wxmsw25d_adv.lib
+  wxbase28.lib              wxbase28d.lib
+  wxbase28_net.lib          wxbase28d_net.lib
+  wxbase28_xml.lib          wxbase28d_xml.lib
+  wxmsw28_core.lib          wxmsw28d_core.lib
+  wxmsw28_html.lib          wxmsw28d_html.lib
+  wxmsw28_adv.lib           wxmsw28d_adv.lib

 Their Unicode debug counterparts in wxUniversal build would be

-  wxbase25ud.lib
-  wxbase25ud_net.lib
-  wxbase25ud_xml.lib        (notice these libs are same for wxUniv and wxMSW)
-  wxmswuniv25ud_core.lib
-  wxmswuniv25ud_html.lib
-  wxmswuniv25ud_adv.lib
+  wxbase28ud.lib
+  wxbase28ud_net.lib
+  wxbase28ud_xml.lib        (notice these libs are same for wxUniv and wxMSW)
+  wxmswuniv28ud_core.lib
+  wxmswuniv28ud_html.lib
+  wxmswuniv28ud_adv.lib

 These directories also contain subdirectory with wx/setup.h header. This
 subdirectory is named after port, Unicode, wxUniv and debug settings and 
@@ -714,7 +714,7 @@ USE_GUI=0
  you should set wxUSE_GUI to 1 in setup.h.

 USE_OPENGL=1
-  Build wxmsw25_gl.lib library with OpenGL integration class wxGLCanvas.
+  Build wxmsw28_gl.lib library with OpenGL integration class wxGLCanvas.
  You must also modify your setup.h to #define wxUSE_GLCANVAS 1. Note that
  OpenGL library is always built as additional library, even in monolithic
  build!
@@ -766,9 +766,9 @@ VENDOR=<your company name>
  distribute wxWidgets DLLs with your application. Default value is 'custom'.
  This string is included as part of DLL name. wxWidgets DLLs contain compiler
  name, version information and vendor name in them. For example
-  wxmsw250_core_bcc_custom.dll is one of DLLs build using Borland C++ with
+  wxmsw280_core_bcc_custom.dll is one of DLLs build using Borland C++ with
  default settings. If you set VENDOR=mycorp, the name will change to
-  wxmsw250_core_bcc_mycorp.dll.
+  wxmsw280_core_bcc_mycorp.dll.

 CFG=<configuration name>
  Sets configuration name so that you can have multiple wxWidgets builds with
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -153,5 +153,5 @@ web site.

 Have fun!

-The wxWidgets Team, November 2006
+The wxWidgets Team, December 2006

--- a/docs/tech/tn0011.txt
+++ b/docs/tech/tn0011.txt
@@ -12,12 +12,15 @@
       {wx}/include/wx/version.h
       {wx}/include/msvc/wx/setup.h
       {wx}/src/wxvc_dll.dsp
+       {wx}/docs/latex/wx/manual.tex
       {wx}/docs/changes.txt
       {wx}/docs/gtk/changes.txt
       {wx}/build/bakefiles/wxpresets/presets/wx_win32.bkl
       {wx}/build/script/win_docs.bat {windows doc and setup file}
       {wx}/distrib/scripts/build-environ.cfg {cvs tar and zip files}
- 
+
+   The script misc/scripts/inc_release can be used for incrementing
+   the release field of the version, i.e. changing 2.8.x to 2.8.x+1.

 2. When to update the version numbers:

@@ -31,6 +34,12 @@
 Version: $Id$

 $Log$
+Revision 1.10  2007/01/07 22:28:07  VZ
+also update manual.tex
+
+Revision 1.9  2007/01/07 21:34:40  VZ
+added a script to update release version field
+
 Revision 1.8  2006/11/12 20:13:09  VZ
 removed obsolete src/make*.env files

--- a/docs/tech/tn0020.txt
+++ b/docs/tech/tn0020.txt
@@ -1,9 +1,9 @@
-                    Binary Compatability and wxWidgets
+                    Binary Compatibility and wxWidgets
                    ==================================
 0. Purpose
 ----------

-This is broad technote covering all aspects of binary compatability with 
+This is broad technote covering all aspects of binary compatibility with 
 wxWidgets.

 1. Releases
@@ -21,38 +21,64 @@ Major  Minor Release

 (I.E. Major.Minor.Release).

-All Release versions where the Minor is EVEN (2.4.x,2.6.x 
-etc.  ODD minors are development versions)  are expected to be binary 
-compatable.  Note that this means FORWARD binary compatability only -
-new methods to classes are ok as long as they arn't virtual, etc.
+All versions with EVEN minor version component (e.g. 2.4.x, 2.6.x etc.)
+are expected to be binary compatible (ODD minors are development versions
+and the compatibility constraints don't apply to them). Note that by
+preserving binary compatibility we mean BACKWARDS compatibility only,
+meaning that applications built with old wxWidgets headers should continue
+to work with new wxWidgets (shared/dynamic) libraries without the need to
+rebuild. There is no requirement to preserve compatibility in the other
+direction (i.e. make new headers compatible with old libraries) as this
+would preclude any additions whatsoever to the stable branch. But see
+also section (4).

-2. What kind of changes are NOT binary compatable
+
+2. What kind of changes are NOT binary compatible
 -------------------------------------------------

 If its still up, the KDE guide is a good reference:
 http://developer.kde.org/documentation/other/binarycompatibility.html

-The changes that are NOT binary compatable:
+The changes that are NOT binary compatible:
 - Adding a virtual function
 - Changing the name of a any function or variable
 - Changing the signature of a virtual function (adding a parameter, 
 even a default one)
 - Changing the order of the virtual functions in a class
 ["switching" them, etc.]
- Changing access privalages to a function (protected to private etc.)
+- Changing access privileges to a function (protected to private etc.)
 [unlike KDE we need to support windows so this is not allowed]
 - Adding a member variable
 - Changing the order of non-static member variables


-3. wxABI_VERSION and BACKWARD binary compatability
+3. Changes which are compatible
+-------------------------------
+
+- Adding a new class
+- Adding a new non-virtual method to an existing class
+- Overriding the implementation of an existing virtual function
+[this is considered to be backwards binary compatible until we find a
+ counter example; currently it's known to work with Apple gcc at least]
+- Anything which doesn't result in ABI change at all, e.g. adding new
+  macros, constants and, of course, private changes in the implementation
+
+
+4. wxABI_VERSION and "forward" binary compatibility
 --------------------------------------------------

-As mentioned we do not support BACKWARD binary compatability. 
+As mentioned we do not support "forward" binary compatibility, that is the
+ability to run applications compiled with new wxWidgets headers on systems
+with old wxWidgets libraries.

-However, for this purpose we have the macro wxABI_VERSION.  All
-new symbols added to binary compatable releases are to be ifed
-with wxABI_VERSION.
+However, for the developers who want to ensure that their application works
+with some fixed old wxWidgets version and doesn't (inadvertently) require
+features added in later releases, we provide the macro wxABI_VERSION which
+can be defined to restrict the API exported by wxWidgets headers to that of
+a fixed old release.
+
+For this to work, all new symbols added to binary compatible releases must
+be #if'ed with wxABI_VERSION.

 The layout of wxABI_VERSION is as follows:

@@ -63,7 +89,7 @@ where
 2     06     02
 Major Minor Release

-I.E. it corresponds to the wxWidgets release in {1}.
+I.E. it corresponds to the wxWidgets release in (1).

 An example of using wxABI_VERSION is as follows for symbols
 only in a 2.6.2 release:
@@ -86,10 +112,10 @@ bool LoadURIWithProxy(const wxString& fileName, const wxString& proxy)
 #endif


-4. Workarounds for adding virtual functions
+5. Workarounds for adding virtual functions
 -------------------------------------------

-Originally the idea for adding virtual functions to binary compatable
+Originally the idea for adding virtual functions to binary compatible
 releases was to pad out some empty "reserved" functions and then
 rename those later when someone needed to add a virtual function.

@@ -115,7 +141,7 @@ is a wxShadowObjectMethod which is a typedef:
 typedef int (*wxShadowObjectMethod)(void*, void*);

 After you add a field, you can set it via SetField with the same
-params as AddField, the second param being the value to set
+parameters as AddField, the second parameter being the value to set
 the field to.  You can get the field after you call AddField
 via GetField, with the parameters as the other two field functions,
 only in the case the second parameter is the fallback 
@@ -130,11 +156,11 @@ parameter passed to the wxShadowObjectMethod, the third is the
 second parameter passed to that wxShadowObjectMethod, and the
 fourth is the return value of the wxShadowObjectMethod.

-5. version-script.in
+6. version-script.in
 --------------------

 For ld/libtool we use sun-style version scripts.  Basically
-anything which fits the conditions of being ifed via wxABI_VERSION
+anything which fits the conditions of being #if'ed via wxABI_VERSION
 needs to go here also.

 See 'info ld scripts version' on a GNU system, it's online here:
@@ -175,8 +201,8 @@ For example for wxLogBuffer a line like this:
    *wxLogBuffer*;


-5.5. Checking the version information in libraries and programs
---------------------------------------------------------------
+7. Checking the version information in libraries and programs
+-------------------------------------------------------------

 On Sun there is a tool for this, see pvs(1). On GNU you can use objdump, below
 are some examples.
@@ -226,18 +252,18 @@ $ objdump -T libwx_based-2.6.so | grep 'WXD_2\.6\.2' | grep -v 'UND\|ABS'
 00000000000abe10 g    DF .text  0000000000000088  WXD_2.6.2   _ZN14wxZipFSHandler7CleanupEv


-6. Testing binary compatability between releases
+8. Testing binary compatibility between releases
 ------------------------------------------------

-An easy way of testing binary compatability is just to build wxWidgets
+An easy way of testing binary compatibility is just to build wxWidgets
 in dll/dynamic library mode and then switch out the current library
 in question with an earlier stable version of the library, then running
 the application in question again.  If it runs OK then there is usually
-binary compatability between those releases.
+binary compatibility between those releases.

 You can also break into your debugger or whatever program you want
 to use and check the memory layout of the class.  If it is the same
-then it is binary compatable.
+then it is binary compatible.

 Also remember to look at http://www.wxwidgets.org/bincompat.html page which
 summarizes the results of testing of all the samples built against old
--- a/include/wx/anidecod.h
+++ b/include/wx/anidecod.h
@@ -30,8 +30,30 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxImage, wxImageArray);

 class WXDLLEXPORT wxANIDecoder : public wxAnimationDecoder
 {
-private:
+public:
+    // constructor, destructor, etc.
+    wxANIDecoder();
+    ~wxANIDecoder();

+
+    virtual wxSize GetFrameSize(unsigned int frame) const;
+    virtual wxPoint GetFramePosition(unsigned int frame) const;
+    virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const;
+    virtual long GetDelay(unsigned int frame) const;
+    virtual wxColour GetTransparentColour(unsigned int frame) const;
+
+    // implementation of wxAnimationDecoder's pure virtuals
+    virtual bool CanRead( wxInputStream& stream ) const;
+    virtual bool Load( wxInputStream& stream );
+
+    bool ConvertToImage(unsigned int frame, wxImage *image) const;
+
+    wxAnimationDecoder *Clone() const
+        { return new wxANIDecoder; }
+    wxAnimationType GetType() const
+        { return wxANIMATION_TYPE_ANI; }
+
+private:
    // frames stored as wxImage(s): ANI files are meant to be used mostly for animated
    // cursors and thus they do not use any optimization to encode differences between
    // two frames: they are just a list of images to display sequentially.
@@ -44,31 +66,7 @@ private:
    // this is the wxCURHandler used to load the ICON chunk of the ANI files
    static wxCURHandler sm_handler;

-public:
-    virtual wxSize GetFrameSize(size_t frame) const;
-    virtual wxPoint GetFramePosition(size_t frame) const;
-    virtual wxAnimationDisposal GetDisposalMethod(size_t frame) const;
-    virtual long GetDelay(size_t frame) const;
-    virtual wxColour GetTransparentColour(size_t frame) const;

-public:
-    // constructor, destructor, etc.
-    wxANIDecoder();
-    ~wxANIDecoder();
-
-public:     // implementation of wxAnimationDecoder's pure virtuals
-
-    virtual bool CanRead( wxInputStream& stream ) const;
-    virtual bool Load( wxInputStream& stream );
-
-    bool ConvertToImage(size_t frame, wxImage *image) const;
-
-    wxAnimationDecoder *Clone() const
-        { return new wxANIDecoder; }
-    wxAnimationType GetType() const
-        { return wxANIMATION_TYPE_ANI; }
-
-private:
    DECLARE_NO_COPY_CLASS(wxANIDecoder)
 };

--- a/include/wx/animate.h
+++ b/include/wx/animate.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef _WX_ANIMATEH__
-#define _WX_ANIMATEH__
+#ifndef _WX_ANIMATE_H_
+#define _WX_ANIMATE_H_

 #include "wx/defs.h"

@@ -39,14 +39,16 @@ public:
    virtual bool IsOk() const = 0;

    // can be -1
-    virtual int GetDelay(size_t i) const = 0;
+    virtual int GetDelay(unsigned int frame) const = 0;

-    virtual size_t GetFrameCount() const = 0;
-    virtual wxImage GetFrame(size_t i) const = 0;
+    virtual unsigned int GetFrameCount() const = 0;
+    virtual wxImage GetFrame(unsigned int frame) const = 0;
    virtual wxSize GetSize() const = 0;

-    virtual bool LoadFile(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
-    virtual bool Load(wxInputStream &stream, wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
+    virtual bool LoadFile(const wxString& name,
+                          wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
+    virtual bool Load(wxInputStream& stream,
+                      wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;

 protected:
    DECLARE_ABSTRACT_CLASS(wxAnimationBase)
@@ -68,11 +70,11 @@ protected:
 class WXDLLIMPEXP_ADV wxAnimationCtrlBase : public wxControl
 {
 public:
-    wxAnimationCtrlBase() {}
+    wxAnimationCtrlBase() { }

-public:     // public API
-
-    virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
+    // public API
+    virtual bool LoadFile(const wxString& filename,
+                          wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;

    virtual void SetAnimation(const wxAnimation &anim) = 0;
    virtual wxAnimation GetAnimation() const = 0;
@@ -117,6 +119,6 @@ private:
    #include "wx/generic/animate.h"
 #endif

-#endif      // wxUSE_ANIMATIONCTRL
+#endif // wxUSE_ANIMATIONCTRL

-#endif // _WX_ANIMATEH__
+#endif // _WX_ANIMATE_H_
--- a/include/wx/animdecod.h
+++ b/include/wx/animdecod.h
@@ -86,47 +86,13 @@ enum wxAnimationType

 class WXDLLEXPORT wxAnimationDecoder : public wxObjectRefData
 {
-protected:
-    wxSize m_szAnimation;
-    size_t m_nFrames;
-
-    // this is the colour to use for the wxANIM_TOBACKGROUND disposal.
-    // if not specified by the animation, it's set to wxNullColour
-    wxColour m_background;
-
-public:     // frame specific data getters
-
-    // not all frames may be of the same size; e.g. GIF allows to
-    // specify that between two frames only a smaller portion of the
-    // entire animation has changed.
-    virtual wxSize GetFrameSize(size_t frame) const = 0;
-
-    // the position of this frame in case it's not as big as m_szAnimation
-    // or wxPoint(0,0) otherwise.
-    virtual wxPoint GetFramePosition(size_t frame) const = 0;
-
-    // what should be done after displaying this frame.
-    virtual wxAnimationDisposal GetDisposalMethod(size_t frame) const = 0;
-
-    // the number of milliseconds this frame should be displayed.
-    // if returns -1 then the frame must be displayed forever.
-    virtual long GetDelay(size_t frame) const = 0;
-
-    // the transparent colour for this frame if any or wxNullColour.
-    virtual wxColour GetTransparentColour(size_t frame) const = 0;
-
-    // get global data
-    wxSize GetAnimationSize() const { return m_szAnimation; }
-    wxColour GetBackgroundColour() const { return m_background; }
-    size_t GetFrameCount() const { return m_nFrames; }
-
 public:
    wxAnimationDecoder()
    {
        m_background = wxNullColour;
        m_nFrames = 0;
    }
-    ~wxAnimationDecoder() {}
+    virtual ~wxAnimationDecoder() { }


    virtual bool Load( wxInputStream& stream ) = 0;
@@ -136,7 +102,42 @@ public:
    virtual wxAnimationType GetType() const = 0;

    // convert given frame to wxImage
-    virtual bool ConvertToImage(size_t frame, wxImage *image) const = 0;
+    virtual bool ConvertToImage(unsigned int frame, wxImage *image) const = 0;
+
+
+    // frame specific data getters
+
+    // not all frames may be of the same size; e.g. GIF allows to
+    // specify that between two frames only a smaller portion of the
+    // entire animation has changed.
+    virtual wxSize GetFrameSize(unsigned int frame) const = 0;
+
+    // the position of this frame in case it's not as big as m_szAnimation
+    // or wxPoint(0,0) otherwise.
+    virtual wxPoint GetFramePosition(unsigned int frame) const = 0;
+
+    // what should be done after displaying this frame.
+    virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const = 0;
+
+    // the number of milliseconds this frame should be displayed.
+    // if returns -1 then the frame must be displayed forever.
+    virtual long GetDelay(unsigned int frame) const = 0;
+
+    // the transparent colour for this frame if any or wxNullColour.
+    virtual wxColour GetTransparentColour(unsigned int frame) const = 0;
+
+    // get global data
+    wxSize GetAnimationSize() const { return m_szAnimation; }
+    wxColour GetBackgroundColour() const { return m_background; }
+    unsigned int GetFrameCount() const { return m_nFrames; }
+
+protected:
+    wxSize m_szAnimation;
+    unsigned int m_nFrames;
+
+    // this is the colour to use for the wxANIM_TOBACKGROUND disposal.
+    // if not specified by the animation, it's set to wxNullColour
+    wxColour m_background;
 };


--- a/include/wx/aui/auibook.h
+++ b/include/wx/aui/auibook.h
@@ -530,7 +530,11 @@ public:
    int GetSelection() const;

    virtual void Split(size_t page, int direction);
-   
+
+#if wxABI_VERSION >= 20801
+    const wxAuiManager& GetAuiManager() const { return m_mgr; }
+#endif
+
 protected:

    // these can be overridden
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -74,7 +74,7 @@ public:
    virtual bool ProcessEvent(wxEvent& event);

    wxAuiMDIChildFrame *GetActiveChild() const;
-    inline void SetActiveChild(wxAuiMDIChildFrame* pChildFrame);
+    void SetActiveChild(wxAuiMDIChildFrame* pChildFrame);

    wxAuiMDIClientWindow *GetClientWindow() const;
    virtual wxAuiMDIClientWindow *OnCreateClient();
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1276,6 +1276,17 @@
                        wxUSE_CHOICEBOOK || \
                        wxUSE_TREEBOOK)

+#if wxUSE_COLLPANE
+#   if !wxUSE_BUTTON || !wxUSE_STATLINE
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_COLLPANE requires wxUSE_BUTTON and wxUSE_STATLINE"
+#       else
+#           undef wxUSE_COLLPANE
+#           define wxUSE_COLLPANE 0
+#       endif
+#   endif
+#endif /* wxUSE_COLLPANE */
+
 #if wxUSE_LISTBOOK
 #   if !wxUSE_LISTCTRL
 #       ifdef wxABORT_ON_CONFIG_ERROR
--- a/include/wx/cocoa/statline.h
+++ b/include/wx/cocoa/statline.h
@@ -30,7 +30,7 @@ public:
    wxStaticLine(wxWindow *parent, wxWindowID winid = wxID_ANY,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
-            long style = 0, const wxString& name = wxStaticTextNameStr)
+            long style = 0, const wxString& name = wxStaticLineNameStr)
    {
        Create(parent, winid, pos, size, style, name);
    }
@@ -38,7 +38,7 @@ public:
    bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
-            long style = 0, const wxString& name = wxStaticTextNameStr);
+            long style = 0, const wxString& name = wxStaticLineNameStr);
    virtual ~wxStaticLine();

 // ------------------------------------------------------------------------
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -225,7 +225,7 @@ public:
    // delete the group (with all subgroups)
  virtual bool DeleteGroup(const wxString& key) = 0;
    // delete the whole underlying object (disk file, registry key, ...)
-    // primarly for use by desinstallation routine.
+    // primarily for use by uninstallation routine.
  virtual bool DeleteAll() = 0;

  // options
@@ -254,6 +254,13 @@ protected:
  static bool IsImmutable(const wxString& key)
    { return !key.IsEmpty() && key[0] == wxCONFIG_IMMUTABLE_PREFIX; }

+  // return the path without trailing separator, if any: this should be called
+  // to sanitize paths referring to the group names before passing them to
+  // wxConfigPathChanger as "/foo/bar/" should be the same as "/foo/bar" and it
+  // isn't interpreted in the same way by it (and this can't be changed there
+  // as it's not the same for the entries names)
+  static wxString RemoveTrailingSeparator(const wxString& key);
+
  // do read/write the values of different types
  virtual bool DoReadString(const wxString& key, wxString *pStr) const = 0;
  virtual bool DoReadLong(const wxString& key, long *pl) const = 0;
--- a/include/wx/datetime.h
+++ b/include/wx/datetime.h
@@ -1928,7 +1928,9 @@ inline wxLongLong wxTimeSpan::GetSeconds() const

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

 inline int wxTimeSpan::GetHours() const
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -12,7 +12,6 @@
 #ifndef _WX_DCMEMORY_H_BASE_
 #define _WX_DCMEMORY_H_BASE_

-#include "wx/defs.h"
 #include "wx/bitmap.h"

 // NOTE: different native implementations of wxMemoryDC will derive from
@@ -45,6 +44,7 @@ public:
        DoSelect(bmp);
    }

+protected:
    virtual void DoSelect(const wxBitmap& bmp) = 0;
 };

--- a/include/wx/dfb/evtloop.h
+++ b/include/wx/dfb/evtloop.h
@@ -31,6 +31,10 @@ public:
    // returns DirectFB event buffer used by wx
    static wxIDirectFBEventBufferPtr GetDirectFBEventBuffer();

+    // wxYield implementation: iterate the loop as long as there are any
+    // pending events
+    void Yield();
+
 protected:
    virtual void WakeUp();
    virtual void OnNextIteration();
--- a/include/wx/dfb/private/fontmgr.h
+++ b/include/wx/dfb/private/fontmgr.h
@@ -72,6 +72,7 @@ public:
 private:
    // adds all fonts using AddBundle()
    void AddAllFonts();
+    void AddFontsFromDir(const wxString& indexFile);
    void AddFont(const wxString& dir, const wxString& name, wxFileConfig& cfg);
    void SetDefaultFonts(wxFileConfig& cfg);

--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -73,6 +73,12 @@ public:
        return true;
    }

+#if WXWIN_COMPATIBILITY_2_6
+
+    wxDEPRECATED( long GetStyle() const );
+    wxDEPRECATED( void SetStyle(long style) );
+
+#endif  // WXWIN_COMPATIBILITY_2_6

    virtual void SetMessage(const wxString& message) { m_message = message; }
    virtual void SetPath(const wxString& path) { m_path = path; }
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -129,6 +129,14 @@ public:
                                           wxArrayString& filters) );
 #endif // WXWIN_COMPATIBILITY_2_4

+#if WXWIN_COMPATIBILITY_2_6
+
+    wxDEPRECATED( long GetStyle() const );
+    wxDEPRECATED( void SetStyle(long style) );
+
+#endif  // WXWIN_COMPATIBILITY_2_6
+
+
    // Append first extension to filePath from a ';' separated extensionList
    // if filePath = "path/foo.bar" just return it as is
    // if filePath = "foo[.]" and extensionList = "*.jpg;*.png" return "foo.jpg"
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -295,8 +295,8 @@ enum wxFileKind
                    #define   wxOpen       _wopen
                #endif
                #define   wxAccess     _waccess
-                #define   wxMkDir      _mkdir
-                #define   wxRmDir      _rmdir
+                #define   wxMkDir      _wmkdir
+                #define   wxRmDir      _wrmdir
                #ifdef wxHAS_HUGE_FILES
                    #define   wxStat       _wstati64
                #else
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -157,6 +157,9 @@ enum wxStockCursor
 #elif defined(__WXMGL__)
    // Initialize from an included XPM
    #define wxICON(X) wxIcon( (const char**) X##_xpm )
+#elif defined(__WXDFB__)
+    // Initialize from an included XPM
+    #define wxICON(X) wxIcon( (const char**) X##_xpm )
 #elif defined(__WXGTK__)
    // Initialize from an included XPM
    #define wxICON(X) wxIcon( (const char**) X##_xpm )
@@ -185,6 +188,7 @@ enum wxStockCursor
      defined(__WXX11__)   || \
      defined(__WXMAC__)   || \
      defined(__WXMGL__)   || \
+      defined(__WXDFB__)   || \
      defined(__WXCOCOA__)
    // Initialize from an included XPM
    #define wxBITMAP(name) wxBitmap( (const char**) name##_xpm )
@@ -483,7 +487,7 @@ public:
 };

 #if WXWIN_COMPATIBILITY_2_6
-inline bool wxRect::Inside(int x, int y) const { return Contains(x, y); }
+inline bool wxRect::Inside(int cx, int cy) const { return Contains(cx, cy); }
 inline bool wxRect::Inside(const wxPoint& pt) const { return Contains(pt); }
 inline bool wxRect::Inside(const wxRect& rect) const { return Contains(rect); }
 #endif // WXWIN_COMPATIBILITY_2_6
--- a/include/wx/generic/animate.h
+++ b/include/wx/generic/animate.h
@@ -26,9 +26,9 @@ public:
    virtual bool IsOk() const
        { return m_refData != NULL; }

-    virtual size_t GetFrameCount() const;
-    virtual int GetDelay(size_t i) const;
-    virtual wxImage GetFrame(size_t i) const;
+    virtual unsigned int GetFrameCount() const;
+    virtual int GetDelay(unsigned int i) const;
+    virtual wxImage GetFrame(unsigned int i) const;
    virtual wxSize GetSize() const;

    virtual bool LoadFile(const wxString& filename,
@@ -36,12 +36,11 @@ public:
    virtual bool Load(wxInputStream& stream,
                      wxAnimationType type = wxANIMATION_TYPE_ANY);

-public:     // extended interface used by the generic implementation of wxAnimationCtrl
-
-    wxPoint GetFramePosition(size_t frame) const;
-    wxSize GetFrameSize(size_t frame) const;
-    wxAnimationDisposal GetDisposalMethod(size_t frame) const;
-    wxColour GetTransparentColour(size_t frame) const;
+    // extended interface used by the generic implementation of wxAnimationCtrl
+    wxPoint GetFramePosition(unsigned int frame) const;
+    wxSize GetFrameSize(unsigned int frame) const;
+    wxAnimationDisposal GetDisposalMethod(unsigned int frame) const;
+    wxColour GetTransparentColour(unsigned int frame) const;
    wxColour GetBackgroundColour() const;

 protected:
@@ -147,14 +146,14 @@ protected:      // internal utilities
    void DisposeToBackground(wxDC& dc, const wxPoint &pos, const wxSize &sz);

    void IncrementalUpdateBackingStore();
-    bool RebuildBackingStoreUpToFrame(size_t);
-    void DrawFrame(wxDC &dc, size_t);
+    bool RebuildBackingStoreUpToFrame(unsigned int);
+    void DrawFrame(wxDC &dc, unsigned int);

    virtual void DisplayStaticImage();
    virtual wxSize DoGetBestSize() const;

 protected:
-    size_t        m_currentFrame;     // Current frame
+    unsigned int  m_currentFrame;     // Current frame
    bool          m_looped;           // Looped, or not
    wxTimer       m_timer;            // The timer
    wxAnimation   m_animation;        // The animation
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -12,8 +12,6 @@
 #ifndef _WX_COLLAPSABLE_PANE_H_GENERIC_
 #define _WX_COLLAPSABLE_PANE_H_GENERIC_

-#if wxUSE_BUTTON && wxUSE_STATLINE
-
 // forward declared
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxStaticLine;
@@ -21,7 +19,6 @@ class WXDLLEXPORT wxStaticLine;
 // class name
 extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[];

-
 // ----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 // ----------------------------------------------------------------------------
@@ -64,7 +61,6 @@ public:
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxCollapsiblePaneNameStr);

-
    // public wxCollapsiblePane API
    virtual void Collapse(bool collapse = true);
    virtual void SetLabel(const wxString &label);
@@ -76,6 +72,7 @@ public:
    virtual wxString GetLabel() const
        { return m_strLabel; }

+    virtual bool Layout();

    // implementation only, don't use
    void OnStateChange(const wxSize& sizeNew);
@@ -83,7 +80,6 @@ public:
 protected:
    // overridden methods
    virtual wxSize DoGetBestSize() const;
-    bool Layout();

    wxString GetBtnLabel() const;
    int GetBorder() const;
@@ -106,7 +102,4 @@ private:
    DECLARE_EVENT_TABLE()
 };

-#endif // wxUSE_BUTTON && wxUSE_STATLINE
-
-
 #endif // _WX_COLLAPSABLE_PANE_H_GENERIC_
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __SPLITTERH_G__
-#define __SPLITTERH_G__
+#ifndef _WX_GENERIC_SPLITTER_H_
+#define _WX_GENERIC_SPLITTER_H_

 #include "wx/window.h"                      // base class declaration
 #include "wx/containr.h"                    // wxControlContainer
@@ -226,7 +226,7 @@ protected:

    // send the given event, return false if the event was processed and vetoed
    // by the user code
-    inline bool DoSendEvent(wxSplitterEvent& event);
+    bool DoSendEvent(wxSplitterEvent& event);

    // common part of all ctors
    void Init();
@@ -403,4 +403,4 @@ typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&);
 #define EVT_SPLITTER_UNSPLIT(id, fn) \
    wx__DECLARE_SPLITTEREVT(UNSPLIT, id, fn)

-#endif // __SPLITTERH_G__
+#endif // _WX_GENERIC_SPLITTER_H_
--- a/include/wx/generic/srchctlg.h
+++ b/include/wx/generic/srchctlg.h
@@ -0,0 +1,246 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/generic/srchctlg.h
+// Purpose:     generic wxSearchCtrl class
+// Author:      Vince Harron
+// Created:     2006-02-19
+// RCS-ID:      $Id$
+// Copyright:   Vince Harron
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GENERIC_SEARCHCTRL_H_
+#define _WX_GENERIC_SEARCHCTRL_H_
+
+#if wxUSE_SEARCHCTRL
+
+#include "wx/bitmap.h"
+
+class WXDLLEXPORT wxSearchButton;
+class WXDLLEXPORT wxSearchTextCtrl;
+
+// ----------------------------------------------------------------------------
+// wxSearchCtrl is a combination of wxTextCtrl and wxSearchButton
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxSearchCtrl : public wxSearchCtrlBase
+{
+public:
+    // creation
+    // --------
+
+    wxSearchCtrl();
+    wxSearchCtrl(wxWindow *parent, wxWindowID id,
+               const wxString& value = wxEmptyString,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString& name = wxSearchCtrlNameStr);
+
+    virtual ~wxSearchCtrl();
+
+    bool Create(wxWindow *parent, wxWindowID id,
+                const wxString& value = wxEmptyString,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxSearchCtrlNameStr);
+
+    // get/set search button menu
+    // --------------------------
+    virtual void SetMenu( wxMenu* menu );
+    virtual wxMenu* GetMenu();
+
+    // get/set search options
+    // ----------------------
+    virtual void ShowSearchButton( bool show );
+    virtual bool IsSearchButtonVisible() const;
+
+    virtual void ShowCancelButton( bool show );
+    virtual bool IsCancelButtonVisible() const;
+
+    // accessors
+    // ---------
+
+    virtual wxString GetValue() const;
+    virtual void SetValue(const wxString& value);
+
+    virtual wxString GetRange(long from, long to) const;
+
+    virtual int GetLineLength(long lineNo) const;
+    virtual wxString GetLineText(long lineNo) const;
+    virtual int GetNumberOfLines() const;
+
+    virtual bool IsModified() const;
+    virtual bool IsEditable() const;
+
+    // more readable flag testing methods
+    virtual bool IsSingleLine() const;
+    virtual bool IsMultiLine() const;
+
+    // If the return values from and to are the same, there is no selection.
+    virtual void GetSelection(long* from, long* to) const;
+
+    virtual wxString GetStringSelection() const;
+
+    // operations
+    // ----------
+
+    // editing
+    virtual void Clear();
+    virtual void Replace(long from, long to, const wxString& value);
+    virtual void Remove(long from, long to);
+
+    // load/save the controls contents from/to the file
+    virtual bool LoadFile(const wxString& file);
+    virtual bool SaveFile(const wxString& file = wxEmptyString);
+
+    // sets/clears the dirty flag
+    virtual void MarkDirty();
+    virtual void DiscardEdits();
+
+    // set the max number of characters which may be entered in a single line
+    // text control
+    virtual void SetMaxLength(unsigned long WXUNUSED(len));
+
+    // writing text inserts it at the current position, appending always
+    // inserts it at the end
+    virtual void WriteText(const wxString& text);
+    virtual void AppendText(const wxString& text);
+
+    // insert the character which would have resulted from this key event,
+    // return true if anything has been inserted
+    virtual bool EmulateKeyPress(const wxKeyEvent& event);
+
+    // text control under some platforms supports the text styles: these
+    // methods allow to apply the given text style to the given selection or to
+    // set/get the style which will be used for all appended text
+    virtual bool SetStyle(long start, long end, const wxTextAttr& style);
+    virtual bool GetStyle(long position, wxTextAttr& style);
+    virtual bool SetDefaultStyle(const wxTextAttr& style);
+    virtual const wxTextAttr& GetDefaultStyle() const;
+
+    // translate between the position (which is just an index in the text ctrl
+    // considering all its contents as a single strings) and (x, y) coordinates
+    // which represent column and line.
+    virtual long XYToPosition(long x, long y) const;
+    virtual bool PositionToXY(long pos, long *x, long *y) const;
+
+    virtual void ShowPosition(long pos);
+
+    // find the character at position given in pixels
+    //
+    // NB: pt is in device coords (not adjusted for the client area origin nor
+    //     scrolling)
+    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const;
+    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
+                                            wxTextCoord *col,
+                                            wxTextCoord *row) const;
+
+    // Clipboard operations
+    virtual void Copy();
+    virtual void Cut();
+    virtual void Paste();
+
+    virtual bool CanCopy() const;
+    virtual bool CanCut() const;
+    virtual bool CanPaste() const;
+
+    // Undo/redo
+    virtual void Undo();
+    virtual void Redo();
+
+    virtual bool CanUndo() const;
+    virtual bool CanRedo() const;
+
+    // Insertion point
+    virtual void SetInsertionPoint(long pos);
+    virtual void SetInsertionPointEnd();
+    virtual long GetInsertionPoint() const;
+    virtual wxTextPos GetLastPosition() const;
+
+    virtual void SetSelection(long from, long to);
+    virtual void SelectAll();
+    virtual void SetEditable(bool editable);
+
+#if 0
+
+    // override streambuf method
+#if wxHAS_TEXT_WINDOW_STREAM
+    int overflow(int i);
+#endif // wxHAS_TEXT_WINDOW_STREAM
+
+    // stream-like insertion operators: these are always available, whether we
+    // were, or not, compiled with streambuf support
+    wxTextCtrl& operator<<(const wxString& s);
+    wxTextCtrl& operator<<(int i);
+    wxTextCtrl& operator<<(long i);
+    wxTextCtrl& operator<<(float f);
+    wxTextCtrl& operator<<(double d);
+    wxTextCtrl& operator<<(const wxChar c);
+#endif
+
+    // do the window-specific processing after processing the update event
+    virtual void DoUpdateWindowUI(wxUpdateUIEvent& event);
+
+    virtual bool ShouldInheritColours() const;
+
+    // wxWindow overrides
+    virtual bool SetFont(const wxFont& font);
+
+    // search control generic only
+    void SetSearchBitmap( const wxBitmap& bitmap );
+    void SetSearchMenuBitmap( const wxBitmap& bitmap );
+    void SetCancelBitmap( const wxBitmap& bitmap );
+
+protected:
+    virtual void DoSetValue(const wxString& value, int flags = 0);
+
+    // override the base class virtuals involved into geometry calculations
+    virtual wxSize DoGetBestSize() const;
+    virtual void DoMoveWindow(int x, int y, int width, int height);
+    virtual void LayoutControls(int x, int y, int width, int height);
+
+    virtual void RecalcBitmaps();
+
+    void Init();
+
+    virtual wxBitmap RenderSearchBitmap( int x, int y, bool renderDrop );
+    virtual wxBitmap RenderCancelBitmap( int x, int y );
+
+    virtual void OnSearchButton( wxCommandEvent& event );
+
+    void OnSetFocus( wxFocusEvent& event );
+    void OnSize( wxSizeEvent& event );
+    
+private:
+    friend class wxSearchButton;
+
+    void PopupSearchMenu();
+
+    // the subcontrols
+    wxSearchTextCtrl *m_text;
+    wxSearchButton *m_searchButton;
+    wxSearchButton *m_cancelButton;
+    wxMenu *m_menu;
+
+    bool m_searchButtonVisible;
+    bool m_cancelButtonVisible;
+
+    bool m_searchBitmapUser;
+    bool m_searchMenuBitmapUser;
+    bool m_cancelBitmapUser;
+    wxBitmap m_searchBitmap;
+    wxBitmap m_searchMenuBitmap;
+    wxBitmap m_cancelBitmap;
+private:
+    DECLARE_DYNAMIC_CLASS(wxSearchCtrl)
+
+    DECLARE_EVENT_TABLE()
+};
+
+#endif // wxUSE_SEARCHCTRL
+
+#endif // _WX_GENERIC_SEARCHCTRL_H_
+
--- a/include/wx/generic/statline.h
+++ b/include/wx/generic/statline.h
@@ -30,7 +30,7 @@ public:
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,
-                  const wxString &name = wxStaticTextNameStr )
+                  const wxString &name = wxStaticLineNameStr )
    {
        Create(parent, id, pos, size, style, name);
    }
@@ -42,7 +42,7 @@ public:
                 const wxPoint &pos = wxDefaultPosition,
                 const wxSize &size = wxDefaultSize,
                 long style = wxLI_HORIZONTAL,
-                 const wxString &name = wxStaticTextNameStr );
+                 const wxString &name = wxStaticLineNameStr );

    // it's necessary to override this wxWindow function because we
    // will want to return the main widget for m_statbox
--- a/include/wx/gifdecod.h
+++ b/include/wx/gifdecod.h
@@ -8,8 +8,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef _WX_GIFDECOD_H
-#define _WX_GIFDECOD_H
+#ifndef _WX_GIFDECOD_H_
+#define _WX_GIFDECOD_H_

 #include "wx/defs.h"

@@ -20,7 +20,7 @@
 #include "wx/animdecod.h"

 // internal utility used to store a frame in 8bit-per-pixel format
-class /*WXDLLEXPORT*/ GIFImage;
+class GIFImage;


 // --------------------------------------------------------------------------
@@ -31,76 +31,55 @@ class /*WXDLLEXPORT*/ GIFImage;
 //  Note that the error code wxGIF_TRUNCATED means that the image itself
 //  is most probably OK, but the decoder didn't reach the end of the data
 //  stream; this means that if it was not reading directly from file,
-//  the stream will not be correctly positioned. the
+//  the stream will not be correctly positioned.
 //
 enum wxGIFErrorCode
 {
-    wxGIF_OK = 0,                   /* everything was OK */
-    wxGIF_INVFORMAT,                /* error in gif header */
-    wxGIF_MEMERR,                   /* error allocating memory */
-    wxGIF_TRUNCATED                 /* file appears to be truncated */
+    wxGIF_OK = 0,                   // everything was OK
+    wxGIF_INVFORMAT,                // error in GIF header
+    wxGIF_MEMERR,                   // error allocating memory
+    wxGIF_TRUNCATED                 // file appears to be truncated
 };

-#define MAX_BLOCK_SIZE 256          /* max. block size */
-
-
 // --------------------------------------------------------------------------
 // wxGIFDecoder class
 // --------------------------------------------------------------------------

 class WXDLLEXPORT wxGIFDecoder : public wxAnimationDecoder
 {
-private:
-    // a wxArray provides a constant access time rather than a linear time
-    // like for linked lists.
-    wxArrayPtrVoid m_frames;
-
-    // decoder state vars
-    int           m_restbits;       /* remaining valid bits */
-    unsigned int  m_restbyte;       /* remaining bytes in this block */
-    unsigned int  m_lastbyte;       /* last byte read */
-    unsigned char m_buffer[MAX_BLOCK_SIZE];     /* buffer for reading */
-    unsigned char *m_bufp;          /* pointer to next byte in buffer */
-
-private:
-    int getcode(wxInputStream& stream, int bits, int abfin);
-    wxGIFErrorCode dgif(wxInputStream& stream, GIFImage *img, int interl, int bits);
-
-public:
-    // get data of current frame
-    unsigned char* GetData(size_t frame) const;
-    unsigned char* GetPalette(size_t frame) const;
-    unsigned int GetNcolours(size_t frame) const;
-    int GetTransparentColourIndex(size_t frame) const;
-    wxColour GetTransparentColour(size_t frame) const;
-
-    virtual wxSize GetFrameSize(size_t frame) const;
-    virtual wxPoint GetFramePosition(size_t frame) const;
-    virtual wxAnimationDisposal GetDisposalMethod(size_t frame) const;
-    virtual long GetDelay(size_t frame) const;
-
-    // GIFs can contain both static images and animations
-    bool IsAnimation() const
-        { return m_nFrames > 1; }
-
 public:
    // constructor, destructor, etc.
    wxGIFDecoder();
    ~wxGIFDecoder();

+    // get data of current frame
+    unsigned char* GetData(unsigned int frame) const;
+    unsigned char* GetPalette(unsigned int frame) const;
+    unsigned int GetNcolours(unsigned int frame) const;
+    int GetTransparentColourIndex(unsigned int frame) const;
+    wxColour GetTransparentColour(unsigned int frame) const;
+
+    virtual wxSize GetFrameSize(unsigned int frame) const;
+    virtual wxPoint GetFramePosition(unsigned int frame) const;
+    virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const;
+    virtual long GetDelay(unsigned int frame) const;
+
+    // GIFs can contain both static images and animations
+    bool IsAnimation() const
+        { return m_nFrames > 1; }
+
    // load function which returns more info than just Load():
    wxGIFErrorCode LoadGIF( wxInputStream& stream );

    // free all internal frames
    void Destroy();

-public:     // implementation of wxAnimationDecoder's pure virtuals
-
+    // implementation of wxAnimationDecoder's pure virtuals
    virtual bool CanRead( wxInputStream& stream ) const;
    virtual bool Load( wxInputStream& stream )
        { return LoadGIF(stream) == wxGIF_OK; }

-    bool ConvertToImage(size_t frame, wxImage *image) const;
+    bool ConvertToImage(unsigned int frame, wxImage *image) const;

    wxAnimationDecoder *Clone() const
        { return new wxGIFDecoder; }
@@ -108,9 +87,23 @@ public:     // implementation of wxAnimationDecoder's pure virtuals
        { return wxANIMATION_TYPE_GIF; }

 private:
+    // array of all frames
+    wxArrayPtrVoid m_frames;
+
+    // decoder state vars
+    int           m_restbits;       // remaining valid bits
+    unsigned int  m_restbyte;       // remaining bytes in this block
+    unsigned int  m_lastbyte;       // last byte read
+    unsigned char m_buffer[256];    // buffer for reading
+    unsigned char *m_bufp;          // pointer to next byte in buffer
+
+    int getcode(wxInputStream& stream, int bits, int abfin);
+    wxGIFErrorCode dgif(wxInputStream& stream,
+                        GIFImage *img, int interl, int bits);
+
    DECLARE_NO_COPY_CLASS(wxGIFDecoder)
 };

+#endif // wxUSE_STREAM && wxUSE_GIF

-#endif  // wxUSE_STREAM && wxUSE_GIF
-#endif  // _WX_GIFDECOD_H
+#endif // _WX_GIFDECOD_H_
--- a/include/wx/graphics.h
+++ b/include/wx/graphics.h
@@ -125,6 +125,10 @@ public :
       virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, 
           wxDouble tx=0.0, wxDouble ty=0.0) = 0;

+       // gets the component valuess of the matrix
+       virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL,  wxDouble* c=NULL,
+                        wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const = 0;
+       
       // makes this the inverse matrix
       virtual void Invert() = 0;

@@ -176,6 +180,10 @@ public :
    virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, 
        wxDouble tx=0.0, wxDouble ty=0.0);

+    // gets the component valuess of the matrix
+    virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL,  wxDouble* c=NULL,
+                     wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const;
+       
    // makes this the inverse matrix
    virtual void Invert();

--- a/include/wx/gtk/animate.h
+++ b/include/wx/gtk/animate.h
@@ -39,14 +39,12 @@ public:

    // unfortunately GdkPixbufAnimation does not expose these info:

-    virtual size_t GetFrameCount() const
-        { return 0; }
-    virtual wxImage GetFrame(size_t i) const;
+    virtual unsigned int GetFrameCount() const { return 0; }
+    virtual wxImage GetFrame(unsigned int frame) const;

    // we can retrieve the delay for a frame only after building
    // a GdkPixbufAnimationIter...
-    virtual int GetDelay(size_t i) const
-        { return 0; }
+    virtual int GetDelay(unsigned int frame) const { return 0; }

    virtual wxSize GetSize() const;

--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -53,7 +53,8 @@ public:
 #endif // __WXDEBUG__

    guint m_idleTag;
-    void RemoveIdleSource();
+    // temporarily disable idle events
+    void SuspendIdleCallback();

    // Used by the the wxGLApp and wxGLCanvas class for GL-based X visual
    // selection.
--- a/include/wx/gtk/collpane.h
+++ b/include/wx/gtk/collpane.h
@@ -51,25 +51,22 @@ public:
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxCollapsiblePaneNameStr);

-public:     // public API
-
-    wxSize DoGetBestSize() const;
    void Collapse(bool collapse = true);
    bool IsCollapsed() const;
    void SetLabel(const wxString &str);

-    void OnSize(wxSizeEvent&);
+protected:
+    virtual wxSize DoGetBestSize() const;

 public:     // used by GTK callbacks
-
    bool m_bIgnoreNextChange;
    wxSize m_szCollapsed;

 private:
+    void OnSize(wxSizeEvent&);
+
    DECLARE_DYNAMIC_CLASS(wxCollapsiblePane)
    DECLARE_EVENT_TABLE()
 };

-
-#endif
-    // _WX_COLLAPSABLE_PANEL_H_GTK_
+#endif // _WX_COLLAPSABLE_PANEL_H_GTK_
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -7,18 +7,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __GTKDCMEMORYH__
-#define __GTKDCMEMORYH__
+#ifndef _WX_GTK_DCMEMORY_H_
+#define _WX_GTK_DCMEMORY_H_

-#include "wx/defs.h"
 #include "wx/dcclient.h"

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMemoryDC;
-
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
@@ -48,15 +41,13 @@ public:
 protected:
    void DoGetSize( int *width, int *height ) const;
    virtual void DoSelect(const wxBitmap& bitmap);
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const 
+    { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }

 private:
    void Init();
-    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const 
-    { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }

    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };

-#endif
-    // __GTKDCMEMORYH__
-
+#endif // _WX_GTK_DCMEMORY_H_
--- a/include/wx/gtk/filepicker.h
+++ b/include/wx/gtk/filepicker.h
@@ -17,8 +17,6 @@
 // that GTK+ < 2.4
 #include "wx/generic/filepickerg.h"

-
-
 //-----------------------------------------------------------------------------
 // wxFileButton and wxDirButton shared code
 // (cannot be a base class since they need to derive from wxGenericFileButton
@@ -49,6 +47,7 @@
    /*      invalid cast from `GtkFileChooserButton' to  `GtkButton'       */ \
    /* so, override wxButton::GTKGetWindow and return NULL as GTK+ doesn't */ \
    /* give us access to the internal GdkWindow of a GtkFileChooserButton  */ \
+protected:                                                                    \
    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const         \
        { return NULL; }

@@ -98,9 +97,6 @@ public:     // overrides
    // event handler for the click
    void OnDialogOK(wxCommandEvent &);

-
-public:     // some overrides
-
    // GtkFileChooserButton does not support GTK_FILE_CHOOSER_ACTION_SAVE
    // so we replace it with GTK_FILE_CHOOSER_ACTION_OPEN; since wxFD_SAVE
    // is not supported, wxFD_OVERWRITE_PROMPT isn't too...
@@ -118,7 +114,6 @@ public:     // some overrides
 protected:
    wxDialog *m_dialog;

-private:
    DECLARE_DYNAMIC_CLASS(wxFileButton)
 };

--- a/include/wx/gtk/gnome/gprint.h
+++ b/include/wx/gtk/gnome/gprint.h
@@ -8,10 +8,8 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __gprint_H__
-#define __gprint_H__
-
-// Include wxWindows' headers
+#ifndef _WX_GTK_GPRINT_H_
+#define _WX_GTK_GPRINT_H_

 #include "wx/defs.h"

@@ -50,7 +48,6 @@ private:
    GnomePrintConfig  *m_config;
    GnomePrintJob     *m_job;

-private:
    DECLARE_DYNAMIC_CLASS(wxGnomePrintNativeData)
 };

@@ -116,7 +113,7 @@ public:
    virtual bool TransferDataToWindow();
    virtual bool TransferDataFromWindow();

-private:
+protected:
    // Implement some base class methods to do nothing to avoid asserts and
    // GTK warnings, since this is not a real wxDialog.
    virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
@@ -125,10 +122,10 @@ private:
    virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y),
                              int WXUNUSED(width), int WXUNUSED(height)) {}

+private:
    void Init();
    wxPrintDialogData   m_printDialogData;

-private:
    DECLARE_DYNAMIC_CLASS(wxGnomePrintDialog)
 };

@@ -151,7 +148,7 @@ public:
    virtual bool TransferDataToWindow();
    virtual bool TransferDataFromWindow();

-private:
+protected:
    // Implement some base class methods to do nothing to avoid asserts and
    // GTK warnings, since this is not a real wxDialog.
    virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
@@ -160,9 +157,9 @@ private:
    virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y),
                              int WXUNUSED(width), int WXUNUSED(height)) {}

+private:
    wxPageSetupDialogData   m_pageDialogData;

-private:
    DECLARE_DYNAMIC_CLASS(wxGnomePageSetupDialog)
 };

@@ -207,6 +204,32 @@ public:
    bool Ok() const { return IsOk(); }
    bool IsOk() const;

+    bool CanDrawBitmap() const { return true; }
+    void Clear();
+    void SetFont( const wxFont& font );
+    void SetPen( const wxPen& pen );
+    void SetBrush( const wxBrush& brush );
+    void SetLogicalFunction( int function );
+    void SetBackground( const wxBrush& brush );
+    void DestroyClippingRegion();
+    bool StartDoc(const wxString& message);
+    void EndDoc();
+    void StartPage();
+    void EndPage();
+    wxCoord GetCharHeight() const;
+    wxCoord GetCharWidth() const;
+    bool CanGetTextExtent() const { return true; }
+    wxSize GetPPI() const;
+    void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
+    void SetLogicalOrigin( wxCoord x, wxCoord y );
+    void SetDeviceOrigin( wxCoord x, wxCoord y );
+    virtual int GetDepth() const { return 24; }
+    void SetBackgroundMode(int WXUNUSED(mode)) { }
+    void SetPalette(const wxPalette& WXUNUSED(palette)) { }
+    static void SetResolution(int ppi);
+    static int GetResolution();
+
+protected:
    bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style=wxFLOOD_SURFACE );
    bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
    void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
@@ -223,59 +246,25 @@ public:
 #if wxUSE_SPLINES
    void DoDrawSpline(wxList *points);
 #endif // wxUSE_SPLINES
-
    bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
            wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = false,
            wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
    void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );
    void DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false  );
-    bool CanDrawBitmap() const { return true; }
-
    void DoDrawText(const wxString& text, wxCoord x, wxCoord y );
    void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);
-    void Clear();
-    void SetFont( const wxFont& font );
-    void SetPen( const wxPen& pen );
-    void SetBrush( const wxBrush& brush );
-    void SetLogicalFunction( int function );
-    void SetBackground( const wxBrush& brush );
-
    void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-    void DestroyClippingRegion();
    void DoSetClippingRegionAsRegion( const wxRegion &WXUNUSED(clip) ) { }
-
-    bool StartDoc(const wxString& message);
-    void EndDoc();
-    void StartPage();
-    void EndPage();
-
-    wxCoord GetCharHeight() const;
-    wxCoord GetCharWidth() const;
-    bool CanGetTextExtent() const { return true; }
    void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                     wxCoord *descent = (wxCoord *) NULL,
                     wxCoord *externalLeading = (wxCoord *) NULL,
                     wxFont *theFont = (wxFont *) NULL ) const;
-
    void DoGetSize(int* width, int* height) const;
    void DoGetSizeMM(int *width, int *height) const;
-    wxSize GetPPI() const;
-    void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
-
-    void SetLogicalOrigin( wxCoord x, wxCoord y );
-    void SetDeviceOrigin( wxCoord x, wxCoord y );
-
-    virtual int GetDepth() const { return 24; }
-
-    void SetBackgroundMode(int WXUNUSED(mode)) { }
-    void SetPalette(const wxPalette& WXUNUSED(palette)) { }

    wxPrintData& GetPrintData() { return m_printData; }
    void SetPrintData(const wxPrintData& data) { m_printData = data; }

-    static void SetResolution(int ppi);
-    static int GetResolution();
-
 private:
    static float ms_PSScaleFactor;

--- a/include/wx/gtk/gnome/gvfs.h
+++ b/include/wx/gtk/gnome/gvfs.h
@@ -8,10 +8,8 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __gvfs_H__
-#define __gvfs_H__
-
-// Include wxWindows' headers
+#ifndef _WX_GTK_GVFS_H_
+#define _WX_GTK_GVFS_H_

 #include "wx/defs.h"

@@ -28,7 +26,8 @@ class wxGnomeVFSMimeTypesManagerImpl: public wxMimeTypesManagerImpl
 {
 public:
    wxGnomeVFSMimeTypesManagerImpl() { }
-    
+
+protected:
    virtual bool DoAssociation(const wxString& strType,
                       const wxString& strIcon,
                       wxMimeTypeCommands *entry,
--- a/include/wx/gtk/statline.h
+++ b/include/wx/gtk/statline.h
@@ -27,13 +27,13 @@ public:
                 const wxPoint &pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxLI_HORIZONTAL,
-                 const wxString &name = wxStaticTextNameStr);
+                 const wxString &name = wxStaticLineNameStr);
    bool Create(wxWindow *parent,
                wxWindowID id = wxID_ANY,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxLI_HORIZONTAL,
-                const wxString &name = wxStaticTextNameStr);
+                const wxString &name = wxStaticLineNameStr);

    static wxVisualAttributes
    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -8,8 +8,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __GTKTEXTCTRLH__
-#define __GTKTEXTCTRLH__
+#ifndef _WX_GTK_TEXTCTRL_H_
+#define _WX_GTK_TEXTCTRL_H_
+
+typedef struct _GtkTextMark GtkTextMark;

 //-----------------------------------------------------------------------------
 // wxTextCtrl
@@ -176,7 +178,7 @@ public:
    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

    // has the control been frozen by Freeze()?
-    bool IsFrozen() const { return m_frozenness > 0; }
+    bool IsFrozen() const { return m_freezeCount > 0; }

 protected:
    virtual wxSize DoGetBestSize() const;
@@ -219,11 +221,12 @@ private:
    int         m_countUpdatesToIgnore;

    // Our text buffer. Convenient, and holds the buffer while using
-    // a dummy one when m_frozenness > 0
+    // a dummy one when frozen
    GtkTextBuffer *m_buffer;

    // number of calls to Freeze() minus number of calls to Thaw()
-    unsigned int m_frozenness;
+    unsigned m_freezeCount;
+    GtkTextMark* m_showPositionOnThaw;

    // For wxTE_AUTO_URL
    void OnUrlMouseEvent(wxMouseEvent&);
@@ -234,5 +237,4 @@ private:
    DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 };

-#endif // __GTKTEXTCTRLH__
-
+#endif // _WX_GTK_TEXTCTRL_H_
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -108,6 +108,12 @@ public:
    // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.
    int m_urgency_hint;

+    // give hints to the Window Manager for how the size
+    // of the TLW can be changed by dragging
+    virtual void DoSetSizeHints( int minW, int minH,
+                                 int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
+                                 int incW = wxDefaultCoord, int incH = wxDefaultCoord );
+
 protected:
    // common part of all ctors
    void Init();
@@ -120,12 +126,6 @@ protected:
    virtual void DoSetSize(int x, int y,
                           int width, int height,
                           int sizeFlags = wxSIZE_AUTO);
-
-    // give hints to the Window Manager for how the size
-    // of the TLW can be changed by dragging
-    virtual void DoSetSizeHints( int minW, int minH,
-                                 int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
-                                 int incW = wxDefaultCoord, int incH = wxDefaultCoord );
                                 
    virtual void DoSetClientSize(int width, int height);
    virtual void DoGetClientSize( int *width, int *height ) const;
--- a/include/wx/gtk1/statline.h
+++ b/include/wx/gtk1/statline.h
@@ -27,13 +27,13 @@ public:
                 const wxPoint &pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxLI_HORIZONTAL,
-                 const wxString &name = wxStaticTextNameStr);
+                 const wxString &name = wxStaticLineNameStr);
    bool Create(wxWindow *parent,
                wxWindowID id = wxID_ANY,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxLI_HORIZONTAL,
-                const wxString &name = wxStaticTextNameStr);
+                const wxString &name = wxStaticLineNameStr);

    static wxVisualAttributes
    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -443,7 +443,7 @@ protected:

    wxString DoSelectionToText(wxHtmlSelection *sel);

-private:
+public:
    // wxHtmlWindowInterface methods:
    virtual void SetHTMLWindowTitle(const wxString& title);
    virtual void OnHTMLLinkClicked(const wxHtmlLinkInfo& link);
--- a/include/wx/imagtga.h
+++ b/include/wx/imagtga.h
@@ -34,10 +34,10 @@ public:
                            bool verbose = true, int index = -1);
    virtual bool SaveFile(wxImage* image, wxOutputStream& stream,
                             bool verbose = true);
+protected:
    virtual bool DoCanRead(wxInputStream& stream);
 #endif // wxUSE_STREAMS

-private:
    DECLARE_DYNAMIC_CLASS(wxTGAHandler)
 };

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

 #define WX_DECLARE_LIST(elementtype, listname)                              \
--- a/include/wx/listbook.h
+++ b/include/wx/listbook.h
@@ -65,6 +65,7 @@ public:
                const wxString& name = wxEmptyString);


+    // overridden base class methods
    virtual int GetSelection() const;
    virtual bool SetPageText(size_t n, const wxString& strText);
    virtual wxString GetPageText(size_t n) const;
@@ -78,6 +79,7 @@ public:
                            int imageId = -1);
    virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
    virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
+    virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
    virtual void SetImageList(wxImageList *imageList);

    virtual bool DeleteAllPages();
@@ -90,9 +92,6 @@ protected:
    // get the size which the list control should have
    virtual wxSize GetControllerSize() const;

-    // return the page corresponding to the tab at the specified position
-    virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
-
    void UpdateSelectedPage(size_t newsel);

    wxBookCtrlBaseEvent* CreatePageChangingEvent() const;
--- a/include/wx/mac/carbon/app.h
+++ b/include/wx/mac/carbon/app.h
@@ -75,6 +75,10 @@ public:
    void MacSetCurrentEvent( WXEVENTREF event , WXEVENTHANDLERCALLREF handler )
    { m_macCurrentEvent = event ; m_macCurrentEventHandlerCallRef = handler ; }

+    // adding a CFType object to be released only at the end of the current event cycle (increases the
+    // refcount of the object passed), needed in case we are in the middle of an event concering an object
+    // we want to delete and cannot do it immediately
+    void                  MacAddToAutorelease( void* cfrefobj );
 public:
    static wxWindow*      s_captureWindow ;
    static long           s_lastModifiers ;
--- a/include/wx/mac/carbon/colour.h
+++ b/include/wx/mac/carbon/colour.h
@@ -31,7 +31,7 @@ public:

    // accessors
    bool Ok() const { return IsOk(); }
-    bool IsOk() const {return m_isInit; }
+    bool IsOk() const;

    unsigned char Red() const { return m_red; }
    unsigned char Green() const { return m_green; }
--- a/include/wx/mac/carbon/listctrl.h
+++ b/include/wx/mac/carbon/listctrl.h
@@ -12,8 +12,11 @@
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_

+#include "wx/defs.h"
 #include "wx/generic/listctrl.h"

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