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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_8_0_rc3@43822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
--with-gnomeprint not needed any longer, it's the default now
2006-12-05 15:23:50 +00:00 · 2006-12-04 22:41:46 +00:00 · 2006-12-04 22:40:25 +00:00 · 2006-12-04 22:37:16 +00:00 · 2006-12-04 20:40:05 +00:00 · 2006-12-04 20:35:41 +00:00
777 changed files with 74003 additions and 17897 deletions
--- a/Makefile.in
+++ b/Makefile.in
@@ -1802,6 +1802,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR =  \
 	wx/generic/icon.h \
 	wx/generic/paletteg.h \
 	wx/gtk/app.h \
+	wx/gtk/assertdlg_gtk.h \
 	wx/gtk/bitmap.h \
 	wx/gtk/brush.h \
 	wx/gtk/clipbrd.h \
@@ -1845,7 +1846,6 @@ COND_TOOLKIT_MGL_LOWLEVEL_HDR =  \
 	wx/mgl/dcmemory.h \
 	wx/mgl/dcscreen.h \
 	wx/mgl/font.h \
-	wx/mgl/fontutil.h \
 	wx/mgl/palette.h \
 	wx/mgl/pen.h \
 	wx/mgl/popupwin.h \
@@ -2644,6 +2644,9 @@ COND_TOOLKIT_WINCE_GUI_HDR =  \
 	wx/msw/wince/textctrlce.h \
 	wx/msw/wince/resources.h
@COND_TOOLKIT_WINCE@GUI_HDR = $(COND_TOOLKIT_WINCE_GUI_HDR)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ADVANCED_PLATFORM_HDR \
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	= wx/unix/joystick.h wx/unix/sound.h \
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	wx/unix/taskbarx11.h
@COND_TOOLKIT_COCOA@ADVANCED_PLATFORM_HDR = \
@COND_TOOLKIT_COCOA@	wx/cocoa/taskbar.h wx/mac/corefoundation/joystick.h
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ADVANCED_PLATFORM_HDR \
@@ -3713,6 +3716,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS = \
@COND_TOOLKIT_COCOA@	monodll_gsockosx.o monodll_hid.o monodll_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS =  \
+	monodll_fontmgrcmn.o \
 	monodll_caret.o \
 	monodll_colour.o \
 	monodll_icon.o \
@@ -3730,6 +3734,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_evtloop.o \
 	monodll_font.o \
 	monodll_fontenum.o \
+	monodll_fontmgr.o \
 	monodll_overlay.o \
 	monodll_pen.o \
 	monodll_region.o \
@@ -3790,6 +3795,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_icon.o \
 	monodll_paletteg.o \
 	monodll_app.o \
+	monodll_assertdlg_gtk.o \
 	monodll_bitmap.o \
 	monodll_brush.o \
 	monodll_clipbrd.o \
@@ -3821,6 +3827,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS =  \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS)
@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS = $(__MAC_LOWLEVEL_SRC_OBJECTS)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \
+	monodll_fontmgrcmn.o \
 	monodll_caret.o \
 	monodll_colour.o \
 	monodll_icon.o \
@@ -3841,6 +3848,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_evtloop.o \
 	monodll_font.o \
 	monodll_fontenum.o \
+	monodll_fontmgr.o \
 	monodll_fontutil.o \
 	monodll_palette.o \
 	monodll_pen.o \
@@ -4539,6 +4547,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS =  \
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \
@COND_TOOLKIT_COCOA@	monodll_gsockosx.o monodll_hid.o monodll_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 =  \
+	monodll_fontmgrcmn.o \
 	monodll_caret.o \
 	monodll_colour.o \
 	monodll_icon.o \
@@ -4556,6 +4565,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_evtloop.o \
 	monodll_font.o \
 	monodll_fontenum.o \
+	monodll_fontmgr.o \
 	monodll_overlay.o \
 	monodll_pen.o \
 	monodll_region.o \
@@ -4616,6 +4626,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_icon.o \
 	monodll_paletteg.o \
 	monodll_app.o \
+	monodll_assertdlg_gtk.o \
 	monodll_bitmap.o \
 	monodll_brush.o \
 	monodll_clipbrd.o \
@@ -4647,6 +4658,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 =  \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1)
@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_1 = $(__MAC_LOWLEVEL_SRC_OBJECTS)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1 =  \
+	monodll_fontmgrcmn.o \
 	monodll_caret.o \
 	monodll_colour.o \
 	monodll_icon.o \
@@ -4667,6 +4679,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_evtloop.o \
 	monodll_font.o \
 	monodll_fontenum.o \
+	monodll_fontmgr.o \
 	monodll_fontutil.o \
 	monodll_palette.o \
 	monodll_pen.o \
@@ -5477,6 +5490,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \
@COND_TOOLKIT_COCOA@	monolib_gsockosx.o monolib_hid.o monolib_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 =  \
+	monolib_fontmgrcmn.o \
 	monolib_caret.o \
 	monolib_colour.o \
 	monolib_icon.o \
@@ -5494,6 +5508,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_evtloop.o \
 	monolib_font.o \
 	monolib_fontenum.o \
+	monolib_fontmgr.o \
 	monolib_overlay.o \
 	monolib_pen.o \
 	monolib_region.o \
@@ -5554,6 +5569,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_icon.o \
 	monolib_paletteg.o \
 	monolib_app.o \
+	monolib_assertdlg_gtk.o \
 	monolib_bitmap.o \
 	monolib_brush.o \
 	monolib_clipbrd.o \
@@ -5586,6 +5602,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 =  \
@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_2 = \
@COND_TOOLKIT_MAC@	$(__MAC_LOWLEVEL_SRC_OBJECTS_0)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2 =  \
+	monolib_fontmgrcmn.o \
 	monolib_caret.o \
 	monolib_colour.o \
 	monolib_icon.o \
@@ -5606,6 +5623,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_evtloop.o \
 	monolib_font.o \
 	monolib_fontenum.o \
+	monolib_fontmgr.o \
 	monolib_fontutil.o \
 	monolib_palette.o \
 	monolib_pen.o \
@@ -6304,6 +6322,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 =  \
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \
@COND_TOOLKIT_COCOA@	monolib_gsockosx.o monolib_hid.o monolib_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 =  \
+	monolib_fontmgrcmn.o \
 	monolib_caret.o \
 	monolib_colour.o \
 	monolib_icon.o \
@@ -6321,6 +6340,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_evtloop.o \
 	monolib_font.o \
 	monolib_fontenum.o \
+	monolib_fontmgr.o \
 	monolib_overlay.o \
 	monolib_pen.o \
 	monolib_region.o \
@@ -6381,6 +6401,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_icon.o \
 	monolib_paletteg.o \
 	monolib_app.o \
+	monolib_assertdlg_gtk.o \
 	monolib_bitmap.o \
 	monolib_brush.o \
 	monolib_clipbrd.o \
@@ -6413,6 +6434,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 =  \
@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_3 = \
@COND_TOOLKIT_MAC@	$(__MAC_LOWLEVEL_SRC_OBJECTS_0)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3 =  \
+	monolib_fontmgrcmn.o \
 	monolib_caret.o \
 	monolib_colour.o \
 	monolib_icon.o \
@@ -6433,6 +6455,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_evtloop.o \
 	monolib_font.o \
 	monolib_fontenum.o \
+	monolib_fontmgr.o \
 	monolib_fontutil.o \
 	monolib_palette.o \
 	monolib_pen.o \
@@ -7471,6 +7494,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \
@COND_TOOLKIT_COCOA@	coredll_gsockosx.o coredll_hid.o coredll_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 =  \
+	coredll_fontmgrcmn.o \
 	coredll_caret.o \
 	coredll_colour.o \
 	coredll_icon.o \
@@ -7488,6 +7512,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_evtloop.o \
 	coredll_font.o \
 	coredll_fontenum.o \
+	coredll_fontmgr.o \
 	coredll_overlay.o \
 	coredll_pen.o \
 	coredll_region.o \
@@ -7548,6 +7573,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_icon.o \
 	coredll_paletteg.o \
 	coredll_app.o \
+	coredll_assertdlg_gtk.o \
 	coredll_bitmap.o \
 	coredll_brush.o \
 	coredll_clipbrd.o \
@@ -7580,6 +7606,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 =  \
@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_4 = \
@COND_TOOLKIT_MAC@	$(__MAC_LOWLEVEL_SRC_OBJECTS_8)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4 =  \
+	coredll_fontmgrcmn.o \
 	coredll_caret.o \
 	coredll_colour.o \
 	coredll_icon.o \
@@ -7600,6 +7627,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_evtloop.o \
 	coredll_font.o \
 	coredll_fontenum.o \
+	coredll_fontmgr.o \
 	coredll_fontutil.o \
 	coredll_palette.o \
 	coredll_pen.o \
@@ -8298,6 +8326,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 =  \
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \
@COND_TOOLKIT_COCOA@	coredll_gsockosx.o coredll_hid.o coredll_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 =  \
+	coredll_fontmgrcmn.o \
 	coredll_caret.o \
 	coredll_colour.o \
 	coredll_icon.o \
@@ -8315,6 +8344,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_evtloop.o \
 	coredll_font.o \
 	coredll_fontenum.o \
+	coredll_fontmgr.o \
 	coredll_overlay.o \
 	coredll_pen.o \
 	coredll_region.o \
@@ -8375,6 +8405,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_icon.o \
 	coredll_paletteg.o \
 	coredll_app.o \
+	coredll_assertdlg_gtk.o \
 	coredll_bitmap.o \
 	coredll_brush.o \
 	coredll_clipbrd.o \
@@ -8407,6 +8438,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 =  \
@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_5 = \
@COND_TOOLKIT_MAC@	$(__MAC_LOWLEVEL_SRC_OBJECTS_8)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5 =  \
+	coredll_fontmgrcmn.o \
 	coredll_caret.o \
 	coredll_colour.o \
 	coredll_icon.o \
@@ -8427,6 +8459,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_evtloop.o \
 	coredll_font.o \
 	coredll_fontenum.o \
+	coredll_fontmgr.o \
 	coredll_fontutil.o \
 	coredll_palette.o \
 	coredll_pen.o \
@@ -8909,6 +8942,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \
@COND_TOOLKIT_COCOA@	corelib_gsockosx.o corelib_hid.o corelib_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 =  \
+	corelib_fontmgrcmn.o \
 	corelib_caret.o \
 	corelib_colour.o \
 	corelib_icon.o \
@@ -8926,6 +8960,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_evtloop.o \
 	corelib_font.o \
 	corelib_fontenum.o \
+	corelib_fontmgr.o \
 	corelib_overlay.o \
 	corelib_pen.o \
 	corelib_region.o \
@@ -8986,6 +9021,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_icon.o \
 	corelib_paletteg.o \
 	corelib_app.o \
+	corelib_assertdlg_gtk.o \
 	corelib_bitmap.o \
 	corelib_brush.o \
 	corelib_clipbrd.o \
@@ -9018,6 +9054,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 =  \
@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_6 = \
@COND_TOOLKIT_MAC@	$(__MAC_LOWLEVEL_SRC_OBJECTS_9)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6 =  \
+	corelib_fontmgrcmn.o \
 	corelib_caret.o \
 	corelib_colour.o \
 	corelib_icon.o \
@@ -9038,6 +9075,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_evtloop.o \
 	corelib_font.o \
 	corelib_fontenum.o \
+	corelib_fontmgr.o \
 	corelib_fontutil.o \
 	corelib_palette.o \
 	corelib_pen.o \
@@ -9736,6 +9774,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 =  \
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \
@COND_TOOLKIT_COCOA@	corelib_gsockosx.o corelib_hid.o corelib_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 =  \
+	corelib_fontmgrcmn.o \
 	corelib_caret.o \
 	corelib_colour.o \
 	corelib_icon.o \
@@ -9753,6 +9792,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_evtloop.o \
 	corelib_font.o \
 	corelib_fontenum.o \
+	corelib_fontmgr.o \
 	corelib_overlay.o \
 	corelib_pen.o \
 	corelib_region.o \
@@ -9813,6 +9853,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_icon.o \
 	corelib_paletteg.o \
 	corelib_app.o \
+	corelib_assertdlg_gtk.o \
 	corelib_bitmap.o \
 	corelib_brush.o \
 	corelib_clipbrd.o \
@@ -9845,6 +9886,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 =  \
@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_7 = \
@COND_TOOLKIT_MAC@	$(__MAC_LOWLEVEL_SRC_OBJECTS_9)
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7 =  \
+	corelib_fontmgrcmn.o \
 	corelib_caret.o \
 	corelib_colour.o \
 	corelib_icon.o \
@@ -9865,6 +9907,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_evtloop.o \
 	corelib_font.o \
 	corelib_fontenum.o \
+	corelib_fontmgr.o \
 	corelib_fontutil.o \
 	corelib_palette.o \
 	corelib_pen.o \
@@ -10922,6 +10965,12 @@ COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \
@COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS \
@COND_PLATFORM_MACOSX_1@	= monodll_gsockosx.o monodll_hid.o \
@COND_PLATFORM_MACOSX_1@	monodll_utilsexc_cf.o
+COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS =  \
+	monodll_taskbarcmn.o \
+	monodll_joystick.o \
+	monodll_sound.o \
+	monodll_taskbarx11.o
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS)
@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS = \
@COND_TOOLKIT_COCOA@	monodll_taskbar.o monodll_taskbarcmn.o \
@COND_TOOLKIT_COCOA@	monodll_hidjoystick.o
@@ -10979,6 +11028,12 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS =  \
@COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_0 \
@COND_PLATFORM_MACOSX_1@	= monolib_gsockosx.o monolib_hid.o \
@COND_PLATFORM_MACOSX_1@	monolib_utilsexc_cf.o
+COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
+	monolib_taskbarcmn.o \
+	monolib_joystick.o \
+	monolib_sound.o \
+	monolib_taskbarx11.o
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_0)
@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
@COND_TOOLKIT_COCOA@	monolib_taskbar.o monolib_taskbarcmn.o \
@COND_TOOLKIT_COCOA@	monolib_hidjoystick.o
@@ -11039,6 +11094,9 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
@COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_9 \
@COND_PLATFORM_MACOSX_1@	= corelib_gsockosx.o corelib_hid.o \
@COND_PLATFORM_MACOSX_1@	corelib_utilsexc_cf.o
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_8 \
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	= advdll_taskbarcmn.o advdll_joystick.o \
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	advdll_sound.o advdll_taskbarx11.o
@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
@COND_TOOLKIT_COCOA@	advdll_taskbar.o advdll_taskbarcmn.o \
@COND_TOOLKIT_COCOA@	advdll_hidjoystick.o
@@ -11087,6 +11145,9 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
@COND_TOOLKIT_X11@	advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \
@COND_TOOLKIT_X11@	advdll_taskbarx11.o
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_9 \
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	= advlib_taskbarcmn.o advlib_joystick.o \
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	advlib_sound.o advlib_taskbarx11.o
@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
@COND_TOOLKIT_COCOA@	advlib_taskbar.o advlib_taskbarcmn.o \
@COND_TOOLKIT_COCOA@	advlib_hidjoystick.o
@@ -11946,7 +12007,7 @@ install-wxconfig:
 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
-	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)

 locale_install: 
 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
@@ -13817,6 +13878,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/os2/app.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/app.cpp

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

@@ -14726,6 +14790,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monodll_reparent.o: $(srcdir)/src/x11/reparent.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp

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

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

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

@@ -15905,6 +15981,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monodll_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp

+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+
@COND_TOOLKIT_PM_USE_GUI_1@monodll_sound.o: $(srcdir)/src/os2/sound.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/sound.cpp

@@ -16355,6 +16434,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp

+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
+
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp

@@ -16400,6 +16482,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp

+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
+
@COND_TOOLKIT_PM_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/os2/joystick.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp

@@ -16421,6 +16506,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp

+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
+
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_animate.o: $(srcdir)/src/gtk/animate.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp

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

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

@@ -18806,6 +18897,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monolib_reparent.o: $(srcdir)/src/x11/reparent.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp

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

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

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

@@ -19985,6 +20088,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monolib_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp

+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+
@COND_TOOLKIT_PM_USE_GUI_1@monolib_sound.o: $(srcdir)/src/os2/sound.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/sound.cpp

@@ -20435,6 +20541,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp

+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
+
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp

@@ -20480,6 +20589,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp

+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
+
@COND_TOOLKIT_PM_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/os2/joystick.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp

@@ -20501,6 +20613,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp

+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
+
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_animate.o: $(srcdir)/src/gtk/animate.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp

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

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

@@ -23267,6 +23385,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@coredll_reparent.o: $(srcdir)/src/x11/reparent.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp

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

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

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

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

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

@@ -26195,6 +26328,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@corelib_reparent.o: $(srcdir)/src/x11/reparent.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp

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

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

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

@@ -27797,6 +27942,9 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_X11@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp

+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVDLL_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
+
@COND_TOOLKIT_MSW@advdll_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp

@@ -27830,6 +27978,9 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_X11@advdll_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp

+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+
@COND_TOOLKIT_PM@advdll_sound.o: $(srcdir)/src/os2/sound.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_PM@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/os2/sound.cpp

@@ -27866,6 +28017,9 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_X11@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp

+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
+
@COND_TOOLKIT_PM@advdll_joystick.o: $(srcdir)/src/os2/joystick.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_PM@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp

@@ -27890,6 +28044,9 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_X11@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp

+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
+
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_animate.o: $(srcdir)/src/gtk/animate.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp

@@ -27995,6 +28152,9 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_X11@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp

+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVLIB_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
+
@COND_TOOLKIT_MSW@advlib_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp

@@ -28028,6 +28188,9 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_X11@advlib_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp

+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+
@COND_TOOLKIT_PM@advlib_sound.o: $(srcdir)/src/os2/sound.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_PM@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/os2/sound.cpp

@@ -28064,6 +28227,9 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_X11@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp

+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
+
@COND_TOOLKIT_PM@advlib_joystick.o: $(srcdir)/src/os2/joystick.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_PM@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp

@@ -28088,6 +28254,9 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_X11@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp

+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
+
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_animate.o: $(srcdir)/src/gtk/animate.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp

--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -386,6 +386,18 @@ dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../contrib/build/animate/animate.
        COND_PLATFORM_UNIX_1=""
    fi
    AC_SUBST(COND_PLATFORM_UNIX_1)
+dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_MGL[wx.bkl] ###
+    COND_PLATFORM_UNIX_1_TOOLKIT_MGL="#"
+    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" ; then
+        COND_PLATFORM_UNIX_1_TOOLKIT_MGL=""
+    fi
+    AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_MGL)
+dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1[wx.bkl] ###
+    COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1="#"
+    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
+        COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1)
 dnl ### begin block 20_COND_PLATFORM_UNIX_1_USE_GUI_1[wx.bkl] ###
    COND_PLATFORM_UNIX_1_USE_GUI_1="#"
    if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then
--- a/build/bakefiles/Bakefiles.bkgen
+++ b/build/bakefiles/Bakefiles.bkgen
@@ -142,11 +142,6 @@
        -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4
    </add-flags>

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


--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -3,7 +3,7 @@

 <makefile>

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

    <!-- bakefile modules we need: -->
    <using module="datafiles"/>
@@ -351,17 +351,9 @@

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

@@ -646,12 +638,10 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
        <ldflags cond="FORMAT=='autoconf'">$(WXMACVERSION_CMD)</ldflags>

        <!-- version info resources: -->
-        <if cond="FORMAT not in ['rpmspec','wx24dsp']"> <!-- FIXME: fix for bkl-0.1.7 only, remove the cond later -->
-            <res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
-            <if cond="FORMAT=='autoconf'">
-                <res-include>$(RCDEFDIR)</res-include>
-                <res-include>$(TOP_SRCDIR)include</res-include>
-            </if>
+        <res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
+        <if cond="FORMAT=='autoconf'">
+            <res-include>$(RCDEFDIR)</res-include>
+            <res-include>$(TOP_SRCDIR)include</res-include>
        </if>
        <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
    </template>
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -906,6 +906,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/generic/icon.cpp
    src/generic/paletteg.cpp
    src/gtk/app.cpp
+    src/gtk/assertdlg_gtk.c
    src/gtk/bitmap.cpp
    src/gtk/brush.cpp
    src/gtk/clipbrd.cpp
@@ -940,6 +941,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/generic/icon.h
    wx/generic/paletteg.h
    wx/gtk/app.h
+    wx/gtk/assertdlg_gtk.h
    wx/gtk/bitmap.h
    wx/gtk/brush.h
    wx/gtk/clipbrd.h
@@ -1747,6 +1749,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->

 <set var="MGL_LOWLEVEL_SRC" hints="files">
+    src/common/fontmgrcmn.cpp
    src/generic/caret.cpp
    src/generic/colour.cpp
    src/generic/icon.cpp
@@ -1767,6 +1770,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/mgl/evtloop.cpp
    src/mgl/font.cpp
    src/mgl/fontenum.cpp
+    src/mgl/fontmgr.cpp
    src/mgl/fontutil.cpp
    src/mgl/palette.cpp
    src/mgl/pen.cpp
@@ -1794,7 +1798,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/mgl/dcmemory.h
    wx/mgl/dcscreen.h
    wx/mgl/font.h
-    wx/mgl/fontutil.h
    wx/mgl/palette.h
    wx/mgl/pen.h
    wx/mgl/popupwin.h
@@ -1810,6 +1813,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->

 <set var="DFB_LOWLEVEL_SRC" hints="files">
+    src/common/fontmgrcmn.cpp
    src/generic/caret.cpp
    src/generic/colour.cpp
    src/generic/icon.cpp
@@ -1828,6 +1832,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/dfb/evtloop.cpp
    src/dfb/font.cpp
    src/dfb/fontenum.cpp
+    src/dfb/fontmgr.cpp
    src/dfb/overlay.cpp
    src/dfb/pen.cpp
    src/dfb/region.cpp
@@ -3325,6 +3330,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
        <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='MGL' and PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_SRC)</if>
        <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
    </set>
    <set var="ADVANCED_PLATFORM_HDR" hints="files">
@@ -3336,6 +3342,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)</if>
        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>
        <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='MGL' and PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_HDR)</if>
        <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
    </set>

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

--- a/build/script/rebuild-makefiles.sh
+++ b/build/script/rebuild-makefiles.sh
@@ -2,23 +2,24 @@

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

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


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


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

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


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 set WXWIN=c:\wx\wxWidgets
 set DAILY=c:\daily
@@ -21,14 +23,17 @@ c:
 cd %WXWIN%
 cvs up -P -d
 cd \wx\inno\wxWidgets
+if exist include\wx\msw\setup.h del include\wx\msw\setup.h
 cvs up -P
+copy include\wx\msw\setup0.h include\wx\msw\setup.h
 echo CVS update  >>  c:\temp.log

 rem add bakefile build...
+rem just build the formats not in the CVS to keep down the .#makefile...
 set PATH=%PATH%;C:\wx\Bakefile\src
 cd \wx\inno\wxWidgets\build\bakefiles
 del .bakefile_gen.state
-bakefile_gen 
+bakefile_gen -f dmars,dmars,msevc4prj,dmars_smake >> c:\temp.log


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

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

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

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

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

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

 echo docs built for %WXW_VER%
 echo docs built for %WXW_VER% >> c:\temp.log
--- a/build/script/wxwidgets.iss
+++ b/build/script/wxwidgets.iss
@@ -20,8 +20,9 @@ AppPublisher=wxWidgets
 AppPublisherURL=http://www.wxwidgets.org
 AppSupportURL=http://www.wxwidgets.org
 AppUpdatesURL=http://www.wxwidgets.org
-DefaultDirName={sd}\wxWidgets
-DefaultGroupName=wxWidgets
+DefaultDirName={sd}\wxWidgets-{#WX_VERSION}
+DefaultGroupName=wxWidgets {#WX_VERSION}
+UsePreviousAppDir=no
 DisableProgramGroupPage=yes
 LicenseFile=C:\wx\inno\wxWidgets\docs\licence.txt
 InfoBeforeFile=C:\wx\inno\wxWidgets\docs\readme.txt
@@ -42,6 +43,10 @@ Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "http
 [Icons]
 Name: "{group}\{cm:ProgramOnTheWeb,wxWidgets {#WX_VERSION}}"; Filename: "{app}\wx.url"
 Name: {group}\wxWidgets Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
+Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
+Name: {group}\Readme; Filename: {app}\docs\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
+Name: {group}\Compiling wxWidgets; Filename: {app}\docs\msw\install.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
+Name: "{group}\Uninstall wxWidgets {#WX_VERSION}"; Filename: "{uninstallexe}"


 [UninstallDelete]
--- a/build/wince/missing/widec.h
+++ b/build/wince/missing/widec.h
@@ -0,0 +1 @@
+
--- a/827
+++ b/827
--- a/configure.in
+++ b/configure.in
@@ -378,6 +378,7 @@ if test $DEBUG_CONFIGURE = 1; then
  DEFAULT_wxUSE_OPTIMISE=no
  DEFAULT_wxUSE_PROFILE=no
  DEFAULT_wxUSE_NO_DEPS=no
+  DEFAULT_wxUSE_VARARG_MACROS=no
  DEFAULT_wxUSE_NO_RTTI=no
  DEFAULT_wxUSE_NO_EXCEPTIONS=no
  DEFAULT_wxUSE_UNIVERSAL_BINARY=no
@@ -601,6 +602,7 @@ else
  DEFAULT_wxUSE_OPTIMISE=yes
  DEFAULT_wxUSE_PROFILE=no
  DEFAULT_wxUSE_NO_DEPS=no
+  DEFAULT_wxUSE_VARARG_MACROS=yes
  DEFAULT_wxUSE_NO_RTTI=no
  DEFAULT_wxUSE_NO_EXCEPTIONS=no
  DEFAULT_wxUSE_UNIVERSAL_BINARY=no
@@ -632,7 +634,7 @@ else
  DEFAULT_wxUSE_LIBXPM=yes
  DEFAULT_wxUSE_LIBMSPACK=yes
  DEFAULT_wxUSE_LIBSDL=no
-  DEFAULT_wxUSE_LIBGNOMEPRINT=no
+  DEFAULT_wxUSE_LIBGNOMEPRINT=yes
  DEFAULT_wxUSE_LIBGNOMEVFS=no
  DEFAULT_wxUSE_LIBHILDON=no
  DEFAULT_wxUSE_ODBC=no
@@ -930,6 +932,7 @@ WX_ARG_ENABLE(no_rtti,       [  --enable-no_rtti        create code without RTTI
 WX_ARG_ENABLE(no_exceptions, [  --enable-no_exceptions  create code without C++ exceptions handling], wxUSE_NO_EXCEPTIONS)
 WX_ARG_ENABLE(permissive,    [  --enable-permissive     compile code disregarding strict ANSI], wxUSE_PERMISSIVE)
 WX_ARG_ENABLE(no_deps,       [  --enable-no_deps        create code without dependency information], wxUSE_NO_DEPS)
+WX_ARG_ENABLE(vararg_macros, [  --disable-vararg_macros don't use vararg macros, even if they are supported], wxUSE_VARARG_MACROS)
 WX_ARG_ENABLE_PARAM(universal_binary, [[  --enable-universal_binary[=SDK] create Mac PowerPC and Intel Universal binary (not yet working)]], wxUSE_UNIVERSAL_BINARY)

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


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

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

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

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

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

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

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

       PKG_CHECK_MODULES(DIRECTFB,
-                         [directfb >= 0.9.22],
+                         [directfb >= 0.9.23],
                         [
                           wxUSE_UNIVERSAL="yes"
                           TOOLKIT_INCLUDE="$DIRECTFB_CFLAGS"
@@ -3901,7 +3928,10 @@ dnl ---------------------------------------------------------------------------

 USE_OPENGL=0
 if test "$wxUSE_OPENGL" = "yes"; then
-    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
+    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = "1"; then
+        AC_MSG_WARN([wxGLCanvas not implemented for this port, library will be compiled without it.])
+        wxUSE_OPENGL="no"
+    elif test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
        OPENGL_LIBS="-framework OpenGL -framework AGL"
    elif test "$wxUSE_MSW" = 1; then
        OPENGL_LIBS="-lopengl32 -lglu32"
@@ -5666,37 +5696,40 @@ fi
 dnl Unix implementation needs additional checks because audio support
 dnl comes in many favours:
 if test "$USE_UNIX" = "1" ; then
-    dnl it's not enough to check for just the header because OSS under NetBSD
-    dnl redefines ioctl as oss_ioctrl inside it and so we also need to test
-    dnl whether we need -lossaudio at link-time
-    AC_CACHE_CHECK([for SNDCTL_DSP_SPEED in sys/soundcard.h], ac_cv_header_sys_soundcard, [
-        AC_TRY_LINK([
-                #include <sys/ioctl.h>
-                #include <sys/soundcard.h>
-            ],
-            [
-                ioctl(0, SNDCTL_DSP_SPEED, 0);
-            ],
-            ac_cv_header_sys_soundcard=yes,
-            [
-                saveLibs="$LIBS"
-                LIBS="$saveLibs -lossaudio"
-                AC_TRY_LINK([
-                        #include <sys/ioctl.h>
-                        #include <sys/soundcard.h>
-                    ],
-                    [
-                        ioctl(0, SNDCTL_DSP_SPEED, 0);
-                    ],
-                    ac_cv_header_sys_soundcard=yes,
-                    [
-                        LIBS="$saveLibs"
-                        ac_cv_header_sys_soundcard=no
-                    ]
-                )
-            ]
-        )
-    ])
+    dnl mmedia doesn't compile with wxMGL, remove this if this is ever fixed
+    if test "$wxUSE_MGL" != 1; then
+        dnl it's not enough to check for just the header because OSS under NetBSD
+        dnl redefines ioctl as oss_ioctrl inside it and so we also need to test
+        dnl whether we need -lossaudio at link-time
+        AC_CACHE_CHECK([for SNDCTL_DSP_SPEED in sys/soundcard.h], ac_cv_header_sys_soundcard, [
+            AC_TRY_LINK([
+                    #include <sys/ioctl.h>
+                    #include <sys/soundcard.h>
+                ],
+                [
+                    ioctl(0, SNDCTL_DSP_SPEED, 0);
+                ],
+                ac_cv_header_sys_soundcard=yes,
+                [
+                    saveLibs="$LIBS"
+                    LIBS="$saveLibs -lossaudio"
+                    AC_TRY_LINK([
+                            #include <sys/ioctl.h>
+                            #include <sys/soundcard.h>
+                        ],
+                        [
+                            ioctl(0, SNDCTL_DSP_SPEED, 0);
+                        ],
+                        ac_cv_header_sys_soundcard=yes,
+                        [
+                            LIBS="$saveLibs"
+                            ac_cv_header_sys_soundcard=no
+                        ]
+                    )
+                ]
+            )
+        ])
+    fi

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

@@ -8019,7 +8059,7 @@ for subdir in `echo $SUBDIRS`; do
                disabled_var=DISABLED_`echo $subdir | tr [[a-z]] [[A-Z]]`;
                eval "disabled=\$$disabled_var"
                disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
-                makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | egrep -v "$disabled"`
+                makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"`
            fi
        else dnl we build wxBase only
            dnl don't take all samples/utils, just those which build with
--- a/contrib/src/deprecated/Makefile.in
+++ b/contrib/src/deprecated/Makefile.in
@@ -142,7 +142,7 @@ COND_PLATFORM_OS2_1___deprecateddll___importlib = -import \
 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_PLATFORM_OS2_1@__deprecateddll___importlib = $(COND_PLATFORM_OS2_1___deprecateddll___importlib)
 COND_WINDOWS_IMPLIB_1___deprecateddll___importlib = \
-	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__deprecateddll___importlib = $(COND_WINDOWS_IMPLIB_1___deprecateddll___importlib)
@COND_GCC_PCH_1@__deprecateddll_PCH_INC = -I.pch/wxprec_deprecateddll
@COND_ICC_PCH_1@__deprecateddll_PCH_INC = -use_pch \
--- a/contrib/src/foldbar/Makefile.in
+++ b/contrib/src/foldbar/Makefile.in
@@ -116,7 +116,7 @@ COND_PLATFORM_OS2_1___foldbardll___importlib = -import \
 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_PLATFORM_OS2_1@__foldbardll___importlib = $(COND_PLATFORM_OS2_1___foldbardll___importlib)
 COND_WINDOWS_IMPLIB_1___foldbardll___importlib = \
-	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__foldbardll___importlib = $(COND_WINDOWS_IMPLIB_1___foldbardll___importlib)
@COND_GCC_PCH_1@__foldbardll_PCH_INC = -I.pch/wxprec_foldbardll
@COND_ICC_PCH_1@__foldbardll_PCH_INC = -use_pch \
--- a/contrib/src/gizmos/Makefile.in
+++ b/contrib/src/gizmos/Makefile.in
@@ -135,7 +135,7 @@ COND_PLATFORM_OS2_1___gizmosdll___importlib = -import \
 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_PLATFORM_OS2_1@__gizmosdll___importlib = $(COND_PLATFORM_OS2_1___gizmosdll___importlib)
 COND_WINDOWS_IMPLIB_1___gizmosdll___importlib = \
-	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__gizmosdll___importlib = $(COND_WINDOWS_IMPLIB_1___gizmosdll___importlib)
@COND_GCC_PCH_1@__gizmosdll_PCH_INC = -I.pch/wxprec_gizmosdll
@COND_ICC_PCH_1@__gizmosdll_PCH_INC = -use_pch \
@@ -187,7 +187,7 @@ COND_PLATFORM_OS2_1___gizmos_xrcdll___importlib = -import \
 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_PLATFORM_OS2_1@__gizmos_xrcdll___importlib = $(COND_PLATFORM_OS2_1___gizmos_xrcdll___importlib)
 COND_WINDOWS_IMPLIB_1___gizmos_xrcdll___importlib = \
-	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__gizmos_xrcdll___importlib = $(COND_WINDOWS_IMPLIB_1___gizmos_xrcdll___importlib)
@COND_GCC_PCH_1@__gizmos_xrcdll_PCH_INC = -I.pch/wxprec_gizmos_xrcdll
@COND_ICC_PCH_1@__gizmos_xrcdll_PCH_INC = -use_pch \
--- a/contrib/src/net/Makefile.in
+++ b/contrib/src/net/Makefile.in
@@ -116,7 +116,7 @@ COND_PLATFORM_OS2_1___netutilsdll___importlib = -import \
 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_PLATFORM_OS2_1@__netutilsdll___importlib = $(COND_PLATFORM_OS2_1___netutilsdll___importlib)
 COND_WINDOWS_IMPLIB_1___netutilsdll___importlib = \
-	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__netutilsdll___importlib = $(COND_WINDOWS_IMPLIB_1___netutilsdll___importlib)
@COND_GCC_PCH_1@__netutilsdll_PCH_INC = -I.pch/wxprec_netutilsdll
@COND_ICC_PCH_1@__netutilsdll_PCH_INC = -use_pch \
--- a/contrib/src/plot/Makefile.in
+++ b/contrib/src/plot/Makefile.in
@@ -112,7 +112,7 @@ COND_PLATFORM_OS2_1___plotdll___importlib = -import \
 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_PLATFORM_OS2_1@__plotdll___importlib = $(COND_PLATFORM_OS2_1___plotdll___importlib)
 COND_WINDOWS_IMPLIB_1___plotdll___importlib = \
-	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__plotdll___importlib = $(COND_WINDOWS_IMPLIB_1___plotdll___importlib)
@COND_GCC_PCH_1@__plotdll_PCH_INC = -I.pch/wxprec_plotdll
@COND_ICC_PCH_1@__plotdll_PCH_INC = -use_pch \
--- a/contrib/src/stc/Makefile.in
+++ b/contrib/src/stc/Makefile.in
@@ -278,7 +278,7 @@ COND_PLATFORM_OS2_1___stcdll___importlib = -import \
 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_PLATFORM_OS2_1@__stcdll___importlib = $(COND_PLATFORM_OS2_1___stcdll___importlib)
 COND_WINDOWS_IMPLIB_1___stcdll___importlib = \
-	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__stcdll___importlib = $(COND_WINDOWS_IMPLIB_1___stcdll___importlib)
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__stcdll___targetsuf2 \
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).0
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -1330,9 +1330,6 @@ unsigned int Platform::DoubleClickTime() {
 bool Platform::MouseButtonBounce() {
    return false;
 }
-void Platform::DebugDisplay(const char *s) {
-    wxLogDebug(stc2wx(s));
-}

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

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

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

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


--- a/contrib/src/svg/Makefile.in
+++ b/contrib/src/svg/Makefile.in
@@ -112,7 +112,7 @@ COND_PLATFORM_OS2_1___svgdll___importlib = -import \
 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_PLATFORM_OS2_1@__svgdll___importlib = $(COND_PLATFORM_OS2_1___svgdll___importlib)
 COND_WINDOWS_IMPLIB_1___svgdll___importlib = \
-	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_WINDOWS_IMPLIB_1@__svgdll___importlib = $(COND_WINDOWS_IMPLIB_1___svgdll___importlib)
@COND_GCC_PCH_1@__svgdll_PCH_INC = -I.pch/wxprec_svgdll
@COND_ICC_PCH_1@__svgdll_PCH_INC = -use_pch \
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+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
+  * Fixed long standing bug in wxFileConfig groups renaming
+
+ -- Vadim Zeitlin <vadim@wxwindows.org>  Nov, 14 Tue 2006 19:06:37 +0100
+
 wxwidgets2.7 (2.7.2.0-0) unstable; urgency=low

  * Added wxTar streams.
--- a/debian/rules
+++ b/debian/rules
@@ -71,8 +71,8 @@ release  := $(wx_major_version_number).$(wx_minor_version_number)
 # specify $soversion below.  Re-automate if incompatible changes
 # result in it actually changing.
 #soversion := $(shell grep '^WX_CURRENT=' configure.in | sed 's/WX_CURRENT=\([0-9]\+\).*/\1/')
-##soversion := 0
-##sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%)-$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR))
+soversion := 0
+sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%)-$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR))

 # In some places we use the full version number, including the micro version,
 # for the development releases (which can be incompatible for the same major
@@ -112,7 +112,6 @@ BASE_CONFIGURE_OPTIONS = $(COMMON_CONFIGURE_OPTIONS) \

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

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

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

@@ -281,7 +280,7 @@ debian/python-version:
 	echo python_ver := python$(shell python -c "import sys;print sys.version[:3]") > $@

 debian/control: $(addprefix debian/,control.in python-version)
-	sed -e 's/=V/$(release)/g;s/=SOV/$(release)/g;s/=PY/$(python_ver)/g;s/=U/$(unicode_suffix)/g'\
+	sed -e 's/=V/$(release)/g;s/=SOV/$(sorelease)/g;s/=PY/$(python_ver)/g;s/=U/$(unicode_suffix)/g'\
 		< debian/control.in > debian/control

 control-files-stamp: debian/control
@@ -363,7 +362,7 @@ control-files-stamp: debian/control
 #			> debian/$(package_common).menu;
 	@echo "generating control file lintian-override";                    \
 		sed -e 's/=V/$(release)/g;                                  '\
-'			s/=SOV/$(release)/g'                                 \
+'			s/=SOV/$(sorelease)/g'                               \
 			< debian/lintian-override.in                         \
 			> debian/lintian-override;                           \
 	touch $@
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -101,9 +101,9 @@ samples/image/image.dsp

 samples/internat/internat.dsp

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

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

 samples/keyboard/keyboard.dsp

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

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

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

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


--- a/distrib/scripts/manifests/mgl.rsp
+++ b/distrib/scripts/manifests/mgl.rsp
@@ -4,6 +4,7 @@ readme-mgl.txt
 build/mgl/*

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

--- a/distrib/scripts/manifests/vc.rsp
+++ b/distrib/scripts/manifests/vc.rsp
@@ -109,9 +109,9 @@ samples/image/image.dsp

 samples/internat/internat.dsp

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

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

 samples/keyboard/keyboard.dsp

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

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

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

 # this is where we will store the wxAll tarball we create
 if [ ! -d $START_DIR/$DISTDIR ]; then
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,6 +1,6 @@
---------------------------------------------------------------
-wxWidgets Change Log - For more verbose changes, see the manual
---------------------------------------------------------------
+-------------------------------------------------------------------------------
+                             wxWidgets Change Log
+-------------------------------------------------------------------------------

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


 Changes in behaviour which may result in compilation errors
@@ -66,6 +64,11 @@ Deprecated methods since 2.6.x and their replacements
 - wxDC::BeginDrawing() and wxDC::EndDrawing() deprecated, don't use them.
 - wxWindowBase::GetBestFittingSize --> wxWindowBase::GetEffectiveMinSize.
 - wxWindowBase::SetBestFittingSize --> wxWindowBase::SetInitialSize.
+- Seeking on a zip stream returned from wxFileSystem without using the new
+  wxFS_SEEKABLE flags is deprecated. You can still seek, but use the flag.
+- Constructor wxZipInputStream(const wxString& archive, const wxString& file)
+  deprecated in favour of wxFileSystem (other zip ctors are not deprecated).
+ 


 Major new features in 2.8 release
@@ -79,7 +82,7 @@ Major new features in 2.8 release
  comboboxes. Associated classes include wxOwnerDrawnComboBox, wxComboPopup
  and wxBitmapComboBox.
 - Further functionality including wxAnimationCtrl (moved from contrib/src/anim
-  and enhanced), wxHtmlSimpleListBox, wxHyperlinkCtrl, wxColourPickerCtrl,
+  and enhanced), wxSimpleHtmlListBox, wxHyperlinkCtrl, wxColourPickerCtrl,
  wxDirPickerCtrl, wxFilePickerCtrl, wxFontPickerCtrl, wxCollapsiblePane,
  wxAboutBox, wxTreebook, tar streams.

@@ -91,10 +94,24 @@ All:

 - wxArrayString::Alloc() now works as reserve() and doesn't clear array contents
 - Fixed long standing bug in wxFileConfig groups renaming (Antti Koivisto).
+- New option wxFS_READ | wxFS_SEEKABLE for wxFileSystem::OpenFile() to return
+  a stream that is seekable.
+- Fixed bug in wxCalendarCtrl::HitTest() when clicking on month change arrows
+- Added wxWindow::GetWindowBorderSize() and corrected wxTreeCtrl::GetBestSize()
+  for a control with borders (Tim Kosse)

 wxMSW:

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

 2.7.2
 -----
--- a/docs/latex/wx/animatctrl.tex
+++ b/docs/latex/wx/animatctrl.tex
@@ -80,7 +80,7 @@ all the parameters.

 \wxheading{Parameters}

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

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

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


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

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

 \func{void}{Stop}{\void}
--- a/docs/latex/wx/animation.tex
+++ b/docs/latex/wx/animation.tex
@@ -101,7 +101,7 @@ Returns \true if animation data is present.

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

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

 Loads an animation from the given stream.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 \wxheading{Derived from}

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

 \wxheading{Include files}

@@ -167,6 +166,10 @@ Returns the current art provider being used.

 See also: \helpref{wxAuiDockArt}{wxauidockart}.

+\func{void}{GetDockSizeConstraint}{\param{double* }{widthpct}, \param{double* }{heightpct}}
+
+Returns the current dock constraint values.  See SetDockSizeConstraint() for more information.
+
 \membersection{wxAuiManager::GetFlags}\label{wxauimanagergetflags}

 \constfunc{unsigned int}{GetFlags}{\void}
@@ -179,6 +182,14 @@ Returns the current manager's flags.

 Returns the frame currently being managed by wxAuiManager.

+\func{static wxAuiManager*}{GetManager}{\param{wxWindow* }{window}}
+
+Calling this method will return the wxAuiManager for a given window.  The \arg{window} parameter should
+specify any child window or sub-child window of the frame or window managed by wxAuiManager.
+The \arg{window} parameter need not be managed by the manager itself, nor does it even need to be a child
+or sub-child of a managed window.  It must however be inside the window hierarchy underneath the managed
+window.
+
 \membersection{wxAuiManager::GetPane}\label{wxauimanagergetpane}

 \func{wxAuiPaneInfo\&}{GetPane}{\param{wxWindow* }{window}}
@@ -258,6 +269,15 @@ will be deleted by wxAuiManager.

 See also: \helpref{wxAuiDockArt}{wxauidockart}.

+\func{void}{SetDockSizeConstraint}{\param{double }{widthpct}, \param{double }{heightpct}}
+
+When a user creates a new dock by dragging a window into a docked position, often times the large size of the
+window will create a dock that is unwieldly large.  wxAuiManager by default limits the size of any
+new dock to 1/3 of the window size.  For horizontal docks, this would be 1/3 of the window height.  For
+vertical docks, 1/3 of the width.  Calling this function will adjust this constraint value.  The numbers
+must be between 0.0 and 1.0.  For instance, calling SetDockSizeContraint with 0.5, 0.5 will cause new
+docks to be limited to half of the size of the entire managed window. 
+
 \membersection{wxAuiManager::SetFlags}\label{wxauimanagersetflags}

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

 Returns the page specified by the given index.

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

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

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

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

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

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

+\func{void}{Split}{\param{size\_t }{page}, \param{int }{direction}}
+
+Split performs a split operation programmatically. The argument \arg{page} indicates
+the page that will be split off.  This page will also become the active page after the
+split.  The \arg{direction} argument specifies where the pane should go, it should be one
+of the following: wxTOP, wxBOTTOM, wxLEFT, or wxRIGHT.
+
+
+
+
+
--- a/docs/latex/wx/auipaneinfo.tex
+++ b/docs/latex/wx/auipaneinfo.tex
@@ -63,7 +63,8 @@ BestSize() sets the ideal size for the pane.  The docking manager will attempt t

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

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

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

@@ -88,7 +89,8 @@ CaptionVisible indicates that a pane caption should be visible.  If false, no pa
 \func{wxAuiPaneInfo\&}{Centre}{\void}
 \func{wxAuiPaneInfo\&}{Center}{\void}

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

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

@@ -338,7 +340,8 @@ Layer() determines the layer of the docked pane.  The dock layer is similar to a

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

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

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

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

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

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

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

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

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

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

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

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

--- a/docs/latex/wx/clrpicker.tex
+++ b/docs/latex/wx/clrpicker.tex
@@ -43,6 +43,9 @@ The text control is automatically synchronized with button's value. Use function

 \wxheading{Event handling}

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

 \wxheading{Event handling}

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

 \wxheading{See also}

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

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

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

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


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

 \constfunc{wxString}{GetValue}{\void}
--- a/docs/latex/wx/datectrl.tex
+++ b/docs/latex/wx/datectrl.tex
@@ -154,7 +154,11 @@ outside of the current range, an invalid object is returned.

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

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

 \wxheading{Remarks}

--- a/docs/latex/wx/db.tex
+++ b/docs/latex/wx/db.tex
@@ -1383,7 +1383,7 @@ When called with {\it sqlLogOFF}, the logging file is closed, and any calls to \

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

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

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

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

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

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


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

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

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

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

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

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

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

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

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

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

 \wxheading{Event handling}

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

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

 \wxheading{Derived from}

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

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

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

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

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

 \wxheading{Event handling}

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

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

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

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

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

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

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

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

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

 \wxheading{Event handling}

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

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

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

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


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

 \wxheading{Include files}

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


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

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


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

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

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

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

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

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


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

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


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

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


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

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


--- a/docs/latex/wx/listctrl.tex
+++ b/docs/latex/wx/listctrl.tex
@@ -38,6 +38,11 @@ Using many of wxListCtrl features is shown in the
 To intercept events from a list control, use the event table macros described
 in \helpref{wxListEvent}{wxlistevent}.

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

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

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

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

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

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


 \membersection{wxLocale::IsLoaded}\label{wxlocaleisloaded}
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -668,6 +668,7 @@ That's all there is to it!
 \input constant.tex
 \input category.tex
 \input topics.tex
+\input topics2.tex
 \input portnote.tex
 % Deprecated classes
 %\input proplist.tex
--- a/docs/latex/wx/pen.tex
+++ b/docs/latex/wx/pen.tex
@@ -59,10 +59,11 @@ get a pointer to a pen by using the global list of pens {\bf
 wxThePenList}, and calling the member function {\bf FindOrCreatePen}.
 See the entry for \helpref{wxPenList}{wxpenlist}.

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

 %TODO: an overview for wxPen.
@@ -406,3 +407,4 @@ to the pen list, and returns it.
 \docparam{width}{Width of pen.}

 \docparam{style}{Pen style. See \helpref{wxPen::wxPen}{wxpenctor} for a list of styles.}
+
--- a/docs/latex/wx/platinfo.tex
+++ b/docs/latex/wx/platinfo.tex
@@ -373,6 +373,7 @@ Returns the run-time minor version of the toolkit associated with this wxPlatfor
 Note that if \helpref{GetPortId}{wxplatforminfogetportid} returns wxPORT\_BASE, then this value is zero (unless externally modified with \helpref{SetToolkitVersion}{wxplatforminfosettoolkitversion}); that is, no native toolkit is in use.

 See \helpref{wxAppTraits::GetToolkitVersion}{wxapptraitsgettoolkitversion} for more info.
+
 \wxheading{See also}

 \helpref{CheckToolkitVersion}{wxplatforminfochecktoolkitversion}
--- a/docs/latex/wx/region.tex
+++ b/docs/latex/wx/region.tex
@@ -10,8 +10,14 @@

 \section{\class{wxRegion}}\label{wxregion}

-A wxRegion represents a simple or complex region on a device context or window. It uses
-reference counting, so copying and assignment operations are fast.
+A wxRegion represents a simple or complex region on a device context or window.
+
+This class uses \helpref{reference counting and copy-on-write}{trefcount}
+internally so that assignments between two instances of this class are very
+cheap. You can therefore use actual objects instead of pointers without
+efficiency problems. If an instance of this class is changed it will create
+its own data internally so that other instances, which previously shared the
+data using the reference counting, are not affected.

 \wxheading{Derived from}

--- a/docs/latex/wx/renderer.tex
+++ b/docs/latex/wx/renderer.tex
@@ -131,16 +131,33 @@ rectangle of a drop down button which arrow matches the size you need.

 \membersection{wxRendererNative::DrawHeaderButton}\label{wxrenderernativedrawheaderbutton}

-\func{void}{DrawHeaderButton}{\param{wxWindow* }{win}, \param{wxDC\& }{dc}, \param{const wxRect\& }{rect}, \param{int }{flags = 0}, \param{wxHeaderSortIconType }{sortArrow = wxHDR\_SORT\_ICON\_NONE}, \param{wxHeaderButtonParams* }{params = NULL}}
+\func{int}{DrawHeaderButton}{\param{wxWindow* }{win}, \param{wxDC\& }{dc}, \param{const wxRect\& }{rect}, \param{int }{flags = 0}, \param{wxHeaderSortIconType }{sortArrow = wxHDR\_SORT\_ICON\_NONE}, \param{wxHeaderButtonParams* }{params = NULL}}

 Draw the header control button (used, for example, by
 \helpref{wxListCtrl}{wxlistctrl}).  Depending on platforms the
 \arg{flags} parameter may support the \texttt{wxCONTROL\_SELECTED}
 \texttt{wxCONTROL\_DISABLED} and \texttt{wxCONTROL\_CURRENT} bits.
 The \arg{sortArrow} parameter can be one of
-\texttt{wxHDR\_SORT\_ICON\_NONE}, \texttt{wxHDR\_SORT\_ICON\_UP}, or 
+\texttt{wxHDR\_SORT\_ICON\_NONE}, \texttt{wxHDR\_SORT\_ICON\_UP}, or
 \texttt{wxHDR\_SORT\_ICON\_DOWN}.  Additional values controlling the
-drawing of a text or bitmap label can be passed in \arg{params}.
+drawing of a text or bitmap label can be passed in \arg{params}.  The
+value returned is the optimal width to contain the the unabreviated
+label text or bitmap, the sort arrow if present, and internal margins.
+
+
+
+\membersection{wxRendererNative::DrawItemSelectionRect}\label{wxrenderernativedrawitemselectionrect}
+
+\func{void}{DrawItemSelectionRect}{\param{wxWindow* }{win}, \param{wxDC\& }{dc}, \param{const wxRect\& }{rect}, \param{int }{flags = 0}}
+
+Draw a selection rectangle underneath the text as used e.g. in a 
+\helpref{wxListCtrl}{wxlistctrl}. The supported \arg{flags} are
+\texttt{wxCONTROL\_SELECTED} for items which are selected (e.g. often a blue
+rectangle) and \texttt{wxCONTROL\_CURRENT} for the item that has the focus
+(often a dotted line around the item's text). \texttt{wxCONTROL\_FOCUSED} may
+be used to indicate if the control has the focus (othewise the the selection
+rectangle is e.g. often grey and not blue). This may be ignored by the renderer
+or deduced by the code directly from the \arg{win}.


 \membersection{wxRendererNative::DrawPushButton}\label{wxrenderernativedrawpushbutton}
--- a/docs/latex/wx/richtextattr.tex
+++ b/docs/latex/wx/richtextattr.tex
@@ -155,11 +155,22 @@ Of these, only wxTEXT\_ATTR\_EFFECT\_CAPITALS and wxTEXT\_ATTR\_EFFECT\_STRIKETH

 Constructors.

-\membersection{wxRichTextAttr::CopyTo}\label{wxrichtextattrcopyto}
+\membersection{wxRichTextAttr::Apply}\label{wxrichtextattrapply}

-\constfunc{void}{CopyTo}{\param{wxTextAttrEx\& }{attr}}
+\func{bool}{Combine}{\param{const wxRichTextAttrEx\& }{style}, \param{const wxRichTextAttrEx* }{compareWith = NULL}}

-Copies the wxRichTextAttr attributes to a \helpref{wxTextAttrEx}{wxtextattrex} object.
+Applies the attributes in {\it style} to the original object, but not those attributes from {\it style} that are the same as those in {\it compareWith} (if passed).
+
+See also \helpref{wxRichTextAttr::Combine}{wxrichtextattrcombine} for a function that does almost the same but returns a new object instead of modifying the original object.
+
+\membersection{wxRichTextAttr::Combine}\label{wxrichtextattrcombine}
+
+\constfunc{wxRichTextAttr}{Combine}{\param{const wxRichTextAttrEx\& }{style}, \param{const wxRichTextAttrEx* }{compareWith = NULL}}
+
+Combines 'this' with {\it style}, but not applying attributes from {\it style} that are the same as those in {\it compareWith} (if passed).
+A wxRichTextAttr object is returned and the original object is not changed.
+
+See also \helpref{wxRichTextAttr::Apply}{wxrichtextattrapply} for a function that does almost the same but modifies the original object instead of returning a new one.

 \membersection{wxRichTextAttr::CreateFont}\label{wxrichtextattrcreatefont}

@@ -404,9 +415,9 @@ Returns \true if the attribute object specifies bullet text (usually specifying

 Returns \true if the attribute object specifies a character style name.

-\membersection{wxRichTextAttr::HasFaceName}\label{wxrichtextattrhasfacename}
+\membersection{wxRichTextAttr::HasFontFaceName}\label{wxrichtextattrhasfontfacename}

-\constfunc{bool}{HasFaceName}{\void}
+\constfunc{bool}{HasFontFaceName}{\void}

 Returns \true if the attribute object specifies a font face name.

@@ -422,9 +433,9 @@ Returns \true if the {\it flag} is present in the attribute object's flag bitlis

 Returns \true if the attribute object specifies any font attributes.

-\membersection{wxRichTextAttr::HasItalic}\label{wxrichtextattrhasitalic}
+\membersection{wxRichTextAttr::HasFontItalic}\label{wxrichtextattrhasfontitalic}

-\constfunc{bool}{HasItalic}{\void}
+\constfunc{bool}{HasFontItalic}{\void}

 Returns \true if the attribute object specifies italic style.

@@ -482,9 +493,9 @@ Returns \true if the attribute object specifies a paragraph style name.

 Returns \true if the attribute object specifies a right indent.

-\membersection{wxRichTextAttr::HasSize}\label{wxrichtextattrhassize}
+\membersection{wxRichTextAttr::HasFontSize}\label{wxrichtextattrhasfontsize}

-\constfunc{bool}{HasSize}{\void}
+\constfunc{bool}{HasFontSize}{\void}

 Returns \true if the attribute object specifies a font point size.

@@ -506,9 +517,9 @@ Returns \true if the attribute object specifies a text foreground colour.

 Returns \true if the attribute object specifies text effects.

-\membersection{wxRichTextAttr::HasUnderlined}\label{wxrichtextattrhasunderlined}
+\membersection{wxRichTextAttr::HasFontUnderlined}\label{wxrichtextattrhasfontunderlined}

-\constfunc{bool}{HasUnderlined}{\void}
+\constfunc{bool}{HasFontUnderlined}{\void}

 Returns \true if the attribute object specifies either underlining or no underlining.

@@ -518,18 +529,12 @@ Returns \true if the attribute object specifies either underlining or no underli

 Returns \true if the attribute object specifies a URL.

-\membersection{wxRichTextAttr::HasWeight}\label{wxrichtextattrhasweight}
+\membersection{wxRichTextAttr::HasFontWeight}\label{wxrichtextattrhasfontweight}

-\constfunc{bool}{HasWeight}{\void}
+\constfunc{bool}{HasFontWeight}{\void}

 Returns \true if the attribute object specifies font weight (bold, light or normal).

-\membersection{wxRichTextAttr::Init}\label{wxrichtextattrinit}
-
-\func{void}{Init}{\void}
-
-Initialise the object.
-
 \membersection{wxRichTextAttr::IsCharacterStyle}\label{wxrichtextattrischaracterstyle}

 \constfunc{bool}{IsCharacterStyle}{\void}
--- a/docs/latex/wx/richtextbuffer.tex
+++ b/docs/latex/wx/richtextbuffer.tex
@@ -311,7 +311,7 @@ Copy the given range to the clipboard.

 \membersection{wxRichTextBuffer::DeleteRangeWithUndo}\label{wxrichtextbufferdeleterangewithundo}

-\func{bool}{DeleteRangeWithUndo}{\param{const wxRichTextRange\& }{range}, \param{long }{initialCaretPosition}, \param{long }{newCaretPositon}, \param{wxRichTextCtrl* }{ctrl}}
+\func{bool}{DeleteRangeWithUndo}{\param{const wxRichTextRange\& }{range}, \param{wxRichTextCtrl* }{ctrl}}

 Submits a command to delete the given range.

@@ -807,10 +807,11 @@ This differs from the wxRichTextCtrl API, where you would specify (5,6).
 \item wxRICHTEXT\_SETSTYLE\_WITH\_UNDO: specifies that this operation should be undoable.
 \item wxRICHTEXT\_SETSTYLE\_OPTIMIZE: specifies that the style should not be applied if the
 combined style at this point is already the style in question.
-\item define wxRICHTEXT\_SETSTYLE\_PARAGRAPHS\_ONLY: specifies that the style should only be applied to paragraphs,
+\item wxRICHTEXT\_SETSTYLE\_PARAGRAPHS\_ONLY: specifies that the style should only be applied to paragraphs,
 and not the content. This allows content styling to be preserved independently from that of e.g. a named paragraph style.
 \item wxRICHTEXT\_SETSTYLE\_CHARACTERS\_ONLY: specifies that the style should only be applied to characters,
 and not the paragraph. This allows content styling to be preserved independently from that of e.g. a named paragraph style.
+\item wxRICHTEXT\_SETSTYLE\_RESET: resets (clears) the existing style before applying the new style.
 \end{itemize}

 \membersection{wxRichTextBuffer::SetStyleSheet}\label{wxrichtextbuffersetstylesheet}
--- a/docs/latex/wx/richtextctrl.tex
+++ b/docs/latex/wx/richtextctrl.tex
@@ -3,6 +3,12 @@
 wxRichTextCtrl provides a generic, ground-up implementation of a text control
 capable of showing multiple styles and images.

+wxRichTextCtrl sends notification events: see \helpref{wxRichTextEvent}{wxrichtextevent}.
+It also sends the standard wxTextCtrl events wxEVT\_COMMAND\_TEXT\_ENTER and wxEVT\_COMMAND\_TEXT\_UPDATED,
+and wxTextUrlEvent when URL content is clicked.
+
+For more information, see the \helpref{wxRichTextCtrl overview}{wxrichtextctrloverview}.
+
 \wxheading{Derived from}

 wxTextCtrlBase
@@ -360,6 +366,12 @@ Creates the underlying window.
 Copies the selected content (if any) to the clipboard and deletes the selection.
 This is undoable.

+\membersection{wxRichTextCtrl::Delete}\label{wxrichtextctrldelete}
+
+\func{bool}{Delete}{\param{const wxRichTextRange\&}{ range}}
+
+Deletes the content within the given range.
+
 \membersection{wxRichTextCtrl::DeleteSelectedContent}\label{wxrichtextctrldeleteselectedcontent}

 \func{bool}{DeleteSelectedContent}{\param{long* }{newPos = NULL}}
@@ -689,6 +701,15 @@ This function gets the combined style - that is, the style you see on the screen
 of combining base style, paragraph style and character style attributes. To get the character
 or paragraph style alone, use \helpref{GetUncombinedStyle}{wxrichtextctrlgetuncombinedstyle}.

+\membersection{wxRichTextCtrl::GetStyleForRange}\label{wxrichtextctrlgetstyleforrange}
+
+\func{bool}{GetStyleForRange}{\param{const wxRichTextRange\& }{range}, \param{wxRichTextAttr\& }{style}}
+
+\func{bool}{GetStyleForRange}{\param{const wxRichTextRange\& }{range}, \param{wxTextAttrEx\& }{style}}
+
+Gets the attributes common to the specified range. Attributes that differ in value within the range will
+not be included in {\it style}'s flags.
+
 \membersection{wxRichTextCtrl::GetStyleSheet}\label{wxrichtextctrlgetstylesheet}

 \constfunc{wxRichTextStyleSheet*}{GetStyleSheet}{\void}
@@ -898,6 +919,14 @@ Lays out the buffer, which must be done before certain operations, such as
 setting the caret position. This function should not normally be required by the
 application.

+\membersection{wxRichTextCtrl::LineBreak}\label{wxrichtextctrllinebreak}
+
+\func{bool}{LineBreak}{\void}
+
+Inserts a line break at the current insertion point. A line break forces wrapping within a paragraph, and
+can be introduced by using this function, by appending the wxChar value {\bf wxRichTextLineBreakChar} to text content,
+or by typing Shift-Return.
+
 \membersection{wxRichTextCtrl::LoadFile}\label{wxrichtextctrlloadfile}

 \func{bool}{LoadFile}{\param{const wxString\& }{file}, \param{int }{type = wxRICHTEXT\_TYPE\_ANY}}
@@ -999,7 +1028,7 @@ Moves up.

 \func{bool}{Newline}{\void}

-Insert a newline (actually paragraph) at the current insertion point.
+Inserts a new paragraph at the current insertion point. See also \helpref{wxRichTextCtrl::LineBreak}{wxrichtextctrllinebreak}.

 \membersection{wxRichTextCtrl::NumberList}\label{wxrichtextctrlnumberlist}

@@ -1373,10 +1402,11 @@ So, for example, to set the style for a character at position 5, use the range (
 \item wxRICHTEXT\_SETSTYLE\_WITH\_UNDO: specifies that this operation should be undoable.
 \item wxRICHTEXT\_SETSTYLE\_OPTIMIZE: specifies that the style should not be applied if the
 combined style at this point is already the style in question.
-\item define wxRICHTEXT\_SETSTYLE\_PARAGRAPHS\_ONLY: specifies that the style should only be applied to paragraphs,
+\item wxRICHTEXT\_SETSTYLE\_PARAGRAPHS\_ONLY: specifies that the style should only be applied to paragraphs,
 and not the content. This allows content styling to be preserved independently from that of e.g. a named paragraph style.
 \item wxRICHTEXT\_SETSTYLE\_CHARACTERS\_ONLY: specifies that the style should only be applied to characters,
 and not the paragraph. This allows content styling to be preserved independently from that of e.g. a named paragraph style.
+\item wxRICHTEXT\_SETSTYLE\_RESET: resets (clears) the existing style before applying the new style.
 \end{itemize}

 \membersection{wxRichTextCtrl::SetStyleSheet}\label{wxrichtextctrlsetstylesheet}
--- a/docs/latex/wx/richtextevent.tex
+++ b/docs/latex/wx/richtextevent.tex
@@ -1,20 +1,29 @@
 \section{\class{wxRichTextEvent}}\label{wxrichtextevent}

-This is the event class for wxRichTextCtrl notifications. Note that event generation
-is incomplete; events to be implemented include selection of text, deletion, insertion, and so on.
+This is the event class for \helpref{wxRichTextCtrl}{wxrichtextctrl} notifications.

 \wxheading{Event table macros}

 To process a rich text event, use these event handler macros to direct input to a member
 function that takes a wxRichTextEvent argument.

-\twocolwidtha{7cm}
+\twocolwidtha{10cm}
 \begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf EVT\_RICHTEXT\_LEFT\_CLICK(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_LEFT\_CLICK event. Not currently implemented.}
-\twocolitem{{\bf EVT\_RICHTEXT\_RIGHT\_CLICK(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_RIGHT\_CLICK event. Not currently implemented.}
-\twocolitem{{\bf EVT\_RICHTEXT\_MIDDLE\_CLICK(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_MIDDLE\_CLICK event. Not currently implemented.}
-\twocolitem{{\bf EVT\_RICHTEXT\_LEFT\_DCLICK(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_LEFT\_DCLICK event. Not currently implemented.}
-\twocolitem{{\bf EVT\_RICHTEXT\_RETURN(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_RETURN event, generated when the user presses the return key.}
+%\twocolitem{{\bf EVT\_RICHTEXT\_LEFT\_CLICK(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_LEFT\_CLICK event. Not currently implemented.}
+%\twocolitem{{\bf EVT\_RICHTEXT\_RIGHT\_CLICK(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_RIGHT\_CLICK event. Not currently implemented.}
+%\twocolitem{{\bf EVT\_RICHTEXT\_MIDDLE\_CLICK(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_MIDDLE\_CLICK event. Not currently implemented.}
+%\twocolitem{{\bf EVT\_RICHTEXT\_LEFT\_DCLICK(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_LEFT\_DCLICK event. Not currently implemented.}
+\twocolitem{{\bf EVT\_RICHTEXT\_CHARACTER(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_CHARACTER event, generated when the user presses a character key. Valid event functions: GetFlags, GetPosition, GetCharacter.}
+\twocolitem{{\bf EVT\_RICHTEXT\_DELETE(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_DELETE event, generated when the user presses the backspace or delete key. Valid event functions: GetFlags, GetPosition.}
+\twocolitem{{\bf EVT\_RICHTEXT\_RETURN(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_RETURN event, generated when the user presses the return key. Valid event functions: GetFlags, GetPosition.}
+%\twocolitem{{\bf EVT\_RICHTEXT\_SELECTION\_CHANGED(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_SELECTION\_CHANGED event, generated when the selection has been changed. Not currently implemented.}
+\twocolitem{{\bf EVT\_RICHTEXT\_STYLE\_CHANGED(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_STYLE\_CHANGED event, generated when styling has been applied to the control. Valid event functions: GetPosition, GetRange.}
+%\twocolitem{{\bf EVT\_RICHTEXT\_STYLESHEET\_CHANGING(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_STYLESHEET\_CHANGING event, generated when the control's stylesheet is about to change, for example the user added, edited or deleted a style.}
+\twocolitem{{\bf EVT\_RICHTEXT\_STYLESHEET\_CHANGED(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_STYLESHEET\_CHANGING event, generated when the control's stylesheet has changed, for example the user added, edited or deleted a style. Valid event functions: GetRange, GetPosition.}
+\twocolitem{{\bf EVT\_RICHTEXT\_STYLESHEET\_REPLACING(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_STYLESHEET\_REPLACING event, generated when the control's stylesheet is about to be replaced, for example when a file is loaded into the control. Valid event functions: Veto, GetOldStyleSheet, GetNewStyleSheet.}
+\twocolitem{{\bf EVT\_RICHTEXT\_STYLESHEET\_REPLACED(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_STYLESHEET\_REPLACED event, generated when the control's stylesheet has been replaced, for example when a file is loaded into the control. Valid event functions: GetOldStyleSheet, GetNewStyleSheet.}
+\twocolitem{{\bf EVT\_RICHTEXT\_CONTENT\_INSERTED(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_CONTENT\_INSERTED event, generated when content has been inserted into the control. Valid event functions: GetPosition, GetRange.}
+\twocolitem{{\bf EVT\_RICHTEXT\_CONTENT\_DELETED(id, func)}}{Process a wxEVT\_COMMAND\_RICHTEXT\_CONTENT\_DELETED event, generated when content has been deleted from the control. Valid event functions: GetPosition, GetRange.}
 \end{twocollist}%
 
 \wxheading{Derived from}
@@ -43,28 +52,79 @@ Constructors.

 Clones the event.

+\membersection{wxRichTextEvent::GetCharacter}\label{wxrichtexteventgetcharacter}
+
+\constfunc{wxChar}{GetCharacter}{\void}
+
+Returns the character pressed, within a wxEVT\_COMMAND\_RICHTEXT\_CHARACTER event.
+
 \membersection{wxRichTextEvent::GetFlags}\label{wxrichtexteventgetflags}

 \constfunc{int}{GetFlags}{\void}

-Returns flags indicating modifier keys pressed.
+Returns flags indicating modifier keys pressed. Possible values are wxRICHTEXT\_CTRL\_DOWN,
+wxRICHTEXT\_SHIFT\_DOWN, and wxRICHTEXT\_ALT\_DOWN.

-\membersection{wxRichTextEvent::GetIndex}\label{wxrichtexteventgetindex}
+\membersection{wxRichTextEvent::GetNewStyleSheet}\label{wxrichtexteventgetnewstylesheet}

-\constfunc{int}{GetIndex}{\void}
+\constfunc{wxRichTextStyleSheet*}{GetNewStyleSheet}{\void}

-Not currently used.
+Returns the new style sheet. Can be used in a wxEVT\_COMMAND\_RICHTEXT\_STYLESHEET\_CHANGING or
+wxEVT\_COMMAND\_RICHTEXT\_STYLESHEET\_CHANGED event handler.
+
+\membersection{wxRichTextEvent::GetOldStyleSheet}\label{wxrichtexteventgetoldstylesheet}
+
+\constfunc{wxRichTextStyleSheet*}{GetOldStyleSheet}{\void}
+
+Returns the old style sheet. Can be used in a wxEVT\_COMMAND\_RICHTEXT\_STYLESHEET\_CHANGING or
+wxEVT\_COMMAND\_RICHTEXT\_STYLESHEET\_CHANGED event handler.
+
+\membersection{wxRichTextEvent::GetPosition}\label{wxrichtexteventgetposition}
+
+\constfunc{long}{GetPosition}{\void}
+
+Returns the buffer position at which the event occured.
+
+\membersection{wxRichTextEvent::GetRange}\label{wxrichtexteventgetrange}
+
+\constfunc{wxRichTextRange}{GetRange}{\void}
+
+Gets the range for the current operation.
+
+\membersection{wxRichTextEvent::SetCharacter}\label{wxrichtexteventsetcharacter}
+
+\func{void}{SetCharacter}{\param{wxChar }{ch}}
+
+Sets the character variable.

 \membersection{wxRichTextEvent::SetFlags}\label{wxrichtexteventsetflags}

 \func{void}{SetFlags}{\param{int }{flags}}

 Sets flags indicating modifier keys pressed. Possible values are wxRICHTEXT\_CTRL\_DOWN,
-wxRICHTEXT\_SHIFT\_DOWN, andwxRICHTEXT\_ALT\_DOWN.
+wxRICHTEXT\_SHIFT\_DOWN, and wxRICHTEXT\_ALT\_DOWN.

-\membersection{wxRichTextEvent::SetIndex}\label{wxrichtexteventsetindex}
+\membersection{wxRichTextEvent::SetNewStyleSheet}\label{wxrichtexteventsetnewstylesheet}

-\func{void}{SetIndex}{\param{int }{n}}
+\func{void}{SetNewStyleSheet}{\param{wxRichTextStyleSheet*}{ sheet}}

-Not currently used.
+Sets the new style sheet variable.
+
+\membersection{wxRichTextEvent::SetOldStyleSheet}\label{wxrichtexteventsetoldstylesheet}
+
+\func{void}{SetOldStyleSheet}{\param{wxRichTextStyleSheet*}{ sheet}}
+
+Sets the old style sheet variable.
+
+\membersection{wxRichTextEvent::SetPosition}\label{wxrichtexteventsetposition}
+
+\func{void}{SetPosition}{\param{long }{pos}}
+
+Sets the buffer position variable.
+
+\membersection{wxRichTextEvent::SetRange}\label{wxrichtexteventsetrange}
+
+\func{void}{SetRange}{\param{const wxRichTextRange\&}{ range}}
+
+Sets the range variable.

--- a/docs/latex/wx/richtexthtmlhandler.tex
+++ b/docs/latex/wx/richtexthtmlhandler.tex
@@ -29,6 +29,7 @@ SetHandlerFlags function:
 \twocolitem{\windowstyle{wxRICHTEXT\_HANDLER\_SAVE\_IMAGES\_TO\_MEMORY}}{Images are saved to the memory filesystem: suitable for showing wxHTML windows.}
 \twocolitem{\windowstyle{wxRICHTEXT\_HANDLER\_SAVE\_IMAGES\_TO\_FILES}}{Images are saved to temporary files: suitable for showing in wxHTML windows.}
 \twocolitem{\windowstyle{wxRICHTEXT\_HANDLER\_SAVE\_IMAGES\_TO\_BASE64}}{Images are written with the HTML files in Base 64 format: suitable for showing in web browsers.}
+\twocolitem{\windowstyle{wxRICHTEXT\_HANDLER\_NO\_HEADER\_FOOTER}}{Don't include header and footer tags (HTML, HEAD, BODY), so that the HTML can be used as part of a larger document.}
 \end{twocollist}

 \wxheading{Derived from}
@@ -73,6 +74,12 @@ for example after the user has viewed the HTML file.

 Saves the buffer content to the HTML stream.

+\membersection{wxRichTextHTMLHandler::GetFontSizeMapping}\label{wxrichtexthtmlhandlergetfontsizemapping}
+
+\func{wxArrayInt}{GetFontSizeMapping}{\void}
+
+Returns the mapping for converting point sizes to HTML font sizes.
+
 \membersection{wxRichTextHTMLHandler::GetTempDir}\label{wxrichtexthtmlhandlergettempdir}

 \constfunc{const wxString\&}{GetTempDir}{\void}
@@ -91,6 +98,29 @@ Returns the image locations for the last operation.

 Reset the file counter, in case, for example, the same names are required each time

+\membersection{wxRichTextHTMLHandler::SetFontSizeMapping}\label{wxrichtexthtmlhandlersetfontsizemapping}
+
+\func{void}{SetFontSizeMapping}{\param{const wxArrayInt\& }{fontSizeMapping}}
+
+Sets the mapping for converting point sizes to HTML font sizes.
+There should be 7 elements, one for each HTML font size, each element specifying the maximum point size for that
+HTML font size.
+
+For example:
+
+\begin{verbatim}
+    wxArrayInt fontSizeMapping;
+    fontSizeMapping.Add(7);
+    fontSizeMapping.Add(9);
+    fontSizeMapping.Add(11);
+    fontSizeMapping.Add(12);
+    fontSizeMapping.Add(14);
+    fontSizeMapping.Add(22);
+    fontSizeMapping.Add(100);
+    
+    htmlHandler.SetFontSizeMapping(fontSizeMapping);
+\end{verbatim}
+
 \membersection{wxRichTextHTMLHandler::SetTempDir}\label{wxrichtexthtmlhandlersettempdir}

 \func{void}{SetTempDir}{\param{const wxString\& }{tempDir}}
--- a/docs/latex/wx/richtextliststyledefinition.tex
+++ b/docs/latex/wx/richtextliststyledefinition.tex
@@ -37,9 +37,10 @@ Destructor.

 \membersection{wxRichTextListStyleDefinition::CombineWithParagraphStyle}\label{wxrichtextliststyledefinitioncombinewithparagraphstyle}

-\func{wxRichTextAttr}{CombineWithParagraphStyle}{\param{int }{indent}, \param{const wxRichTextAttr\&}{ paraStyle}}
+\func{wxRichTextAttr}{CombineWithParagraphStyle}{\param{int }{indent}, \param{const wxRichTextAttr\&}{ paraStyle}, \param{wxRichTextStyleSheet*}{ styleSheet = NULL}}

 This function combines the given paragraph style with the list style's base attributes and level style matching the given indent, returning the combined attributes.
+If {\it styleSheet} is specified, the base style for this definition will also be included in the result.

 \membersection{wxRichTextListStyleDefinition::FindLevelForIndent}\label{wxrichtextliststyledefinitionfindlevelforindent}

@@ -49,9 +50,17 @@ This function finds the level (from 0 to 9) whose indentation attribute mostly c

 \membersection{wxRichTextListStyleDefinition::GetCombinedStyle}\label{wxrichtextliststyledefinitioncombinewithparagraphstyle}

-\constfunc{wxRichTextAttr}{GetCombinedStyle}{\param{int }{indent}}
+\constfunc{wxRichTextAttr}{GetCombinedStyle}{\param{int }{indent}, \param{wxRichTextStyleSheet*}{ styleSheet = NULL}}

 This function combines the list style's base attributes and the level style matching the given indent, returning the combined attributes.
+If {\it styleSheet} is specified, the base style for this definition will also be included in the result.
+
+\membersection{wxRichTextListStyleDefinition::GetCombinedStyleForLevel}\label{wxrichtextliststyledefinitioncombinewithparagraphstyleforlevel}
+
+\constfunc{wxRichTextAttr}{GetCombinedStyleLevel}{\param{int }{level}, \param{wxRichTextStyleSheet*}{ styleSheet = NULL}}
+
+This function combines the list style's base attributes and the style for the specified level, returning the combined attributes.
+If {\it styleSheet} is specified, the base style for this definition will also be included in the result.

 \membersection{wxRichTextListStyleDefinition::GetLevelAttributes}\label{wxrichtextliststyledefinitiongetlevelattributes}

--- a/docs/latex/wx/richtextoverview.tex
+++ b/docs/latex/wx/richtextoverview.tex
@@ -1,26 +1,33 @@
 \section{wxRichTextCtrl overview}\label{wxrichtextctrloverview}

-Classes: \helpref{wxRichTextCtrl}{wxrichtextctrl}, \helpref{wxRichTextBuffer}{wxrichtextbuffer}, 
-\helpref{wxRichTextAttr}{wxrichtextattr}, \helpref{wxTextAttrEx}{wxtextattrex}, 
-\helpref{wxRichTextCharacterStyleDefinition}{wxrichtextcharacterstyledefinition}, 
+{\bf Major classes:} \helpref{wxRichTextCtrl}{wxrichtextctrl}, \helpref{wxRichTextBuffer}{wxrichtextbuffer}, \helpref{wxRichTextEvent}{wxrichtextevent}
+
+{\bf Helper classes:} \helpref{wxRichTextAttr}{wxrichtextattr}, \helpref{wxTextAttrEx}{wxtextattrex}, 
+\helpref{wxRichTextRange}{wxrichtextrange}
+
+{\bf File handler classes:} \helpref{wxRichTextFileHandler}{wxrichtextfilehandler}, \helpref{wxRichTextHTMLHandler}{wxrichtexthtmlhandler}, 
+\helpref{wxRichTextXMLHandler}{wxrichtextxmlhandler}
+
+{\bf Style classes:} \helpref{wxRichTextCharacterStyleDefinition}{wxrichtextcharacterstyledefinition}, 
 \helpref{wxRichTextParagraphStyleDefinition}{wxrichtextparagraphstyledefinition}, 
 \helpref{wxRichTextListStyleDefinition}{wxrichtextliststyledefinition}, 
-\helpref{wxRichTextStyleSheet}{wxrichtextstylesheet}, 
-\helpref{wxRichTextStyleComboCtrl}{wxrichtextstylecomboctrl}, 
+\helpref{wxRichTextStyleSheet}{wxrichtextstylesheet}
+
+{\bf Additional controls:} \helpref{wxRichTextStyleComboCtrl}{wxrichtextstylecomboctrl}, 
 \helpref{wxRichTextStyleListBox}{wxrichtextstylelistbox}, 
-\helpref{wxRichTextStyleListCtrl}{wxrichtextstylelistctrl}, 
-\helpref{wxRichTextEvent}{wxrichtextevent}, \helpref{wxRichTextRange}{wxrichtextrange}, 
-\helpref{wxRichTextFileHandler}{wxrichtextfilehandler}, \helpref{wxRichTextHTMLHandler}{wxrichtexthtmlhandler}, 
-\helpref{wxRichTextXMLHandler}{wxrichtextxmlhandler}, 
-\helpref{wxRichTextFormattingDialog}{wxrichtextformattingdialog}, 
-\helpref{wxRichTextPrinting}{wxrichtextprinting}, 
+\helpref{wxRichTextStyleListCtrl}{wxrichtextstylelistctrl}
+
+{\bf Printing classes:} \helpref{wxRichTextPrinting}{wxrichtextprinting}, 
 \helpref{wxRichTextPrintout}{wxrichtextprintout}, 
-\helpref{wxRichTextHeaderFooterData}{wxrichtextheaderfooterdata}, 
+\helpref{wxRichTextHeaderFooterData}{wxrichtextheaderfooterdata}
+
+{\bf Dialog classes:} \helpref{wxRichTextStyleOrganiserDialog}{wxrichtextstyleorganiserdialog}, 
+\helpref{wxRichTextFormattingDialog}{wxrichtextformattingdialog}, 
 \helpref{wxSymbolPickerDialog}{wxsymbolpickerdialog}

 wxRichTextCtrl provides a generic implementation of a rich text editor that can handle different character
-styles, paragraph formatting, and images. It's aimed at editing 'natural' language text - if you need an editor that supports code editing,
-wxStyledTextCtrl is a better choice.
+styles, paragraph formatting, and images. It's aimed at editing 'natural' language text - if you need an editor
+that supports code editing, wxStyledTextCtrl is a better choice.

 Despite its name, it cannot currently read or write RTF (rich text format) files. Instead, it
 uses its own XML format, and can also read and write plain text. In future we expect to provide
@@ -35,19 +42,25 @@ the style information in a wxTextCtrl, whereas this information is readily
 available in wxRichTextCtrl. Since it's written in pure wxWidgets, any customizations
 you make to wxRichTextCtrl will be reflected on all platforms.

-There are of course a few disadvantages to using wxRichTextCtrl. It is not native,
+wxRichTextCtrl supports basic printing via the easy-to-use \helpref{wxRichTextPrinting}{wxrichtextprinting} class.
+Creating applications with simple word processing features is simplified with the inclusion of\rtfsp
+\helpref{wxRichTextFormattingDialog}{wxrichtextformattingdialog}, a tabbed dialog allowing
+interactive tailoring of paragraph and character styling. Also provided is the multi-purpose dialog\rtfsp
+\helpref{wxRichTextStyleOrganiserDialog}{wxrichtextstyleorganiserdialog} that can be used for
+managing style definitions, browsing styles and applying them, or selecting list styles with
+a renumber option.
+
+There are a few disadvantages to using wxRichTextCtrl. It is not native,
 so does not behave exactly as a native wxTextCtrl, although common editing conventions
 are followed. Users may miss the built-in spelling correction on Mac OS X, or any
 special character input that may be provided by the native control. It would also
-be a bad choice if intended users rely on screen readers that would be unhappy
+be a poor choice if intended users rely on screen readers that would be not work well
 with non-native text input implementation. You might mitigate this by providing
 the choice between wxTextCtrl and wxRichTextCtrl, with fewer features in the
 former case.

-wxRichTextCtrl does not yet support printing directly, but content can be converted
-to HTML which can then be used with \helpref{wxHtmlEasyPrinting}{wxhtmleasyprinting}.
-
-The following screenshot shows the wxRichTextCtrl sample in action:
+A good way to understand wxRichTextCtrl's capabilities is to compile and run the
+sample, {\tt samples/richtext}, and browse the code. The following screenshot shows the sample in action:

 $$\image{8cm;0cm}{richtextctrl.gif}$$

@@ -207,8 +220,8 @@ be processed by the control rather than being used for navigation between contro

 \subsubsection{wxRichTextCtrl and styles}

-Styling attributes are represented by one of three classes: \helpref{wxTextAttr}{wxtextattr}, \helpref{wxTextAttrEx}{wxtextattrex} and \helpref{wxRichTextAttr}{wxrichtextattr}.
-wxTextAttr is shared across all controls that are derived from wxTextCtrl and
+Styling attributes are represented by three classes: \helpref{wxTextAttr}{wxtextattr}, \helpref{wxTextAttrEx}{wxtextattrex} and \helpref{wxRichTextAttr}{wxrichtextattr}.
+wxTextAttr is shared across all controls that are derived from wxTextCtrlBase and
 can store basic character and paragraph attributes. wxTextAttrEx derives
 from wxTextAttr and adds some further attributes that are only supported
 by wxRichTextCtrl. Finally, wxRichTextAttr is a more efficient version
@@ -309,7 +322,7 @@ text editing functionality.

 \helpref{wxRichTextFormattingDialog}{wxrichtextformattingdialog} can be used
 for character or paragraph formatting, or a combination of both. It's a wxPropertySheetDialog
-with the following available tabs: Font, Indents \& Spacing, Tabs, Bullets, and Style.
+with the following available tabs: Font, Indents \& Spacing, Tabs, Bullets, Style, and List Style.
 You can select which pages will be shown by supplying flags to the dialog constructor.
 In a character formatting dialog, typically only the Font page will be shown.
 In a paragraph formatting dialog, you'll show the Indents \& Spacing, Tabs and Bullets
@@ -319,6 +332,11 @@ You can customize this dialog by providing your own wxRichTextFormattingDialogFa
 object, which tells the formatting dialog how many pages are supported, what their identifiers
 are, and how to creates the pages.

+\helpref{wxRichTextStyleOrganiserDialog}{wxrichtextstyleorganiserdialog} is a multi-purpose dialog
+that can be used for managing style definitions, browsing styles and applying them, or selecting list styles with
+a renumber option. See the sample for usage - it is used for the "Manage Styles" and "Bullets and Numbering"
+menu commands.
+
 \helpref{wxSymbolPickerDialog}{wxsymbolpickerdialog} lets the user insert a symbol from
 a specified font. It has no wxRichTextCtrl dependencies besides being included in
 the rich text library.
@@ -330,17 +348,18 @@ always has one such buffer.

 The content is represented by a hierarchy of objects, all derived from
 wxRichTextObject. An object might be an image, a fragment of text, a paragraph,
-or a whole buffer. Objects store a wxRichTextAttr containing style information;
-although it contains both paragraph formatting and character style, the
-paragraph style information is ignored by children of a paragraph (only
-character style is relevant to these objects).
+or a whole buffer. Objects store a wxTextAttrEx containing style information;
+a paragraph object can contain both paragraph and character information, but
+content objects such as text can only store character information. The final
+style displayed in the control or in a printout is a combination of base
+style, paragraph style and content (character) style.

 The top of the hierarchy is the buffer, a kind of wxRichTextParagraphLayoutBox.
 containing further wxRichTextParagraph objects, each of which can include text,
 images and potentially other types of object.

 Each object maintains a range (start and end position) measured
-from the start of the main parent box.
+from the start of the main parent object.

 When Layout is called on an object, it is given a size which the object
 must limit itself to, or one or more flexible directions (vertical
@@ -356,7 +375,7 @@ A paragraph of pure text with the same style contains just one further
 object, a wxRichTextPlainText object. When styling is applied to part of
 this object, the object is decomposed into separate objects, one object
 for each different character style. So each object within a paragraph always has
-just one wxRichTextAttr object to denote its character style. Of course, this can
+just one wxTextAttrEx object to denote its character style. Of course, this can
 lead to fragmentation after a lot of edit operations, potentially leading
 to several objects with the same style where just one would do. So
 a Defragment function is called when updating the control's display, to ensure that
--- a/docs/latex/wx/richtextprinting.tex
+++ b/docs/latex/wx/richtextprinting.tex
@@ -132,6 +132,12 @@ Sets the \helpref{wxRichTextHeaderFooterData}{wxrichtextheaderfooterdata} text c

 A convenience function to set the header text. See \helpref{wxRichTextHeaderFooterData}{wxrichtextheaderfooterdata} for details.

+\membersection{wxRichTextPrinting::SetPageSetupData}\label{wxrichtextprintingsetpagesetupdata}
+
+\func{void}{SetPageSetupData}{\param{const wxPageSetupData\& }{pageSetupData}}
+
+Sets the page setup data.
+
 \membersection{wxRichTextPrinting::SetParentWindow}\label{wxrichtextprintingsetparentwindow}

 \func{void}{SetParentWindow}{\param{wxWindow* }{parent}}
@@ -144,6 +150,12 @@ Sets the parent window to be used for the preview window and printing wait dialo

 Sets the dimensions to be used for the preview window.

+\membersection{wxRichTextPrinting::SetPrintData}\label{wxrichtextprintingsetprintdata}
+
+\func{void}{SetPrintData}{\param{const wxPrintData\& }{printData}}
+
+Sets the print data.
+
 \membersection{wxRichTextPrinting::SetShowOnFirstPage}\label{wxrichtextprintingsetshowonfirstpage}

 \func{void}{SetShowOnFirstPage}{\param{bool }{show}}
--- a/docs/latex/wx/richtextstyledefinition.tex
+++ b/docs/latex/wx/richtextstyledefinition.tex
@@ -52,11 +52,11 @@ Returns the style name.

 Returns the attributes associated with this style.

-\membersection{wxRichTextStyleDefinition::Init}\label{wxrichtextstyledefinitioninit}
+\membersection{wxRichTextStyleDefinition::GetStyleMergedWithBase}\label{wxrichtextstyledefinitiongetstylemergedwithbase}

-\func{void}{Init}{\void}
+\constfunc{wxRichTextAttr}{GetStyleMergedWithBase}{\param{wxRichTextStyleSheet*}{ sheet}}

-Initialises the definition.
+Returns the style attributes combined with the attributes of the specified base style, if any. This function works recursively.

 \membersection{wxRichTextStyleDefinition::SetBaseStyle}\label{wxrichtextstyledefinitionsetbasestyle}

--- a/docs/latex/wx/richtextstyleorganiserdialog.tex
+++ b/docs/latex/wx/richtextstyleorganiserdialog.tex
@@ -0,0 +1,139 @@
+\section{\class{wxRichTextStyleOrganiserDialog}}\label{wxrichtextstyleorganiserdialog}
+
+This class shows a style sheet and allows the user to edit, add and remove styles.
+It can also be used as a style browser, for example if the application is not
+using a permanent \helpref{wxRichTextStyleComboCtrl}{wxrichtextstylecomboctrl} or \helpref{wxRichTextStyleListCtrl}{wxrichtextstylelistctrl} to
+present styles.
+ 
+\wxheading{Derived from}
+
+\helpref{wxDialog}{wxdialog}
+
+\wxheading{Include files}
+
+<wx/richtext/richtextstyledlg.h>
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxRichTextStyleOrganiserDialog::wxRichTextStyleOrganiserDialog}\label{wxrichtextstyleorganiserdialogwxrichtextstyleorganiserdialog}
+
+\func{}{wxRichTextStyleOrganiserDialog}{\param{int }{flags}, \param{wxRichTextStyleSheet* }{sheet}, \param{wxRichTextCtrl* }{ctrl}, \param{wxWindow* }{parent}, \param{wxWindowID }{id = wxID\_ANY}, \param{const wxString\& }{caption = \_("Style Organiser")}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize}, \param{long }{style = wxDEFAULT\_DIALOG\_STYLE|wxRESIZE\_BORDER|wxSYSTEM\_MENU|wxCLOSE\_BOX}}
+
+\func{}{wxRichTextStyleOrganiserDialog}{\void}
+
+Constructors.
+
+To create a dialog, pass a bitlist of {\it flags} (see below), a style sheet, a text control to apply a selected style to (or NULL), followed by the usual window parameters.
+
+To specify the operations available to the user, pass a combination of these values to {\it flags}:
+
+\twocolwidtha{7cm}
+\begin{twocollist}\itemsep=0pt
+\twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_DELETE\_STYLES}}{Provides a button for deleting styles.}
+\twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_CREATE\_STYLES}}{Provides buttons for creating styles.}
+\twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_APPLY\_STYLES}}{Provides a button for applying the currently selected style to the selection.}
+\twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_EDIT\_STYLES}}{Provides a button for editing styles.}
+\twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_RENAME\_STYLES}}{Provides a button for renaming styles.}
+\twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_OK\_CANCEL}}{Provides OK can Cancel buttons.}
+\twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_RENUMBER}}{Provides a checkbox for specifying that the selection should be renumbered.}
+\end{twocollist}
+
+The following flags determine what will be displayed in the style list:
+
+\twocolwidtha{7cm}
+\begin{twocollist}\itemsep=0pt
+\twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_SHOW\_CHARACTER}}{Displays character styles only.}
+\twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_SHOW\_PARAGRAPH}}{Displays paragraph styles only.}
+\twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_SHOW\_LIST}}{Displays list styles only.}
+\twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_SHOW\_ALL}}{Displays all styles.}
+\end{twocollist}
+
+The following symbols define commonly-used combinations of flags:
+
+\twocolwidtha{7cm}
+\begin{twocollist}\itemsep=0pt
+\twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_ORGANISE}}{Enable all style editing operations so the dialog behaves as a style organiser.}
+\twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_BROWSE}}{Show a list of all styles and their previews, but only allow application of a style or
+cancellation of the dialog. This makes the dialog behave as a style browser.}
+\twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_BROWSE\_NUMBERING}}{Enables only list style browsing, plus a control to specify renumbering. This
+allows the dialog to be used for applying list styles to the selection.}
+\end{twocollist}
+
+\membersection{wxRichTextStyleOrganiserDialog::ApplyStyle}\label{wxrichtextstyleorganiserdialogapplystyle}
+
+\func{bool}{ApplyStyle}{\param{wxRichTextCtrl* }{ctrl = NULL}}
+
+Applies the selected style to selection in the given control or the control passed to the constructor.
+
+\membersection{wxRichTextStyleOrganiserDialog::Create}\label{wxrichtextstyleorganiserdialogcreate}
+
+\func{bool}{Create}{\param{int }{flags}, \param{wxRichTextStyleSheet* }{sheet}, \param{wxRichTextCtrl* }{ctrl}, \param{wxWindow* }{parent}, \param{wxWindowID }{id = wxID\_ANY}, \param{const wxString\& }{caption = \_("Style Organiser")}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize}, \param{long }{style = wxDEFAULT\_DIALOG\_STYLE|wxRESIZE\_BORDER|wxSYSTEM\_MENU|wxCLOSE\_BOX}}
+
+Creates the dialog. See \membersection{wxRichTextStyleOrganiserDialog::wxRichTextStyleOrganiserDialog}{wxrichtextstyleorganiserdialogwxrichtextstyleorganiserdialog} for details.
+
+\membersection{wxRichTextStyleOrganiserDialog::GetFlags}\label{wxrichtextstyleorganiserdialoggetflags}
+
+\constfunc{int}{GetFlags}{\void}
+
+Returns the flags used to control the interface presented to the user.
+
+\membersection{wxRichTextStyleOrganiserDialog::GetRestartNumbering}\label{wxrichtextstyleorganiserdialoggetrestartnumbering}
+
+\constfunc{bool}{GetRestartNumbering}{\void}
+
+Returns \true if the user has opted to restart numbering.
+
+\membersection{wxRichTextStyleOrganiserDialog::GetRichTextCtrl}\label{wxrichtextstyleorganiserdialoggetrichtextctrl}
+
+\constfunc{wxRichTextCtrl*}{GetRichTextCtrl}{\void}
+
+Returns the associated rich text control (if any).
+
+\membersection{wxRichTextStyleOrganiserDialog::GetSelectedStyle}\label{wxrichtextstyleorganiserdialoggetselectedstyle}
+
+\constfunc{wxString}{GetSelectedStyle}{\void}
+
+Returns selected style name.
+
+\membersection{wxRichTextStyleOrganiserDialog::GetSelectedStyleDefinition}\label{wxrichtextstyleorganiserdialoggetselectedstyledefinition}
+
+\constfunc{wxRichTextStyleDefinition*}{GetSelectedStyleDefinition}{\void}
+
+Returns selected style definition.
+
+\membersection{wxRichTextStyleOrganiserDialog::GetStyleSheet}\label{wxrichtextstyleorganiserdialoggetstylesheet}
+
+\constfunc{wxRichTextStyleSheet*}{GetStyleSheet}{\void}
+
+Returns the associated style sheet.
+
+\membersection{wxRichTextStyleOrganiserDialog::SetFlags}\label{wxrichtextstyleorganiserdialogsetflags}
+
+\func{void}{SetFlags}{\param{int }{flags}}
+
+Sets the flags used to control the interface presented to the user.
+
+\membersection{wxRichTextStyleOrganiserDialog::SetRestartNumbering}\label{wxrichtextstyleorganiserdialogsetrestartnumbering}
+
+\func{void}{SetRestartNumbering}{\param{bool }{restartNumbering}}
+
+Checks or unchecks the restart numbering checkbox.
+
+\membersection{wxRichTextStyleOrganiserDialog::SetRichTextCtrl}\label{wxrichtextstyleorganiserdialogsetrichtextctrl}
+
+\func{void}{SetRichTextCtrl}{\param{wxRichTextCtrl* }{ctrl}}
+
+Sets the control to be associated with the dialog, for the purposes of applying a style to the selection.
+
+\membersection{wxRichTextStyleOrganiserDialog::SetShowToolTips}\label{wxrichtextstyleorganiserdialogsetshowtooltips}
+
+\func{void}{SetShowToolTips}{\param{bool }{show}}
+
+Determines whether tooltips will be shown.
+
+\membersection{wxRichTextStyleOrganiserDialog::SetStyleSheet}\label{wxrichtextstyleorganiserdialogsetstylesheet}
+
+\func{void}{SetStyleSheet}{\param{wxRichTextStyleSheet* }{sheet}}
+
+Sets the associated style sheet.
+
--- a/docs/latex/wx/richtextstylesheet.tex
+++ b/docs/latex/wx/richtextstylesheet.tex
@@ -49,6 +49,12 @@ Adds a definition to the list style list.

 Adds a definition to the paragraph style list.

+\membersection{wxRichTextStyleSheet::AddStyle}\label{wxrichtextstylesheetaddstyle}
+
+\func{bool}{AddStyle}{\param{wxRichTextStyleDefinition* }{def}}
+
+Adds a definition to the appropriate style list.
+
 \membersection{wxRichTextStyleSheet::DeleteStyles}\label{wxrichtextstylesheetdeletestyles}

 \func{void}{DeleteStyles}{\void}
@@ -73,6 +79,12 @@ Finds a list definition by name.

 Finds a paragraph definition by name.

+\membersection{wxRichTextStyleSheet::FindStyle}\label{wxrichtextstylesheetfindstyle}
+
+\constfunc{wxRichTextStyleDefinition*}{FindStyle}{\param{const wxString\& }{name}}
+
+Finds a style definition by name.
+
 \membersection{wxRichTextStyleSheet::GetCharacterStyle}\label{wxrichtextstylesheetgetcharacterstyle}

 \constfunc{wxRichTextCharacterStyleDefinition*}{GetCharacterStyle}{\param{size\_t }{n}}
@@ -121,12 +133,6 @@ Returns the {\it n}th paragraph style.

 Returns the number of paragraph styles.

-\membersection{wxRichTextStyleSheet::Init}\label{wxrichtextstylesheetinit}
-
-\func{void}{Init}{\void}
-
-Initialises the style sheet.
-
 \membersection{wxRichTextStyleSheet::RemoveCharacterStyle}\label{wxrichtextstylesheetremovecharacterstyle}

 \func{bool}{RemoveCharacterStyle}{\param{wxRichTextStyleDefinition* }{def}, \param{bool }{deleteStyle = false}}
@@ -145,6 +151,12 @@ Removes a list style.

 Removes a paragraph style.

+\membersection{wxRichTextStyleSheet::RemoveStyle}\label{wxrichtextstylesheetremovestyle}
+
+\func{bool}{RemoveStyle}{\param{wxRichTextStyleDefinition* }{def}, \param{bool }{deleteStyle = false}}
+
+Removes a style.
+
 \membersection{wxRichTextStyleSheet::SetDescription}\label{wxrichtextstylesheetsetdescription}

 \func{void}{SetDescription}{\param{const wxString\& }{descr}}
--- a/docs/latex/wx/symbolpickerdialog.tex
+++ b/docs/latex/wx/symbolpickerdialog.tex
@@ -74,7 +74,7 @@ rich text control in either the current font or specified font.

 \membersection{wxSymbolPickerDialog::wxSymbolPickerDialog}\label{wxsymbolpickerdialogwxsymbolpickerdialog}

-\func{}{wxSymbolPickerDialog}{\param{const wxString\& }{symbol}, \param{const wxString\& }{initialFont}, \param{const wxString\& }{normalTextFont}, \param{wxWindow* }{parent}, \param{wxWindowID }{id = wxID\_ANY}, \param{const wxString\& }{title = \_("Symbols")}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize}, \param{long }{style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxCLOSE_BOX}}
+\func{}{wxSymbolPickerDialog}{\param{const wxString\& }{symbol}, \param{const wxString\& }{initialFont}, \param{const wxString\& }{normalTextFont}, \param{wxWindow* }{parent}, \param{wxWindowID }{id = wxID\_ANY}, \param{const wxString\& }{title = \_("Symbols")}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize}, \param{long }{style = wxDEFAULT\_DIALOG\_STYLE|wxRESIZE\_BORDER|wxCLOSE\_BOX}}

 \func{}{wxSymbolPickerDialog}{\void}

@@ -102,7 +102,7 @@ Constructors.

 \membersection{wxSymbolPickerDialog::Create}\label{wxsymbolpickerdialogcreate}

-\func{bool}{Create}{\param{const wxString\& }{symbol}, \param{const wxString\& }{initialFont}, \param{const wxString\& }{normalTextFont}, \param{wxWindow* }{parent}, \param{wxWindowID }{id = wxID\_ANY}, \param{const wxString\& }{title = \_("Symbols")}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize}, \param{long }{style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxCLOSE_BOX}}
+\func{bool}{Create}{\param{const wxString\& }{symbol}, \param{const wxString\& }{initialFont}, \param{const wxString\& }{normalTextFont}, \param{wxWindow* }{parent}, \param{wxWindowID }{id = wxID\_ANY}, \param{const wxString\& }{title = \_("Symbols")}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize}, \param{long }{style = wxDEFAULT\_DIALOG\_STYLE|wxRESIZE\_BORDER|wxCLOSE\_BOX}}

 Creation: see \helpref{the constructor}{wxsymbolpickerdialogwxsymbolpickerdialog} for details about the parameters.

--- a/docs/latex/wx/sysopt.tex
+++ b/docs/latex/wx/sysopt.tex
@@ -42,6 +42,9 @@ 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 
+control even when it is capable of using the native control instead. 
+Also knwon as wxMAC\_ALWAYS\_USE\_GENERIC\_LISTCTRL.}
 \end{twocollist}

 \wxheading{MGL}
--- a/docs/latex/wx/taui.tex
+++ b/docs/latex/wx/taui.tex
@@ -24,7 +24,7 @@ require additional functionality, such as "spring-loaded" rebar support,
 "chevron" buttons and end-user customizability.

 {\bf Modeless Controls:}
-Modeless controls expose a tool pallete or set of options that float
+Modeless controls expose a tool palette or set of options that float
 above the application content while allowing it to be accessed. Usually
 accessed by the toolbar, these controls disappear when an option is
 selected, but may also be "torn off" the toolbar into a floating frame
--- a/docs/latex/wx/text.tex
+++ b/docs/latex/wx/text.tex
@@ -57,6 +57,14 @@ used, so that text won't be wrapped. No effect under wxGTK1.}

 See also \helpref{window styles overview}{windowstyles} and \helpref{wxTextCtrl::wxTextCtrl}{wxtextctrlctor}.

+Note that alignment styles (\windowstyle{wxTE\_LEFT}, 
+\windowstyle{wxTE\_CENTRE} and \windowstyle{wxTE\_RIGHT}) can be changed
+dynamically after control creation on wxMSW and wxGTK. 
+\windowstyle{wxTE\_READONLY}, \windowstyle{wxTE\_PASSWORD} and wrapping styles
+can be dynamically changed under wxGTK but not wxMSW. The other styles can be
+only set during control creation.
+
+
 \wxheading{wxTextCtrl text format}

 The multiline text controls always store the text as a sequence of lines
--- a/docs/latex/wx/toolbar.tex
+++ b/docs/latex/wx/toolbar.tex
@@ -360,7 +360,7 @@ Returns a pointer to the control identified by \arg{id} or

 \membersection{wxToolBar::FindToolForPosition}\label{wxtoolbarfindtoolforposition}

-\constfunc{wxToolBarToolBase*}{FindToolForPosition}{\param{const float}{ x}, \param{const float}{ y}}
+\constfunc{wxToolBarToolBase*}{FindToolForPosition}{\param{wxCoord }{x}, \param{wxCoord }{y}}

 Finds a tool for the given mouse position.

--- a/docs/latex/wx/topics.tex
+++ b/docs/latex/wx/topics.tex
@@ -4,67 +4,83 @@

 This chapter contains a selection of topic overviews.

-%\input tchanges.tex  --  deprecated: look at docs/changes.txt instead
-\input tusage.tex
-\input tguide.tex
-\input hworld.tex
-\input tsamples.tex
-\input tapp.tex
-\input twinsizes.tex
-\input truntime.tex
-\input trefcount.tex
-\input tstring.tex
-\input tbuffer.tex
-\input tdate.tex
-\input tunicode.tex
-\input tmbconv.tex
-\input ti18n.tex
-\input tnoneng.tex
-\input tcontain.tex
-\input tfile.tex
-\input tstream.tex
-\input tlog.tex
-\input tdebug.tex
-\input tconfig.tex
-%\input texpr.tex
-\input fs.tex
-\input tevent.tex
-\input texcept.tex
-\input tstyles.tex
-\input tdelwin.tex
-\input tdialog.tex
-\input tvalidat.tex
-\input tconstr.tex
-\input tsizer.tex
-\input txrc.tex
-\input tscroll.tex
-\input tbitmap.tex
-\input tdc.tex
-\input tfont.tex
-\input tfontenc.tex
-\input tsplittr.tex
-\input ttreectl.tex
-\input tlistctl.tex
-\input timaglst.tex
-\input tbook.tex
-\input tcommdlg.tex
-\input tdocview.tex
-% Deprecated
-%\input ttab.tex
-\input ttoolbar.tex
-\input tgrid.tex
-\input ttips.tex
-\input tprint.tex
-\input tthreads.tex
-\input tdnd.tex
-\input tclipbrd.tex
-\input tdb.tex
-\input tipc.tex
-\input wxhtml.tex
-\input richtextoverview.tex
-\input taui.tex
-\input tenvvars.tex
-\input wxPython.tex
-\input re_syntax.tex
-\input arc.tex
-\input backwardcompat.tex
+
+{\large {\bf Starting with wxWidgets}}
+
+\helpref{Notes on using the reference}{referencenotes}\\
+\helpref{Writing a wxWidgets application: a rough guide}{roughguide}\\
+\helpref{wxWidgets Hello World sample}{helloworld}\\
+\helpref{wxWidgets samples}{samples}\\
+\helpref{Introduction to wxPython}{wxpython}
+
+{\large {\bf Programming with wxWidgets}}
+
+\helpref{Backward compatibility}{backwardcompatibility}\\
+\helpref{Runtime class information (RTTI)}{runtimeclassoverview}\\
+\helpref{Reference counting}{trefcount}\\
+\helpref{Application class: wxApp}{wxappoverview}\\
+\helpref{Unicode support in wxWidgets}{unicode}\\
+\helpref{Conversion between Unicode and multibyte strings}{mbconvclasses}\\
+\helpref{Internationalization}{internationalization}\\
+\helpref{Writing non-English applications}{nonenglishoverview}\\
+\helpref{Debugging overview}{debuggingoverview}\\
+\helpref{Logging overview}{wxlogoverview}\\
+\helpref{Event handling overview}{eventhandlingoverview}\\
+\helpref{C++ exceptions overview}{exceptionsoverview}\\
+\helpref{Window styles}{windowstyles}\\
+\helpref{Window deletion overview}{windowdeletionoverview}\\
+\helpref{Environment variables}{envvars}
+
+{\large {\bf Overviews of non-GUI classes}}
+
+\helpref{String class: wxString}{wxstringoverview}\\
+\helpref{Buffer classes}{bufferclasses}\\
+\helpref{Date and time classes}{wxdatetimeoverview}\\
+\helpref{Container classes}{wxcontaineroverview}\\
+\helpref{File classes and functions}{wxfileoverview}\\
+\helpref{Stream classes}{wxstreamoverview}\\
+\helpref{Multi-threaded applications}{wxthreadoverview}\\
+\helpref{Working with program options: wxConfig}{wxconfigoverview}\\
+\helpref{Virtual file system: wxFileSystem}{fs}\\
+\helpref{Syntax of the built-in regular expression library}{wxresyn}\\
+\helpref{Archive formats such as zip}{wxarc}\\
+\helpref{Interprocess communication}{ipcoverview}\\
+\helpref{ODBC Database classes}{odbcoverview}
+
+{\large {\bf Drawing related classes}}
+
+\helpref{Device contexts}{dcoverview}\\
+\helpref{Bitmaps and icons}{wxbitmapoverview}\\
+\helpref{Fonts}{wxfontoverview}\\
+\helpref{Fonts encodings}{wxfontencodingoverview}\\
+\helpref{Printing}{printingoverview}\\
+\helpref{Printing under GTK+}{unixprinting}
+
+{\large {\bf Overviews of GUI classes}}
+
+\helpref{Laying out window elements with sizers}{sizeroverview}\\
+\helpref{XML-based resource system}{xrcoverview}\\
+\helpref{Window sizing}{windowsizingoverview}\\
+\helpref{Scrolling}{scrollingoverview}\\
+\helpref{Dialogs}{wxdialogoverview}\\
+\helpref{Transferring and validating data}{validatoroverview}\\
+\helpref{Data exchange: wxDataObject}{wxdataobjectoverview}\\
+\helpref{Drag and drop}{wxdndoverview}\\
+\helpref{Layout constraints}{constraintsoverview}
+
+{\large {\bf Overviews of individual controls}}
+
+\helpref{wxHTML}{wxhtml}\\
+\helpref{wxRichTextCtrl}{wxrichtextctrloverview}\\
+\helpref{wxAUI (advanced user interface)}{wxauioverview}\\
+\helpref{Common dialogs}{commondialogsoverview}\\
+\helpref{Toolbar}{wxtoolbaroverview}\\
+\helpref{wxGrid}{gridoverview}\\
+\helpref{wxTreeCtrl}{wxtreectrloverview}\\
+\helpref{wxListCtrl}{wxlistctrloverview}\\
+\helpref{wxSplitterWindow}{wxsplitterwindowoverview}\\
+\helpref{wxImageList}{wximagelistoverview}\\
+\helpref{wxBookCtrl}{wxbookctrloverview}\\
+\helpref{wxTipProvider}{wxtipprovider}\\
+\helpref{Document/view}{docviewoverview}
+
--- a/docs/latex/wx/topics2.tex
+++ b/docs/latex/wx/topics2.tex
@@ -0,0 +1,66 @@
+
+{\large {\bf All overview topics (uncategorized)}}
+
+\input tusage.tex
+\input tguide.tex
+\input hworld.tex
+\input tsamples.tex
+\input tapp.tex
+\input twinsizes.tex
+\input truntime.tex
+\input trefcount.tex
+\input tstring.tex
+\input tbuffer.tex
+\input tdate.tex
+\input tunicode.tex
+\input tmbconv.tex
+\input ti18n.tex
+\input tnoneng.tex
+\input tcontain.tex
+\input tfile.tex
+\input tstream.tex
+\input tlog.tex
+\input tdebug.tex
+\input tconfig.tex
+%\input texpr.tex
+\input fs.tex
+\input tevent.tex
+\input texcept.tex
+\input tstyles.tex
+\input tdelwin.tex
+\input tdialog.tex
+\input tvalidat.tex
+\input tconstr.tex
+\input tsizer.tex
+\input txrc.tex
+\input tscroll.tex
+\input tbitmap.tex
+\input tdc.tex
+\input tfont.tex
+\input tfontenc.tex
+\input tsplittr.tex
+\input ttreectl.tex
+\input tlistctl.tex
+\input timaglst.tex
+\input tbook.tex
+\input tcommdlg.tex
+\input tdocview.tex
+% Deprecated
+%\input ttab.tex
+\input ttoolbar.tex
+\input tgrid.tex
+\input ttips.tex
+\input tprint.tex
+\input tthreads.tex
+\input tdnd.tex
+\input tclipbrd.tex
+\input tdb.tex
+\input tipc.tex
+\input wxhtml.tex
+\input richtextoverview.tex
+\input taui.tex
+\input tenvvars.tex
+\input wxPython.tex
+\input re_syntax.tex
+\input arc.tex
+\input backwardcompat.tex
--- a/docs/latex/wx/twinsizes.tex
+++ b/docs/latex/wx/twinsizes.tex
@@ -4,10 +4,10 @@


 It can sometimes be confusing to keep track of the various
-size-related attribtes of a \helpref{wxWindow}{wxwindow}, how they
+size-related attributes of a \helpref{wxWindow}{wxwindow}, how they
 relate to each other, and how they interact with sizers. This document
 will attempt to clear the fog a little, and give some simple
-explainations of things.
+explanations of things.

 {\bf BestSize}: The best size of a widget depends on what kind of widget it
 is, and usually also on the contents of the widget. For example a
@@ -15,12 +15,12 @@ is, and usually also on the contents of the widget. For example a
 how many items it has, up to a certain limit, or a
 \helpref{wxButton}{wxbutton}'s best size will be calculated based on
 its label size, but normally won't be smaller than the platform
-deafult button size (unless a style flag overrides that). Get the
+default button size (unless a style flag overrides that). Get the
 picture? There is a special virtual method in the C++ window classes
 called \texttt{DoGetBestSize()} that a class needs to override if it
 wants to calculate its own best size based on its content. The default
 \texttt{DoGetBestSize()} is designed for use in container windows,
-such as wx.Panel, and works something like this:
+such as \helpref{wxPanel}{wxpanel}, and works something like this:

 \begin{enumerate}
  \item{If the window has a sizer then it is used to calculate the best size.}
@@ -33,7 +33,7 @@ such as wx.Panel, and works something like this:
 {\bf MinSize}: The min size of a widget is a size that is normally
 explicitly set by the programmer either with the \texttt{SetMinSize()}
 method or the \texttt{SetSizeHints()} method. Most controls will also
-set the min size to the size given in the control's contstructor if a
+set the min size to the size given in the control's constructor if a
 non-default value is passed. Top-level windows such as
 \helpref{wxFrame}{wxframe} will not allow the user to resize the frame
 below the min size.
@@ -82,11 +82,11 @@ is done, if it does have children then the size of the window is set
 to the window's best size.

 {\bf sizer.Fit(window)}: This sets the size of the window to be large
-enough to accomodate the minimum size needed by the sizer, (along with
+enough to accommodate the minimum size needed by the sizer, (along with
 a few other constraints...) If the sizer is the one that is assigned
 to the window then this should be equivalent to \texttt{window.Fit()}.

-{\bf sizer.Layout()}: Recalcualtes the minimum space needed by each
+{\bf sizer.Layout()}: Recalculates the minimum space needed by each
 item in the sizer, and then lays out the items within the space
 currently allotted to the sizer.

--- a/docs/latex/wx/window.tex
+++ b/docs/latex/wx/window.tex
@@ -722,11 +722,8 @@ See also \helpref{wxAccessible}{wxaccessible}.

 \constfunc{wxSize}{GetAdjustedBestSize}{\void}

-This method is similar to \helpref{GetBestSize}{wxwindowgetbestsize}, except
-in one thing.  GetBestSize should return the minimum untruncated size of the
-window, while this method will return the largest of BestSize and any user
-specified minimum size.  ie. it is the minimum size the window should currently
-be drawn at, not the minimal size it can possibly tolerate.
+This method is deprecated, use \helpref{GetEffectiveMinSize}{wxwindowgeteffectiveminsize}
+instead.


 \membersection{wxWindow::GetBackgroundColour}\label{wxwindowgetbackgroundcolour}
@@ -1376,6 +1373,14 @@ that size.
 \helpref{GetClientSize}{wxwindowgetclientsize}


+\membersection{wxWindow::GetWindowBorderSize}\label{wxwindowgetwindowbordersize}
+
+\constfunc{wxSize}{GetWindowBorderSize}{\void}
+
+Returns the size of the left/right and top/bottom borders of this window in x
+and y components of the result respectively.
+
+
 \membersection{wxWindow::GetWindowStyleFlag}\label{wxwindowgetwindowstyleflag}

 \constfunc{long}{GetWindowStyleFlag}{\void}
@@ -3438,7 +3443,8 @@ Identical to \helpref{SetWindowStyleFlag}{wxwindowsetwindowstyleflag}.

 Sets the style of the window. Please note that some styles cannot be changed
 after the window creation and that \helpref{Refresh()}{wxwindowrefresh} might
-be called after changing the others for the change to take place immediately.
+need to be be called after changing the others for the change to take place
+immediately.

 See \helpref{Window styles}{windowstyles} for more information about flags.

@@ -3518,6 +3524,28 @@ exactly the same number of times as \helpref{Freeze}{wxwindowfreeze}.
 \helpref{wxWindowUpdateLocker}{wxwindowupdatelocker}


+\membersection{wxWindow::ToggleWindowStyle}\label{wxwindowtogglewindowstyle}
+
+\func{bool}{ToggleWindowStyle}{\param{int }{flag}}
+
+Turns the given \arg{flag} on if it's currently turned off and vice versa.
+This function cannot be used if the value of the flag is $0$ (which is often
+the case for default flags).
+
+Also, please notice that not all styles can be changed after the control
+creation.
+
+\wxheading{Return value}
+
+Returns \true if the style was turned on by this function, \false if it was
+switched off.
+
+\wxheading{See also}
+
+\helpref{wxWindow::SetWindowStyleFlag}{wxwindowsetwindowstyleflag},\rtfsp
+\helpref{wxWindow::HasFlag}{wxwindowhasflag}
+
+
 \membersection{wxWindow::TransferDataFromWindow}\label{wxwindowtransferdatafromwindow}

 \func{virtual bool}{TransferDataFromWindow}{\void}
--- a/docs/latex/wx/wxstring.tex
+++ b/docs/latex/wx/wxstring.tex
@@ -653,11 +653,11 @@ See also: \helpref{Clear()}{wxstringclear}.

 \constfunc{int}{Find}{\param{wxChar}{ ch}, \param{bool}{ fromEnd = false}}

-Searches for the given character. Returns the starting index, or {\tt wxNOT_FOUND} if not found.
+Searches for the given character. Returns the starting index, or {\tt wxNOT\_FOUND} if not found.

 \constfunc{int}{Find}{\param{const wxChar*}{ sz}}

-Searches for the given string. Returns the starting index, or {\tt wxNOT_FOUND} if not found.
+Searches for the given string. Returns the starting index, or {\tt wxNOT\_FOUND} if not found.


 \membersection{wxString::First}\label{wxstringfirst}
--- a/docs/latex/wx/xmldocument.tex
+++ b/docs/latex/wx/xmldocument.tex
@@ -37,8 +37,12 @@ while (child) {


        // process properties of <tag1>
-        wxString propvalue1 = child->GetPropVal(wxT("prop1"), wxT("default-value"));
-        wxString propvalue2 = child->GetPropVal(wxT("prop2"), wxT("default-value"));
+        wxString propvalue1 = 
+            child->GetPropVal(wxT("prop1"), 
+                              wxT("default-value"));
+        wxString propvalue2 = 
+            child->GetPropVal(wxT("prop2"), 
+                              wxT("default-value"));

        ...

@@ -57,7 +61,9 @@ and indentation, you need to turn off whitespace-only textnode removal and autom
 \begin{verbatim}
 wxXmlDocument doc;
 doc.Load(wxT("myfile.xml"), wxT("UTF-8"), wxXMLDOC_KEEP_WHITESPACE_NODES);
-doc.Save(wxT("myfile2.xml"), wxXML_NO_INDENTATION);       // myfile2.xml will be indentic to myfile.xml
+
+// myfile2.xml will be indentic to myfile.xml saving it this way:
+doc.Save(wxT("myfile2.xml"), wxXML_NO_INDENTATION);
 \end{verbatim}

 Using default parameters, you will get a reformatted document which in general is different from
@@ -66,7 +72,7 @@ the original loaded content:
 \begin{verbatim}
 wxXmlDocument doc;
 doc.Load(wxT("myfile.xml"));
-doc.Save(wxT("myfile2.xml"));       // myfile2.xml != myfile.xml
+doc.Save(wxT("myfile2.xml"));  // myfile2.xml != myfile.xml
 \end{verbatim}


@@ -94,15 +100,15 @@ doc.Save(wxT("myfile2.xml"));       // myfile2.xml != myfile.xml

 \func{}{wxXmlDocument}{\param{const wxString\& }{filename}, \param{const wxString\& }{encoding = wxT("UTF-8")}, \param{int }{flags = wxXMLDOC\_NONE}}

-Loads the given {\it filename} using the given encoding. See \helpref{Load()}{wxxmldocumentload}.
+Loads the given {\it filename} using the given encoding. See \helpref{Load}{wxxmldocumentload}.

 \func{}{wxXmlDocument}{\param{wxInputStream\& }{stream}, \param{const wxString\& }{encoding = wxT("UTF-8")}, \param{int }{flags = wxXMLDOC\_NONE}}

-Loads the XML document from given stream using the given encoding. See \helpref{Load()}{wxxmldocumentload}.
+Loads the XML document from given stream using the given encoding. See \helpref{Load}{wxxmldocumentload}.

 \func{}{wxXmlDocument}{\param{const wxXmlDocument\& }{doc}}

-Copy constructor.
+Copy constructor. Deep copies all the XML tree of the given document.


 \membersection{wxXmlDocument::\destruct{wxXmlDocument}}\label{wxxmldocumentdtor}
@@ -129,9 +135,9 @@ Note that the caller is reponsible for deleting the returned node in order to av
 \constfunc{wxString}{GetEncoding}{\void}

 Returns encoding of in-memory representation of the document
-(same as passed to \helpref{Load()}{wxxmldocumentload} or constructor, defaults to UTF-8).
+(same as passed to \helpref{Load}{wxxmldocumentload} or constructor, defaults to UTF-8).

-NB: this is meaningless in Unicode build where data are stored as wchar\_t*.
+NB: this is meaningless in Unicode build where data are stored as {\tt wchar\_t*}.



@@ -141,7 +147,7 @@ NB: this is meaningless in Unicode build where data are stored as wchar\_t*.

 Returns encoding of document (may be empty).

-Note: this is the encoding original file was saved in, *not* the
+Note: this is the encoding original file was saved in, {\bf not} the
 encoding of in-memory representation!


@@ -227,7 +233,8 @@ Sets the enconding of the file which will be used to save the document.
 \func{void}{SetRoot}{\param{wxXmlNode* }{node}}

 Sets the root node of this document. Deletes previous root node.
-Use \helpref{DetachRoot}{wxxmldocumentdetachroot} and then SetRoot if you want
+Use \helpref{DetachRoot}{wxxmldocumentdetachroot} and then 
+\helpref{SetRoot}{wxxmldocumentsetroot} if you want
 to replace the root node without deleting the old document tree.


@@ -242,5 +249,5 @@ Sets the version of the XML file which will be used to save the document.

 \func{wxXmlDocument\& operator}{operator=}{\param{const wxXmlDocument\& }{doc}}

-Copies the given document.
+Deep copies the given document.

--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -274,7 +274,11 @@ Borland C++ compilation

 The minimum version required is 5.5 (last version supported by BC++ 5.0 was
 2.4.2), which can be downloaded for free from:
-http://www.borland.com/products/downloads/download_cbuilder.html#
+http://www.borland.com/products/downloads/download_cbuilder.html
+
+The version 5.6 included in Borland C++ Builder 2006 works as well after the
+following small change: please remove the test for __WINDOWS__ from line 88
+of the file BCCDIR\include\stl\_threads.h.

 Compiling using the makefiles:

--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -30,97 +30,103 @@
        #endif

        #ifdef _DEBUG
-            #if wxUSE_XML
-                #pragma comment(lib,"wxexpatd")
-            #endif
-            #if wxUSE_LIBJPEG
-                #pragma comment(lib,"wxjpegd")
-            #endif
-            #if wxUSE_LIBPNG
-                #pragma comment(lib,"wxpngd")
-            #endif
-            #if wxUSE_REGEX
-                #pragma comment(lib,"wxregexud")
-            #endif
-            #if wxUSE_LIBTIFF
-                #pragma comment(lib,"wxtiffd")
-            #endif
-            #if wxUSE_ZLIB
-                #pragma comment(lib,"wxzlibd")
-            #endif
            #pragma comment(lib,"wxbase28ud")
            #pragma comment(lib,"wxbase28ud_net")
            #pragma comment(lib,"wxbase28ud_xml")
-            #pragma comment(lib,"wxmsw28ud_adv")
-            #pragma comment(lib,"wxmsw28ud_core")
-            #pragma comment(lib,"wxmsw28ud_html")
-            #if wxUSE_GLCANVAS
-                #pragma comment(lib,"wxmsw28ud_gl")
-            #endif
-            #if wxUSE_DEBUGREPORT
-                #pragma comment(lib,"wxmsw28ud_qa")
-            #endif
-            #if wxUSE_XRC
-                #pragma comment(lib,"wxmsw28ud_xrc")
-            #endif
-            #if wxUSE_AUI
-                #pragma comment(lib,"wxmsw28ud_aui")
-            #endif
-            #if wxUSE_RICHTEXT
-                #pragma comment(lib,"wxmsw28ud_richtext")
-            #endif
-            #if wxUSE_MEDIACTRL
-                #pragma comment(lib,"wxmsw28ud_media")
-            #endif
-            #if wxUSE_ODBC
-                #pragma comment(lib,"wxbase28ud_odbc")
-            #endif
-        #else // release
-            #if wxUSE_XML
-                #pragma comment(lib,"wxexpat")
-            #endif
-            #if wxUSE_LIBJPEG
-                #pragma comment(lib,"wxjpeg")
-            #endif
-            #if wxUSE_LIBPNG
-                #pragma comment(lib,"wxpng")
-            #endif
            #if wxUSE_REGEX
-                #pragma comment(lib,"wxregexu")
-            #endif
-            #if wxUSE_LIBTIFF
-                #pragma comment(lib,"wxtiff")
-            #endif
-            #if wxUSE_ZLIB
-                #pragma comment(lib,"wxzlib")
+                #pragma comment(lib,"wxregexud")
            #endif
+
+            #if wxUSE_GUI
+                #if wxUSE_XML
+                    #pragma comment(lib,"wxexpatd")
+                #endif
+                #if wxUSE_LIBJPEG
+                    #pragma comment(lib,"wxjpegd")
+                #endif
+                #if wxUSE_LIBPNG
+                    #pragma comment(lib,"wxpngd")
+                #endif
+                #if wxUSE_LIBTIFF
+                    #pragma comment(lib,"wxtiffd")
+                #endif
+                #if wxUSE_ZLIB
+                    #pragma comment(lib,"wxzlibd")
+                #endif
+                #pragma comment(lib,"wxmsw28ud_adv")
+                #pragma comment(lib,"wxmsw28ud_core")
+                #pragma comment(lib,"wxmsw28ud_html")
+                #if wxUSE_GLCANVAS
+                    #pragma comment(lib,"wxmsw28ud_gl")
+                #endif
+                #if wxUSE_DEBUGREPORT
+                    #pragma comment(lib,"wxmsw28ud_qa")
+                #endif
+                #if wxUSE_XRC
+                    #pragma comment(lib,"wxmsw28ud_xrc")
+                #endif
+                #if wxUSE_AUI
+                    #pragma comment(lib,"wxmsw28ud_aui")
+                #endif
+                #if wxUSE_RICHTEXT
+                    #pragma comment(lib,"wxmsw28ud_richtext")
+                #endif
+                #if wxUSE_MEDIACTRL
+                    #pragma comment(lib,"wxmsw28ud_media")
+                #endif
+                #if wxUSE_ODBC
+                    #pragma comment(lib,"wxbase28ud_odbc")
+                #endif
+            #endif // wxUSE_GUI
+        #else // release
            #pragma comment(lib,"wxbase28u")
            #pragma comment(lib,"wxbase28u_net")
            #pragma comment(lib,"wxbase28u_xml")
-            #pragma comment(lib,"wxmsw28u_adv")
-            #pragma comment(lib,"wxmsw28u_core")
-            #pragma comment(lib,"wxmsw28u_html")
-            #if wxUSE_GLCANVAS
-                #pragma comment(lib,"wxmsw28u_gl")
-            #endif
-            #if wxUSE_DEBUGREPORT
-                #pragma comment(lib,"wxmsw28u_qa")
-            #endif
-            #if wxUSE_XRC
-                #pragma comment(lib,"wxmsw28u_xrc")
-            #endif
-            #if wxUSE_AUI
-                #pragma comment(lib,"wxmsw28u_aui")
-            #endif
-            #if wxUSE_RICHTEXT
-                #pragma comment(lib,"wxmsw28u_richtext")
-            #endif
-            #if wxUSE_MEDIACTRL
-                #pragma comment(lib,"wxmsw28u_media")
-            #endif
-            #if wxUSE_ODBC
-                #pragma comment(lib,"wxbase28u_odbc")
+            #if wxUSE_REGEX
+                #pragma comment(lib,"wxregexu")
            #endif
+
+            #if wxUSE_GUI
+                #if wxUSE_XML
+                    #pragma comment(lib,"wxexpat")
+                #endif
+                #if wxUSE_LIBJPEG
+                    #pragma comment(lib,"wxjpeg")
+                #endif
+                #if wxUSE_LIBPNG
+                    #pragma comment(lib,"wxpng")
+                #endif
+                #if wxUSE_LIBTIFF
+                    #pragma comment(lib,"wxtiff")
+                #endif
+                #if wxUSE_ZLIB
+                    #pragma comment(lib,"wxzlib")
+                #endif
+                #pragma comment(lib,"wxmsw28u_adv")
+                #pragma comment(lib,"wxmsw28u_core")
+                #pragma comment(lib,"wxmsw28u_html")
+                #if wxUSE_GLCANVAS
+                    #pragma comment(lib,"wxmsw28u_gl")
+                #endif
+                #if wxUSE_DEBUGREPORT
+                    #pragma comment(lib,"wxmsw28u_qa")
+                #endif
+                #if wxUSE_XRC
+                    #pragma comment(lib,"wxmsw28u_xrc")
+                #endif
+                #if wxUSE_AUI
+                    #pragma comment(lib,"wxmsw28u_aui")
+                #endif
+                #if wxUSE_RICHTEXT
+                    #pragma comment(lib,"wxmsw28u_richtext")
+                #endif
+                #if wxUSE_MEDIACTRL
+                    #pragma comment(lib,"wxmsw28u_media")
+                #endif
+                #if wxUSE_ODBC
+                    #pragma comment(lib,"wxbase28u_odbc")
+                #endif
+            #endif // wxUSE_GUI
        #endif // debug/release
    #else // !_UNICODE
        #ifdef WXUSINGDLL
@@ -138,97 +144,103 @@
        #endif // shared/static

        #ifdef _DEBUG
-            #if wxUSE_XML
-                #pragma comment(lib,"wxexpatd")
-            #endif
-            #if wxUSE_LIBJPEG
-                #pragma comment(lib,"wxjpegd")
-            #endif
-            #if wxUSE_LIBPNG
-                #pragma comment(lib,"wxpngd")
-            #endif
-            #if wxUSE_REGEX
-                #pragma comment(lib,"wxregexd")
-            #endif
-            #if wxUSE_LIBTIFF
-                #pragma comment(lib,"wxtiffd")
-            #endif
-            #if wxUSE_ZLIB
-                #pragma comment(lib,"wxzlibd")
-            #endif
            #pragma comment(lib,"wxbase28d")
            #pragma comment(lib,"wxbase28d_net")
            #pragma comment(lib,"wxbase28d_xml")
-            #pragma comment(lib,"wxmsw28d_adv")
-            #pragma comment(lib,"wxmsw28d_core")
-            #pragma comment(lib,"wxmsw28d_html")
-            #if wxUSE_GLCANVAS
-                #pragma comment(lib,"wxmsw28d_gl")
-            #endif
-            #if wxUSE_DEBUGREPORT
-                #pragma comment(lib,"wxmsw28d_qa")
-            #endif
-            #if wxUSE_XRC
-                #pragma comment(lib,"wxmsw28d_xrc")
-            #endif
-            #if wxUSE_AUI
-                #pragma comment(lib,"wxmsw28d_aui")
-            #endif
-            #if wxUSE_RICHTEXT
-                #pragma comment(lib,"wxmsw28d_richtext")
-            #endif
-            #if wxUSE_MEDIACTRL
-                #pragma comment(lib,"wxmsw28d_media")
-            #endif
-            #if wxUSE_ODBC
-                #pragma comment(lib,"wxbase28d_odbc")
-            #endif
-        #else // release
-            #if wxUSE_XML
-                #pragma comment(lib,"wxexpat")
-            #endif
-            #if wxUSE_LIBJPEG
-                #pragma comment(lib,"wxjpeg")
-            #endif
-            #if wxUSE_LIBPNG
-                #pragma comment(lib,"wxpng")
-            #endif
            #if wxUSE_REGEX
-                #pragma comment(lib,"wxregex")
-            #endif
-            #if wxUSE_LIBTIFF
-                #pragma comment(lib,"wxtiff")
-            #endif
-            #if wxUSE_ZLIB
-                #pragma comment(lib,"wxzlib")
+                #pragma comment(lib,"wxregexd")
            #endif
+
+            #if wxUSE_GUI
+                #if wxUSE_XML
+                    #pragma comment(lib,"wxexpatd")
+                #endif
+                #if wxUSE_LIBJPEG
+                    #pragma comment(lib,"wxjpegd")
+                #endif
+                #if wxUSE_LIBPNG
+                    #pragma comment(lib,"wxpngd")
+                #endif
+                #if wxUSE_LIBTIFF
+                    #pragma comment(lib,"wxtiffd")
+                #endif
+                #if wxUSE_ZLIB
+                    #pragma comment(lib,"wxzlibd")
+                #endif
+                #pragma comment(lib,"wxmsw28d_adv")
+                #pragma comment(lib,"wxmsw28d_core")
+                #pragma comment(lib,"wxmsw28d_html")
+                #if wxUSE_GLCANVAS
+                    #pragma comment(lib,"wxmsw28d_gl")
+                #endif
+                #if wxUSE_DEBUGREPORT
+                    #pragma comment(lib,"wxmsw28d_qa")
+                #endif
+                #if wxUSE_XRC
+                    #pragma comment(lib,"wxmsw28d_xrc")
+                #endif
+                #if wxUSE_AUI
+                    #pragma comment(lib,"wxmsw28d_aui")
+                #endif
+                #if wxUSE_RICHTEXT
+                    #pragma comment(lib,"wxmsw28d_richtext")
+                #endif
+                #if wxUSE_MEDIACTRL
+                    #pragma comment(lib,"wxmsw28d_media")
+                #endif
+                #if wxUSE_ODBC
+                    #pragma comment(lib,"wxbase28d_odbc")
+                #endif
+            #endif // wxUSE_GUI
+        #else // release
            #pragma comment(lib,"wxbase28")
            #pragma comment(lib,"wxbase28_net")
            #pragma comment(lib,"wxbase28_xml")
-            #pragma comment(lib,"wxmsw28_adv")
-            #pragma comment(lib,"wxmsw28_core")
-            #pragma comment(lib,"wxmsw28_html")
-            #if wxUSE_GLCANVAS
-                #pragma comment(lib,"wxmsw28_gl")
-            #endif
-            #if wxUSE_DEBUGREPORT
-                #pragma comment(lib,"wxmsw28_qa")
-            #endif
-            #if wxUSE_XRC
-                #pragma comment(lib,"wxmsw28_xrc")
-            #endif
-            #if wxUSE_AUI
-                #pragma comment(lib,"wxmsw28_aui")
-            #endif
-            #if wxUSE_RICHTEXT
-                #pragma comment(lib,"wxmsw28_richtext")
-            #endif
-            #if wxUSE_MEDIACTRL
-                #pragma comment(lib,"wxmsw28_media")
-            #endif
-            #if wxUSE_ODBC
-                #pragma comment(lib,"wxbase28_odbc")
+            #if wxUSE_REGEX
+                #pragma comment(lib,"wxregex")
            #endif
+
+            #if wxUSE_GUI
+                #if wxUSE_XML
+                    #pragma comment(lib,"wxexpat")
+                #endif
+                #if wxUSE_LIBJPEG
+                    #pragma comment(lib,"wxjpeg")
+                #endif
+                #if wxUSE_LIBPNG
+                    #pragma comment(lib,"wxpng")
+                #endif
+                #if wxUSE_LIBTIFF
+                    #pragma comment(lib,"wxtiff")
+                #endif
+                #if wxUSE_ZLIB
+                    #pragma comment(lib,"wxzlib")
+                #endif
+                #pragma comment(lib,"wxmsw28_adv")
+                #pragma comment(lib,"wxmsw28_core")
+                #pragma comment(lib,"wxmsw28_html")
+                #if wxUSE_GLCANVAS
+                    #pragma comment(lib,"wxmsw28_gl")
+                #endif
+                #if wxUSE_DEBUGREPORT
+                    #pragma comment(lib,"wxmsw28_qa")
+                #endif
+                #if wxUSE_XRC
+                    #pragma comment(lib,"wxmsw28_xrc")
+                #endif
+                #if wxUSE_AUI
+                    #pragma comment(lib,"wxmsw28_aui")
+                #endif
+                #if wxUSE_RICHTEXT
+                    #pragma comment(lib,"wxmsw28_richtext")
+                #endif
+                #if wxUSE_MEDIACTRL
+                    #pragma comment(lib,"wxmsw28_media")
+                #endif
+                #if wxUSE_ODBC
+                    #pragma comment(lib,"wxbase28_odbc")
+                #endif
+            #endif // wxUSE_GUI
        #endif // debug/release
    #endif // _UNICODE/!_UNICODE
 #else
--- a/include/wx/animate.h
+++ b/include/wx/animate.h
@@ -82,13 +82,26 @@ public:     // public API

    virtual bool IsPlaying() const = 0;

-    virtual void SetInactiveBitmap(const wxBitmap &bmp) = 0;
+    virtual void SetInactiveBitmap(const wxBitmap &bmp);
+
+    // always return the original bitmap set in this control
    wxBitmap GetInactiveBitmap() const
        { return m_bmpStatic; }

 protected:
+    // the inactive bitmap as it was set by the user
    wxBitmap m_bmpStatic;

+    // the inactive bitmap currently shown in the control
+    // (may differ in the size from m_bmpStatic)
+    wxBitmap m_bmpStaticReal;
+
+    // updates m_bmpStaticReal from m_bmpStatic if needed
+    virtual void UpdateStaticImage();
+
+    // called by SetInactiveBitmap
+    virtual void DisplayStaticImage() = 0;
+
 private:
    DECLARE_ABSTRACT_CLASS(wxAnimationCtrlBase)
 };
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -463,7 +463,8 @@ public:
    virtual bool SetDisplayMode(const wxVideoMode& WXUNUSED(info)) { return true; }

        // set use of best visual flag (see below)
-    void SetUseBestVisual( bool flag ) { m_useBestVisual = flag; }
+    void SetUseBestVisual( bool flag, bool forceTrueColour = false ) 
+        { m_useBestVisual = flag; m_forceTrueColour = forceTrueColour; }
    bool GetUseBestVisual() const { return m_useBestVisual; }

        // set/get printing mode: see wxPRINT_XXX constants.
@@ -534,6 +535,8 @@ protected:
    // true if the app wants to use the best visual on systems where
    // more than one are available (Sun, SGI, XFree86 4.0 ?)
    bool m_useBestVisual;
+    // force TrueColour just in case "best" isn't TrueColour
+    bool m_forceTrueColour;

    // does any of our windows have focus?
    bool m_isActive;
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -118,10 +118,16 @@ public:

    // return true if the port is using wxUniversal for the GUI, false if not
    virtual bool IsUsingUniversalWidgets() const = 0;
-    
-    // return the name of the Desktop Environment such as 
+
+    // return the name of the Desktop Environment such as
    // "KDE" or "GNOME". May return an empty string.
    virtual wxString GetDesktopEnvironment() const { return wxEmptyString; }
+
+protected:
+#if wxUSE_STACKWALKER && defined( __WXDEBUG__ )
+    // utility function: returns the stack frame as a plain wxString
+    virtual wxString GetAssertStackTrace();
+#endif
 };

 // ----------------------------------------------------------------------------
--- a/include/wx/archive.h
+++ b/include/wx/archive.h
@@ -342,7 +342,8 @@ public:
        wxPathFormat format = wxPATH_NATIVE) const = 0;

    void SetConv(wxMBConv& conv) { m_pConv = &conv; }
-    wxMBConv& GetConv() const { return *m_pConv; }
+    wxMBConv& GetConv() const
+        { if (m_pConv) return *m_pConv; else return wxConvLocal; }

    static const wxArchiveClassFactory *Find(const wxChar *protocol,
                                             wxStreamProtocolType type
@@ -363,7 +364,7 @@ protected:
    virtual wxArchiveInputStream  *DoNewStream(wxInputStream *stream) const = 0;
    virtual wxArchiveOutputStream *DoNewStream(wxOutputStream *stream) const = 0;

-    wxArchiveClassFactory() : m_pConv(&wxConvLocal), m_next(this) { }
+    wxArchiveClassFactory() : m_pConv(NULL), m_next(this) { }
    wxArchiveClassFactory& operator=(const wxArchiveClassFactory& WXUNUSED(f))
        { return *this; }

--- a/include/wx/aui/auibook.h
+++ b/include/wx/aui/auibook.h
@@ -156,10 +156,8 @@ public:

    virtual void DrawTab(wxDC& dc,
                         wxWindow* wnd,
+                         const wxAuiNotebookPage& pane,
                         const wxRect& in_rect,
-                         const wxString& caption,
-                         const wxBitmap& bitmap,
-                         bool active,
                         int close_button_state,
                         wxRect* out_tab_rect,
                         wxRect* out_button_rect,
@@ -172,11 +170,8 @@ public:
                         int bitmap_id,
                         int button_state,
                         int orientation,
-                         const wxBitmap& bitmap_override,
                         wxRect* out_rect) = 0;
-               
-    virtual int GetIndentSize() = 0;
-  
+    
    virtual wxSize GetTabSize(
                         wxDC& dc,
                         wxWindow* wnd,
@@ -186,14 +181,17 @@ public:
                         int close_button_state,
                         int* x_extent) = 0;
                         
-    virtual int ShowWindowList(
+    virtual int ShowDropDown(
                         wxWindow* wnd,
-                         const wxArrayString& items,
+                         const wxAuiNotebookPageArray& items,
                         int active_idx) = 0;
+                         
+    virtual int GetIndentSize() = 0;
    
-    virtual int GetBestTabCtrlSize(wxWindow* wnd,
-                                   wxAuiNotebookPageArray& pages,
-                                   const wxSize& required_bmp_size) = 0;    
+    virtual int GetBestTabCtrlSize(
+                         wxWindow* wnd,
+                         const wxAuiNotebookPageArray& pages,
+                         const wxSize& required_bmp_size) = 0;    
 };


@@ -221,10 +219,8 @@ public:
                     
    void DrawTab(wxDC& dc,
                 wxWindow* wnd,
+                 const wxAuiNotebookPage& pane,
                 const wxRect& in_rect,
-                 const wxString& caption,
-                 const wxBitmap& bitmap,
-                 bool active,
                 int close_button_state,
                 wxRect* out_tab_rect,
                 wxRect* out_button_rect,
@@ -237,7 +233,6 @@ public:
                 int bitmap_id,
                 int button_state,
                 int orientation,
-                 const wxBitmap& bitmap_override,
                 wxRect* out_rect);
    
    int GetIndentSize();
@@ -251,13 +246,13 @@ public:
                 int close_button_state,
                 int* x_extent);
                  
-    int ShowWindowList(
+    int ShowDropDown(
                 wxWindow* wnd,
-                 const wxArrayString& items,
+                 const wxAuiNotebookPageArray& items,
                 int active_idx);

    int GetBestTabCtrlSize(wxWindow* wnd,
-                 wxAuiNotebookPageArray& pages,
+                 const wxAuiNotebookPageArray& pages,
                 const wxSize& required_bmp_size);  

 protected:
@@ -309,10 +304,8 @@ public:
                                          
    void DrawTab(wxDC& dc,
                 wxWindow* wnd,
+                 const wxAuiNotebookPage& pane,
                 const wxRect& in_rect,
-                 const wxString& caption,
-                 const wxBitmap& bitmap,
-                 bool active,
                 int close_button_state,
                 wxRect* out_tab_rect,
                 wxRect* out_button_rect,
@@ -325,7 +318,6 @@ public:
                 int bitmap_id,
                 int button_state,
                 int orientation,
-                 const wxBitmap& bitmap_override,
                 wxRect* out_rect);
             
    int GetIndentSize();
@@ -339,13 +331,13 @@ public:
                 int close_button_state,
                 int* x_extent);
                  
-    int ShowWindowList(
+    int ShowDropDown(
                 wxWindow* wnd,
-                 const wxArrayString& items,
+                 const wxAuiNotebookPageArray& items,
                 int active_idx);

    int GetBestTabCtrlSize(wxWindow* wnd,
-                 wxAuiNotebookPageArray& pages,
+                 const wxAuiNotebookPageArray& pages,
                 const wxSize& required_bmp_size);  

 protected:
@@ -406,6 +398,7 @@ public:
    int GetIdxFromWindow(wxWindow* page) const;
    size_t GetPageCount() const;
    wxAuiNotebookPage& GetPage(size_t idx);
+    const wxAuiNotebookPage& GetPage(size_t idx) const;
    wxAuiNotebookPageArray& GetPages();
    void SetNormalFont(const wxFont& normal_font);
    void SetSelectedFont(const wxFont& selected_font);
@@ -501,7 +494,14 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0);
-
+                
+    void SetWindowStyleFlag(long style);
+    void SetArtProvider(wxAuiTabArt* art);
+    wxAuiTabArt* GetArtProvider() const;
+    
+    virtual void SetUniformBitmapSize(const wxSize& size);
+    virtual void SetTabCtrlHeight(int height);
+ 
    bool AddPage(wxWindow* page,
                 const wxString& caption,
                 bool select = false,
@@ -516,23 +516,21 @@ public:
    bool DeletePage(size_t page);
    bool RemovePage(size_t page);
    
-    void SetWindowStyleFlag(long style);
-
-    bool SetPageText(size_t page, const wxString& text);
-    bool SetPageBitmap(size_t page, const wxBitmap& bitmap);
-    size_t SetSelection(size_t new_page);
-    int GetSelection() const;
    size_t GetPageCount() const;
    wxWindow* GetPage(size_t page_idx) const;
-
    int GetPageIndex(wxWindow* page_wnd) const;

-    void SetArtProvider(wxAuiTabArt* art);
-    wxAuiTabArt* GetArtProvider() const;
-    
-    virtual void SetUniformBitmapSize(const wxSize& size);
-    virtual void SetTabCtrlHeight(int height);
-    
+    bool SetPageText(size_t page, const wxString& text);
+    wxString GetPageText(size_t page_idx) const;
+
+    bool SetPageBitmap(size_t page, const wxBitmap& bitmap);
+    wxBitmap GetPageBitmap(size_t page_idx) const;
+
+    size_t SetSelection(size_t new_page);
+    int GetSelection() const;
+
+    virtual void Split(size_t page, int direction);
+   
 protected:

    // these can be overridden
@@ -555,7 +553,6 @@ protected:

    void OnChildFocus(wxChildFocusEvent& evt);
    void OnRender(wxAuiManagerEvent& evt);
-    void OnEraseBackground(wxEraseEvent& evt);
    void OnSize(wxSizeEvent& evt);
    void OnTabClicked(wxCommandEvent& evt);
    void OnTabBeginDrag(wxCommandEvent& evt);
--- a/include/wx/aui/floatpane.h
+++ b/include/wx/aui/floatpane.h
@@ -42,6 +42,7 @@ public:
                   );
    virtual ~wxAuiFloatingFrame();
    void SetPaneWindow(const wxAuiPaneInfo& pane);
+    wxAuiManager* GetOwnerManager() const;
    
 protected:
    virtual void OnMoveStart();
@@ -55,6 +56,7 @@ private:
    void OnIdle(wxIdleEvent& event);
    void OnActivate(wxActivateEvent& event);
    static bool isMouseDown();
+    
 private:
    wxWindow* m_pane_window;    // pane window being managed
    bool m_solid_drag;          // true if system uses solid window drag
@@ -70,7 +72,7 @@ private:

 #ifndef SWIG
    DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxAuiFloatingFrameBaseClass)
+    DECLARE_CLASS(wxAuiFloatingFrame)
 #endif // SWIG
 };

--- a/include/wx/aui/framemanager.h
+++ b/include/wx/aui/framemanager.h
@@ -57,23 +57,23 @@ enum wxAuiManagerOption

 enum wxAuiPaneDockArtSetting
 {
-    wxAUI_ART_SASH_SIZE = 0,
-    wxAUI_ART_CAPTION_SIZE = 1,
-    wxAUI_ART_GRIPPER_SIZE = 2,
-    wxAUI_ART_PANE_BORDER_SIZE = 3,
-    wxAUI_ART_PANE_BUTTON_SIZE = 4,
-    wxAUI_ART_BACKGROUND_COLOUR = 5,
-    wxAUI_ART_SASH_COLOUR = 6,
-    wxAUI_ART_ACTIVE_CAPTION_COLOUR = 7,
-    wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR = 8,
-    wxAUI_ART_INACTIVE_CAPTION_COLOUR = 9,
-    wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR = 10,
-    wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR = 11,
-    wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR = 12,
-    wxAUI_ART_BORDER_COLOUR = 13,
-    wxAUI_ART_GRIPPER_COLOUR = 14,
-    wxAUI_ART_CAPTION_FONT = 15,
-    wxAUI_ART_GRADIENT_TYPE = 16
+    wxAUI_DOCKART_SASH_SIZE = 0,
+    wxAUI_DOCKART_CAPTION_SIZE = 1,
+    wxAUI_DOCKART_GRIPPER_SIZE = 2,
+    wxAUI_DOCKART_PANE_BORDER_SIZE = 3,
+    wxAUI_DOCKART_PANE_BUTTON_SIZE = 4,
+    wxAUI_DOCKART_BACKGROUND_COLOUR = 5,
+    wxAUI_DOCKART_SASH_COLOUR = 6,
+    wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR = 7,
+    wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR = 8,
+    wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR = 9,
+    wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR = 10,
+    wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR = 11,
+    wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR = 12,
+    wxAUI_DOCKART_BORDER_COLOUR = 13,
+    wxAUI_DOCKART_GRIPPER_COLOUR = 14,
+    wxAUI_DOCKART_CAPTION_FONT = 15,
+    wxAUI_DOCKART_GRADIENT_TYPE = 16
 };

 enum wxAuiPaneDockArtGradients
@@ -89,7 +89,8 @@ enum wxAuiPaneButtonState
    wxAUI_BUTTON_STATE_HOVER    = 1 << 1,
    wxAUI_BUTTON_STATE_PRESSED  = 1 << 2,
    wxAUI_BUTTON_STATE_DISABLED = 1 << 3,
-    wxAUI_BUTTON_STATE_HIDDEN   = 1 << 4
+    wxAUI_BUTTON_STATE_HIDDEN   = 1 << 4,
+    wxAUI_BUTTON_STATE_CHECKED  = 1 << 5
 };

 enum wxAuiButtonId
@@ -298,9 +299,6 @@ public:
    wxAuiPaneInfo& Floatable(bool b = true) { return SetFlag(optionFloatable, b); }
    wxAuiPaneInfo& Movable(bool b = true) { return SetFlag(optionMovable, b); }

-    wxAuiPaneInfo& SaveHidden() { return SetFlag(optionSavedHidden, HasFlag(optionHidden)); }
-    wxAuiPaneInfo& RestoreHidden() { return SetFlag(optionHidden, HasFlag(optionSavedHidden)); }
-
    wxAuiPaneInfo& Dockable(bool b = true)
    {
        return TopDockable(b).BottomDockable(b).LeftDockable(b).RightDockable(b);
@@ -352,6 +350,12 @@ public:
    
 public:

+    // NOTE: You can add and subtract flags from this list,
+    // but do not change the values of the flags, because
+    // they are stored in a binary integer format in the 
+    // perspective string.  If you really need to change the
+    // values around, you'll have to ensure backwards-compatibility
+    // in the perspective loading code.
    enum wxAuiPaneState
    {
        optionFloating        = 1 << 0,
@@ -371,15 +375,17 @@ public:
        optionActive          = 1 << 14,
        optionGripperTop      = 1 << 15,
        optionMaximized       = 1 << 16,
-        optionSavedHidden     = 1 << 17,

-        buttonClose           = 1 << 24,
-        buttonMaximize        = 1 << 25,
-        buttonMinimize        = 1 << 26,
-        buttonPin             = 1 << 27,
-        buttonCustom1         = 1 << 28,
-        buttonCustom2         = 1 << 29,
-        buttonCustom3         = 1 << 30,
+        buttonClose           = 1 << 21,
+        buttonMaximize        = 1 << 22,
+        buttonMinimize        = 1 << 23,
+        buttonPin             = 1 << 24,
+        
+        buttonCustom1         = 1 << 26,
+        buttonCustom2         = 1 << 27,
+        buttonCustom3         = 1 << 28,
+        
+        savedHiddenState      = 1 << 30, // used internally
        actionPane            = 1 << 31  // used internally
    };

@@ -430,6 +436,8 @@ public:
    void SetManagedWindow(wxWindow* managed_wnd);
    wxWindow* GetManagedWindow() const;

+    static wxAuiManager* GetManager(wxWindow* window);
+
 #ifdef SWIG
    %disownarg( wxAuiDockArt* art_provider );
 #endif
@@ -457,32 +465,38 @@ public:

    bool DetachPane(wxWindow* window);
    
+    void Update();
+
+    wxString SavePaneInfo(wxAuiPaneInfo& pane);
+    void LoadPaneInfo(wxString pane_part, wxAuiPaneInfo &pane);
+    wxString SavePerspective();
+    bool LoadPerspective(const wxString& perspective, bool update = true);
+
+    void SetDockSizeConstraint(double width_pct, double height_pct);
+    void GetDockSizeConstraint(double* width_pct, double* height_pct) const;
+    
    void ClosePane(wxAuiPaneInfo& pane_info);
    void MaximizePane(wxAuiPaneInfo& pane_info);
    void RestorePane(wxAuiPaneInfo& pane_info);
    void RestoreMaximizedPane();

-    wxString SavePaneInfo(wxAuiPaneInfo& pane);
-    void LoadPaneInfo(wxString pane_part, wxAuiPaneInfo &pane);
-
-    wxString SavePerspective();
-
-    bool LoadPerspective(const wxString& perspective,
-                 bool update = true);
-
-    void Update();
-
-
 public:
+
    virtual wxAuiFloatingFrame* CreateFloatingFrame(wxWindow* parent, const wxAuiPaneInfo& p);

-    wxRect CalculateHintRect(wxWindow* pane_window,
-                             const wxPoint& pt,
-                             const wxPoint& offset);
+    void StartPaneDrag(
+                 wxWindow* pane_window,
+                 const wxPoint& offset);
+
+    wxRect CalculateHintRect(
+                 wxWindow* pane_window,
+                 const wxPoint& pt,
+                 const wxPoint& offset);
                      
-    void DrawHintRect(wxWindow* pane_window,
-                      const wxPoint& pt,
-                      const wxPoint& offset);
+    void DrawHintRect(
+                 wxWindow* pane_window,
+                 const wxPoint& pt,
+                 const wxPoint& offset);
                      
    virtual void ShowHint(const wxRect& rect);
    virtual void HideHint();
@@ -526,8 +540,6 @@ protected:
                const wxPoint& pt,
                const wxPoint& action_offset = wxPoint(0,0));

-    wxAuiPaneInfo& LookupPane(wxWindow* window);
-    wxAuiPaneInfo& LookupPane(const wxString& name);
    wxAuiDockUIPart* HitTest(int x, int y);
    wxAuiDockUIPart* GetPanePart(wxWindow* pane);
    int GetDockPixelOffset(wxAuiPaneInfo& test);
@@ -566,6 +578,7 @@ protected:
    void OnLeaveWindow(wxMouseEvent& evt);
    void OnChildFocus(wxChildFocusEvent& evt);
    void OnHintFadeTimer(wxTimerEvent& evt);
+    void OnFindManager(wxAuiManagerEvent& evt);

 protected:

@@ -595,20 +608,26 @@ protected:
    wxAuiDockUIPart* m_action_part; // ptr to the part the action happened to
    wxWindow* m_action_window;   // action frame or window (NULL if none)
    wxRect m_action_hintrect;    // hint rectangle for the action
-    bool m_skipping;
-    bool m_has_maximized;
    wxRect m_last_rect;
    wxAuiDockUIPart* m_hover_button;// button uipart being hovered over
    wxRect m_last_hint;          // last hint rectangle
    wxPoint m_last_mouse_move;   // last mouse move position (see OnMotion)
+    bool m_skipping;
+    bool m_has_maximized;
+
+    double m_dock_constraint_x;  // 0.0 .. 1.0; max pct of window width a dock can consume
+    double m_dock_constraint_y;  // 0.0 .. 1.0; max pct of window height a dock can consume

    wxFrame* m_hint_wnd;         // transparent hint window, if supported by platform
    wxTimer m_hint_fadetimer;    // transparent fade timer
    wxByte m_hint_fadeamt;       // transparent fade amount
    wxByte m_hint_fademax;       // maximum value of hint fade
+    
+    void* m_reserved;

 #ifndef SWIG
    DECLARE_EVENT_TABLE()
+    DECLARE_CLASS(wxAuiManager)
 #endif // SWIG
 };

@@ -621,6 +640,7 @@ class WXDLLIMPEXP_AUI wxAuiManagerEvent : public wxEvent
 public:
    wxAuiManagerEvent(wxEventType type=wxEVT_NULL) : wxEvent(0, type)
    {
+        manager = NULL;
        pane = NULL;
        button = 0;
        veto_flag = false;
@@ -630,6 +650,7 @@ public:
 #ifndef SWIG
    wxAuiManagerEvent(const wxAuiManagerEvent& c) : wxEvent(c)
    {
+        manager = c.manager;
        pane = c.pane;
        button = c.button;
        veto_flag = c.veto_flag;
@@ -639,13 +660,15 @@ public:
 #endif
    wxEvent *Clone() const { return new wxAuiManagerEvent(*this); }

+    void SetManager(wxAuiManager* mgr) { manager = mgr; }
    void SetPane(wxAuiPaneInfo* p) { pane = p; }
    void SetButton(int b) { button = b; }
    void SetDC(wxDC* pdc) { dc = pdc; }
 
-    wxAuiPaneInfo* GetPane() { return pane; }
-    int GetButton() { return button; }
-    wxDC* GetDC() { return dc; }
+    wxAuiManager* GetManager() const { return manager; }
+    wxAuiPaneInfo* GetPane() const { return pane; }
+    int GetButton() const { return button; }
+    wxDC* GetDC() const { return dc; }
    
    void Veto(bool veto = true) { veto_flag = veto; }
    bool GetVeto() const { return veto_flag; }
@@ -653,6 +676,7 @@ public:
    bool CanVeto() const { return  canveto_flag && veto_flag; }
    
 public:
+    wxAuiManager* manager;
    wxAuiPaneInfo* pane;
    int button;
    bool veto_flag;
@@ -679,6 +703,7 @@ public:
        resizable = true;
        fixed = false;
        toolbar = false;
+        reserved1 = false;
    }

 #ifndef SWIG
@@ -694,6 +719,7 @@ public:
        toolbar = c.toolbar;
        panes = c.panes;
        rect = c.rect;
+        reserved1 = c.reserved1;
    }

    wxAuiDockInfo& operator=(const wxAuiDockInfo& c)
@@ -708,6 +734,7 @@ public:
        toolbar = c.toolbar;
        panes = c.panes;
        rect = c.rect;
+        reserved1 = c.reserved1;
        return *this;
    }
 #endif // SWIG
@@ -730,6 +757,7 @@ public:
    bool toolbar;             // flag indicating dock contains only toolbars
    bool fixed;               // flag indicating that the dock operates on
                              // absolute coordinates as opposed to proportional
+    bool reserved1;
 };


@@ -772,11 +800,12 @@ public:
 // wx event machinery

 BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANEBUTTON, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANECLOSE, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANEMAXIMIZE, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANERESTORE, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_BUTTON, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_CLOSE, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_MAXIMIZE, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_RESTORE, 0)
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_RENDER, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_FIND_MANAGER, 0)
 END_DECLARE_EVENT_TYPES()

 typedef void (wxEvtHandler::*wxAuiManagerEventFunction)(wxAuiManagerEvent&);
@@ -784,31 +813,35 @@ typedef void (wxEvtHandler::*wxAuiManagerEventFunction)(wxAuiManagerEvent&);
 #define wxAuiManagerEventHandler(func) \
    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxAuiManagerEventFunction, &func)

-#define EVT_AUI_PANEBUTTON(func) \
-   wx__DECLARE_EVT0(wxEVT_AUI_PANEBUTTON, wxAuiManagerEventHandler(func))
-#define EVT_AUI_PANECLOSE(func) \
-   wx__DECLARE_EVT0(wxEVT_AUI_PANECLOSE, wxAuiManagerEventHandler(func))
-#define EVT_AUI_PANEMAXIMIZE(func) \
-   wx__DECLARE_EVT0(wxEVT_AUI_PANEMAXIMIZE, wxAuiManagerEventHandler(func))
-#define EVT_AUI_PANERESTORE(func) \
-   wx__DECLARE_EVT0(wxEVT_AUI_PANERESTORE, wxAuiManagerEventHandler(func))
+#define EVT_AUI_PANE_BUTTON(func) \
+   wx__DECLARE_EVT0(wxEVT_AUI_PANE_BUTTON, wxAuiManagerEventHandler(func))
+#define EVT_AUI_PANE_CLOSE(func) \
+   wx__DECLARE_EVT0(wxEVT_AUI_PANE_CLOSE, wxAuiManagerEventHandler(func))
+#define EVT_AUI_PANE_MAXIMIZE(func) \
+   wx__DECLARE_EVT0(wxEVT_AUI_PANE_MAXIMIZE, wxAuiManagerEventHandler(func))
+#define EVT_AUI_PANE_RESTORE(func) \
+   wx__DECLARE_EVT0(wxEVT_AUI_PANE_RESTORE, wxAuiManagerEventHandler(func))
 #define EVT_AUI_RENDER(func) \
   wx__DECLARE_EVT0(wxEVT_AUI_RENDER, wxAuiManagerEventHandler(func))
+#define EVT_AUI_FIND_MANAGER(func) \
+   wx__DECLARE_EVT0(wxEVT_AUI_FIND_MANAGER, wxAuiManagerEventHandler(func))

 #else

-%constant wxEventType wxEVT_AUI_PANEBUTTON;
-%constant wxEventType wxEVT_AUI_PANECLOSE;
-%constant wxEventType wxEVT_AUI_PANEMAXIMIZE;
-%constant wxEventType wxEVT_AUI_PANERESTORE;
+%constant wxEventType wxEVT_AUI_PANE_BUTTON;
+%constant wxEventType wxEVT_AUI_PANE_CLOSE;
+%constant wxEventType wxEVT_AUI_PANE_MAXIMIZE;
+%constant wxEventType wxEVT_AUI_PANE_RESTORE;
 %constant wxEventType wxEVT_AUI_RENDER;
+%constant wxEventType wxEVT_AUI_FIND_MANAGER;

 %pythoncode {
-    EVT_AUI_PANEBUTTON = wx.PyEventBinder( wxEVT_AUI_PANEBUTTON )
-    EVT_AUI_PANECLOSE = wx.PyEventBinder( wxEVT_AUI_PANECLOSE )
-    EVT_AUI_PANEMAXIMIZE = wx.PyEventBinder( wxEVT_AUI_PANEMAXIMIZE )
-    EVT_AUI_PANERESTORE = wx.PyEventBinder( wxEVT_AUI_PANERESTORE )
+    EVT_AUI_PANE_BUTTON = wx.PyEventBinder( wxEVT_AUI_PANE_BUTTON )
+    EVT_AUI_PANE_CLOSE = wx.PyEventBinder( wxEVT_AUI_PANE_CLOSE )
+    EVT_AUI_PANE_MAXIMIZE = wx.PyEventBinder( wxEVT_AUI_PANE_MAXIMIZE )
+    EVT_AUI_PANE_RESTORE = wx.PyEventBinder( wxEVT_AUI_PANE_RESTORE )
    EVT_AUI_RENDER = wx.PyEventBinder( wxEVT_AUI_RENDER )
+    EVT_AUI_FIND_MANAGER = wx.PyEventBinder( wxEVT_AUI_FIND_MANAGER )
 }
 #endif // SWIG

--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -80,7 +80,7 @@ public:
    virtual wxAuiMDIClientWindow *OnCreateClient();

    virtual void Cascade() { /* Has no effect */ }
-    virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) { }
+    virtual void Tile(wxOrientation orient = wxHORIZONTAL);
    virtual void ArrangeIcons() { /* Has no effect */ }
    virtual void ActivateNext();
    virtual void ActivatePrevious();
--- a/include/wx/combo.h
+++ b/include/wx/combo.h
@@ -184,6 +184,10 @@ public:
    virtual bool Enable(bool enable = true);
    virtual bool Show(bool show = true);
    virtual bool SetFont(const wxFont& font);
+#if wxUSE_VALIDATORS
+    virtual void SetValidator(const wxValidator &validator);
+    virtual wxValidator *GetValidator();
+#endif // wxUSE_VALIDATORS

    // wxTextCtrl methods - for readonly combo they should return
    // without errors.
@@ -470,6 +474,7 @@ protected:
    // event handlers
    void OnSizeEvent( wxSizeEvent& event );
    void OnFocusEvent(wxFocusEvent& event);
+    void OnIdleEvent(wxIdleEvent& event);
    void OnTextCtrlEvent(wxCommandEvent& event);
    void OnSysColourChanged(wxSysColourChangedEvent& event);
    void OnKeyEvent(wxKeyEvent& event);
@@ -598,6 +603,9 @@ protected:
    // is the popup window currenty shown?
    wxByte                  m_popupWinState;

+    // should the focus be reset to the textctrl in idle time?
+    bool                    m_resetFocus;
+    
 private:
    void Init();

--- a/Show More
+++ b/Show More