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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_7_1@41974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-12 08:58:05 +00:00
455 changed files with 10128 additions and 32470 deletions
--- a/Makefile.in
+++ b/Makefile.in
@@ -1262,7 +1262,6 @@ XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	-DWXMAKINGDLL_XRC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
 XRCDLL_OBJECTS =  \
 	$(__xrcdll___win32rc) \
-	xrcdll_xh_animatctrl.o \
 	xrcdll_xh_bmp.o \
 	xrcdll_xh_bmpcbox.o \
 	xrcdll_xh_bmpbt.o \
@@ -1321,7 +1320,6 @@ XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
 	$(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS)
 XRCLIB_OBJECTS =  \
-	xrclib_xh_animatctrl.o \
 	xrclib_xh_bmp.o \
 	xrclib_xh_bmpcbox.o \
 	xrclib_xh_bmpbt.o \
@@ -1412,8 +1410,7 @@ RICHTEXTDLL_OBJECTS =  \
 	richtextdll_richtextxml.o \
 	richtextdll_richtexthtml.o \
 	richtextdll_richtextformatdlg.o \
-	richtextdll_richtextsymboldlg.o \
-	richtextdll_richtextstyledlg.o
+	richtextdll_richtextsymboldlg.o
 RICHTEXTDLL_ODEP =  $(___pch_wxprec_richtextdll_wx_wxprec_h_gch___depname)
 RICHTEXTLIB_CXXFLAGS = $(__richtextlib_PCH_INC) -D__WX$(TOOLKIT)__ \
 	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -1427,8 +1424,7 @@ RICHTEXTLIB_OBJECTS =  \
 	richtextlib_richtextxml.o \
 	richtextlib_richtexthtml.o \
 	richtextlib_richtextformatdlg.o \
-	richtextlib_richtextsymboldlg.o \
-	richtextlib_richtextstyledlg.o
+	richtextlib_richtextsymboldlg.o
 RICHTEXTLIB_ODEP =  $(___pch_wxprec_richtextlib_wx_wxprec_h_gch___depname)
 GLDLL_CXXFLAGS = $(__gldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@ -2593,7 +2589,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_HDR =  \
 	wx/unix/joystick.h \
 	wx/unix/sound.h \
 	wx/unix/taskbarx11.h \
-	wx/generic/animate.h \
 	wx/gtk/animate.h
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_HDR)
 COND_TOOLKIT_MAC_ADVANCED_PLATFORM_HDR =  \
@@ -2780,7 +2775,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/cursor.h \
 	wx/dc.h \
 	wx/dcclient.h \
-	wx/dcgraph.h \
 	wx/dcmemory.h \
 	wx/dcprint.h \
 	wx/dcscreen.h \
@@ -2978,7 +2972,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/debugrpt.h \
 	wx/dbgrid.h \
 	wx/xrc/xh_all.h \
-	wx/xrc/xh_animatctrl.h \
 	wx/xrc/xh_bmpbt.h \
 	wx/xrc/xh_bmp.h \
 	wx/xrc/xh_bmpcbox.h \
@@ -3041,8 +3034,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/richtext/richtextstyles.h \
 	wx/richtext/richtextxml.h \
 	wx/richtext/richtextformatdlg.h \
-	wx/richtext/richtextsymboldlg.h \
-	wx/richtext/richtextstyledlg.h
+	wx/richtext/richtextsymboldlg.h
@COND_USE_GUI_1@ALL_GUI_HEADERS = $(COND_USE_GUI_1_ALL_GUI_HEADERS)
 COND_MONOLITHIC_1_SHARED_1___monodll___depname = \
 	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@@ -3281,7 +3273,6 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
 	monodll_debugrpt.o \
 	monodll_dbgrptg.o \
 	monodll_dbgrid.o \
-	monodll_xh_animatctrl.o \
 	monodll_xh_bmp.o \
 	monodll_xh_bmpcbox.o \
 	monodll_xh_bmpbt.o \
@@ -3345,8 +3336,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
 	monodll_richtextxml.o \
 	monodll_richtexthtml.o \
 	monodll_richtextformatdlg.o \
-	monodll_richtextsymboldlg.o \
-	monodll_richtextstyledlg.o
+	monodll_richtextsymboldlg.o
@COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS)
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
 	$(__LOWLEVEL_SRC_OBJECTS) \
@@ -5022,7 +5012,6 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
 	monolib_debugrpt.o \
 	monolib_dbgrptg.o \
 	monolib_dbgrid.o \
-	monolib_xh_animatctrl.o \
 	monolib_xh_bmp.o \
 	monolib_xh_bmpcbox.o \
 	monolib_xh_bmpbt.o \
@@ -5086,8 +5075,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
 	monolib_richtextxml.o \
 	monolib_richtexthtml.o \
 	monolib_richtextformatdlg.o \
-	monolib_richtextsymboldlg.o \
-	monolib_richtextstyledlg.o
+	monolib_richtextsymboldlg.o
@COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS_1 = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1)
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
 	$(__LOWLEVEL_SRC_OBJECTS_2) \
@@ -10690,7 +10678,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS =  \
 	monodll_joystick.o \
 	monodll_sound.o \
 	monodll_taskbarx11.o \
-	monodll_animateg.o \
 	monodll_aboutdlg.o \
 	monodll_animate.o \
 	monodll_taskbar.o \
@@ -10760,7 +10747,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
 	monolib_joystick.o \
 	monolib_sound.o \
 	monolib_taskbarx11.o \
-	monolib_animateg.o \
 	monolib_aboutdlg.o \
 	monolib_animate.o \
 	monolib_taskbar.o \
@@ -10833,7 +10819,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
 	advdll_joystick.o \
 	advdll_sound.o \
 	advdll_taskbarx11.o \
-	advdll_animateg.o \
 	advdll_aboutdlg.o \
 	advdll_animate.o \
 	advdll_taskbar.o \
@@ -10900,7 +10885,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
 	advlib_joystick.o \
 	advlib_sound.o \
 	advlib_taskbarx11.o \
-	advlib_animateg.o \
 	advlib_aboutdlg.o \
 	advlib_animate.o \
 	advlib_taskbar.o \
@@ -12613,9 +12597,6 @@ monodll_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(MONODLL_ODEP)
 monodll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp

-monodll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
-
 monodll_xh_bmp.o: $(srcdir)/src/xrc/xh_bmp.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bmp.cpp

@@ -12808,9 +12789,6 @@ monodll_richtextformatdlg.o: $(srcdir)/src/richtext/richtextformatdlg.cpp $(MONO
 monodll_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp

-monodll_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp
-
 monodll_xml.o: $(srcdir)/src/xml/xml.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp

@@ -15937,9 +15915,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp

-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp

@@ -16660,9 +16635,6 @@ monolib_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(MONOLIB_ODEP)
 monolib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp

-monolib_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
-
 monolib_xh_bmp.o: $(srcdir)/src/xrc/xh_bmp.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_bmp.cpp

@@ -16855,9 +16827,6 @@ monolib_richtextformatdlg.o: $(srcdir)/src/richtext/richtextformatdlg.cpp $(MONO
 monolib_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp

-monolib_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp
-
 monolib_xml.o: $(srcdir)/src/xml/xml.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xml/xml.cpp

@@ -19984,9 +19953,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp

-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp

@@ -27280,9 +27246,6 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_MOTIF@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp

-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp

@@ -27502,9 +27465,6 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_MOTIF@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp

-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp

@@ -27940,9 +27900,6 @@ xmllib_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(XMLLIB_ODEP)
 xrcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(XRCDLL_ODEP)
 	$(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58)  $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include

-xrcdll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(XRCDLL_ODEP)
-	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
-
 xrcdll_xh_bmp.o: $(srcdir)/src/xrc/xh_bmp.cpp $(XRCDLL_ODEP)
 	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bmp.cpp

@@ -28099,9 +28056,6 @@ xrcdll_xmlres.o: $(srcdir)/src/xrc/xmlres.cpp $(XRCDLL_ODEP)
 xrcdll_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCDLL_ODEP)
 	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp

-xrclib_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(XRCLIB_ODEP)
-	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
-
 xrclib_xh_bmp.o: $(srcdir)/src/xrc/xh_bmp.cpp $(XRCLIB_ODEP)
 	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_bmp.cpp

@@ -28315,9 +28269,6 @@ richtextdll_richtextformatdlg.o: $(srcdir)/src/richtext/richtextformatdlg.cpp $(
 richtextdll_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(RICHTEXTDLL_ODEP)
 	$(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp

-richtextdll_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(RICHTEXTDLL_ODEP)
-	$(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp
-
 richtextlib_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTLIB_ODEP)
 	$(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp

@@ -28339,9 +28290,6 @@ richtextlib_richtextformatdlg.o: $(srcdir)/src/richtext/richtextformatdlg.cpp $(
 richtextlib_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(RICHTEXTLIB_ODEP)
 	$(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp

-richtextlib_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(RICHTEXTLIB_ODEP)
-	$(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp
-
 gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP)
 	$(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58)  $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include

@@ -28942,9 +28890,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	done

 	# copy the rest, not covered by the above loop
-	$(CP_P) $(SAMPDIR)/animate/hourglass.ani $(DISTDIR)/samples/hourglass.ani
-	$(CP_P) $(SAMPDIR)/animate/throbber.gif $(DISTDIR)/samples/animate
-
 	$(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console

 	$(CP_P) $(SAMPDIR)/dialogs/tips.txt $(DISTDIR)/samples/dialogs
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -682,7 +682,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/cursor.h
    wx/dc.h
    wx/dcclient.h
-    wx/dcgraph.h
    wx/dcmemory.h
    wx/dcprint.h
    wx/dcscreen.h
@@ -2760,7 +2759,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>

 <set var="ADVANCED_GTK_SRC" hints="files">
-    src/generic/animateg.cpp
    src/gtk/aboutdlg.cpp
    src/gtk/animate.cpp
    src/gtk/taskbar.cpp
@@ -2768,7 +2766,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/gtk/eggtrayicon.c
 </set>
 <set var="ADVANCED_GTK_HDR" hints="files">
-    wx/generic/animate.h
    wx/gtk/animate.h
 </set>

@@ -2921,7 +2918,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->

 <set var="XRC_SRC" hints="files">
-    src/xrc/xh_animatctrl.cpp
    src/xrc/xh_bmp.cpp
    src/xrc/xh_bmpcbox.cpp
    src/xrc/xh_bmpbt.cpp
@@ -2977,7 +2973,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="XRC_HDR" hints="files">
    wx/xrc/xh_all.h
-    wx/xrc/xh_animatctrl.h
    wx/xrc/xh_bmpbt.h
    wx/xrc/xh_bmp.h
    wx/xrc/xh_bmpcbox.h
@@ -3140,7 +3135,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/richtext/richtexthtml.cpp
    src/richtext/richtextformatdlg.cpp
    src/richtext/richtextsymboldlg.cpp
-    src/richtext/richtextstyledlg.cpp
 </set>
 <set var="RICHTEXT_HDR" hints="files">
    wx/richtext/richtextctrl.h
@@ -3149,7 +3143,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/richtext/richtextxml.h
    wx/richtext/richtextformatdlg.h
    wx/richtext/richtextsymboldlg.h
-    wx/richtext/richtextstyledlg.h
 </set>

 <!-- ====================================================================== -->
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -910,7 +910,6 @@ XRCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	-H=$(OBJS)\wxprec_xrcdll.csm $(CPPFLAGS) $(CXXFLAGS)
 XRCDLL_OBJECTS =  \
 	$(OBJS)\xrcdll_dummy.obj \
-	$(OBJS)\xrcdll_xh_animatctrl.obj \
 	$(OBJS)\xrcdll_xh_bmp.obj \
 	$(OBJS)\xrcdll_xh_bmpcbox.obj \
 	$(OBJS)\xrcdll_xh_bmpbt.obj \
@@ -973,7 +972,6 @@ XRCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(CXXFLAGS)
 XRCLIB_OBJECTS =  \
 	$(OBJS)\xrclib_dummy.obj \
-	$(OBJS)\xrclib_xh_animatctrl.obj \
 	$(OBJS)\xrclib_xh_bmp.obj \
 	$(OBJS)\xrclib_xh_bmpcbox.obj \
 	$(OBJS)\xrclib_xh_bmpbt.obj \
@@ -1072,8 +1070,7 @@ RICHTEXTDLL_OBJECTS =  \
 	$(OBJS)\richtextdll_richtextxml.obj \
 	$(OBJS)\richtextdll_richtexthtml.obj \
 	$(OBJS)\richtextdll_richtextformatdlg.obj \
-	$(OBJS)\richtextdll_richtextsymboldlg.obj \
-	$(OBJS)\richtextdll_richtextstyledlg.obj
+	$(OBJS)\richtextdll_richtextsymboldlg.obj
 RICHTEXTLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -1090,8 +1087,7 @@ RICHTEXTLIB_OBJECTS =  \
 	$(OBJS)\richtextlib_richtextxml.obj \
 	$(OBJS)\richtextlib_richtexthtml.obj \
 	$(OBJS)\richtextlib_richtextformatdlg.obj \
-	$(OBJS)\richtextlib_richtextsymboldlg.obj \
-	$(OBJS)\richtextlib_richtextstyledlg.obj
+	$(OBJS)\richtextlib_richtextsymboldlg.obj
 GLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -1207,7 +1203,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_debugrpt.obj \
 	$(OBJS)\monodll_dbgrptg.obj \
 	$(OBJS)\monodll_dbgrid.obj \
-	$(OBJS)\monodll_xh_animatctrl.obj \
 	$(OBJS)\monodll_xh_bmp.obj \
 	$(OBJS)\monodll_xh_bmpcbox.obj \
 	$(OBJS)\monodll_xh_bmpbt.obj \
@@ -1271,8 +1266,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_richtextxml.obj \
 	$(OBJS)\monodll_richtexthtml.obj \
 	$(OBJS)\monodll_richtextformatdlg.obj \
-	$(OBJS)\monodll_richtextsymboldlg.obj \
-	$(OBJS)\monodll_richtextstyledlg.obj
+	$(OBJS)\monodll_richtextsymboldlg.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
@@ -1807,7 +1801,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_debugrpt.obj \
 	$(OBJS)\monolib_dbgrptg.obj \
 	$(OBJS)\monolib_dbgrid.obj \
-	$(OBJS)\monolib_xh_animatctrl.obj \
 	$(OBJS)\monolib_xh_bmp.obj \
 	$(OBJS)\monolib_xh_bmpcbox.obj \
 	$(OBJS)\monolib_xh_bmpbt.obj \
@@ -1871,8 +1864,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_richtextxml.obj \
 	$(OBJS)\monolib_richtexthtml.obj \
 	$(OBJS)\monolib_richtextformatdlg.obj \
-	$(OBJS)\monolib_richtextsymboldlg.obj \
-	$(OBJS)\monolib_richtextstyledlg.obj
+	$(OBJS)\monolib_richtextsymboldlg.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
@@ -4959,9 +4951,6 @@ $(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
 $(OBJS)\monodll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**

-$(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
 $(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**

@@ -5154,9 +5143,6 @@ $(OBJS)\monodll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
 $(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**

-$(OBJS)\monodll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
 $(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**

@@ -6893,9 +6879,6 @@ $(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
 $(OBJS)\monolib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**

-$(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
 $(OBJS)\monolib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**

@@ -7088,9 +7071,6 @@ $(OBJS)\monolib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
 $(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**

-$(OBJS)\monolib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
 $(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**

@@ -11806,9 +11786,6 @@ $(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
 $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG) $**

-$(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
-	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
-
 $(OBJS)\xrcdll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
 	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**

@@ -11968,9 +11945,6 @@ $(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
 $(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) -H $**

-$(OBJS)\xrclib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
-	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
-
 $(OBJS)\xrclib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
 	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**

@@ -12193,9 +12167,6 @@ $(OBJS)\richtextdll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.
 $(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
 	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) $**

-$(OBJS)\richtextdll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
-	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) $**
-
 $(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) -H $**

@@ -12220,9 +12191,6 @@ $(OBJS)\richtextlib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.
 $(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
 	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) $**

-$(OBJS)\richtextlib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
-	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) $**
-
 $(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) -H $**

--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -909,7 +909,6 @@ XRCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS)
 XRCDLL_OBJECTS =  \
 	$(OBJS)\xrcdll_dummy.o \
 	$(OBJS)\xrcdll_version_rc.o \
-	$(OBJS)\xrcdll_xh_animatctrl.o \
 	$(OBJS)\xrcdll_xh_bmp.o \
 	$(OBJS)\xrcdll_xh_bmpcbox.o \
 	$(OBJS)\xrcdll_xh_bmpbt.o \
@@ -972,7 +971,6 @@ XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS)
 	$(CXXFLAGS)
 XRCLIB_OBJECTS =  \
 	$(OBJS)\xrclib_dummy.o \
-	$(OBJS)\xrclib_xh_animatctrl.o \
 	$(OBJS)\xrclib_xh_bmp.o \
 	$(OBJS)\xrclib_xh_bmpcbox.o \
 	$(OBJS)\xrclib_xh_bmpbt.o \
@@ -1073,8 +1071,7 @@ RICHTEXTDLL_OBJECTS =  \
 	$(OBJS)\richtextdll_richtextxml.o \
 	$(OBJS)\richtextdll_richtexthtml.o \
 	$(OBJS)\richtextdll_richtextformatdlg.o \
-	$(OBJS)\richtextdll_richtextsymboldlg.o \
-	$(OBJS)\richtextdll_richtextstyledlg.o
+	$(OBJS)\richtextdll_richtextsymboldlg.o
 RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
 	$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -1091,8 +1088,7 @@ RICHTEXTLIB_OBJECTS =  \
 	$(OBJS)\richtextlib_richtextxml.o \
 	$(OBJS)\richtextlib_richtexthtml.o \
 	$(OBJS)\richtextlib_richtextformatdlg.o \
-	$(OBJS)\richtextlib_richtextsymboldlg.o \
-	$(OBJS)\richtextlib_richtextstyledlg.o
+	$(OBJS)\richtextlib_richtextsymboldlg.o
 GLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
 	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@ -1216,7 +1212,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_debugrpt.o \
 	$(OBJS)\monodll_dbgrptg.o \
 	$(OBJS)\monodll_dbgrid.o \
-	$(OBJS)\monodll_xh_animatctrl.o \
 	$(OBJS)\monodll_xh_bmp.o \
 	$(OBJS)\monodll_xh_bmpcbox.o \
 	$(OBJS)\monodll_xh_bmpbt.o \
@@ -1280,8 +1275,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_richtextxml.o \
 	$(OBJS)\monodll_richtexthtml.o \
 	$(OBJS)\monodll_richtextformatdlg.o \
-	$(OBJS)\monodll_richtextsymboldlg.o \
-	$(OBJS)\monodll_richtextstyledlg.o
+	$(OBJS)\monodll_richtextsymboldlg.o
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
@@ -1822,7 +1816,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_debugrpt.o \
 	$(OBJS)\monolib_dbgrptg.o \
 	$(OBJS)\monolib_dbgrid.o \
-	$(OBJS)\monolib_xh_animatctrl.o \
 	$(OBJS)\monolib_xh_bmp.o \
 	$(OBJS)\monolib_xh_bmpcbox.o \
 	$(OBJS)\monolib_xh_bmpbt.o \
@@ -1886,8 +1879,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_richtextxml.o \
 	$(OBJS)\monolib_richtexthtml.o \
 	$(OBJS)\monolib_richtextformatdlg.o \
-	$(OBJS)\monolib_richtextsymboldlg.o \
-	$(OBJS)\monolib_richtextstyledlg.o
+	$(OBJS)\monolib_richtextsymboldlg.o
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
@@ -5076,9 +5068,6 @@ $(OBJS)\monodll_dbgrptg.o: ../../src/generic/dbgrptg.cpp
 $(OBJS)\monodll_dbgrid.o: ../../src/common/dbgrid.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

-$(OBJS)\monodll_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monodll_xh_bmp.o: ../../src/xrc/xh_bmp.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

@@ -5271,9 +5260,6 @@ $(OBJS)\monodll_richtextformatdlg.o: ../../src/richtext/richtextformatdlg.cpp
 $(OBJS)\monodll_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

-$(OBJS)\monodll_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monodll_xml.o: ../../src/xml/xml.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

@@ -7110,9 +7096,6 @@ $(OBJS)\monolib_dbgrptg.o: ../../src/generic/dbgrptg.cpp
 $(OBJS)\monolib_dbgrid.o: ../../src/common/dbgrid.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

-$(OBJS)\monolib_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monolib_xh_bmp.o: ../../src/xrc/xh_bmp.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

@@ -7305,9 +7288,6 @@ $(OBJS)\monolib_richtextformatdlg.o: ../../src/richtext/richtextformatdlg.cpp
 $(OBJS)\monolib_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

-$(OBJS)\monolib_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monolib_xml.o: ../../src/xml/xml.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

@@ -12323,9 +12303,6 @@ $(OBJS)\xrcdll_dummy.o: ../../src/common/dummy.cpp
 $(OBJS)\xrcdll_version_rc.o: ../../src/msw/version.rc
 	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG)

-$(OBJS)\xrcdll_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\xrcdll_xh_bmp.o: ../../src/xrc/xh_bmp.cpp
 	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<

@@ -12485,9 +12462,6 @@ $(OBJS)\xrcdll_xmlrsall.o: ../../src/xrc/xmlrsall.cpp
 $(OBJS)\xrclib_dummy.o: ../../src/common/dummy.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<

-$(OBJS)\xrclib_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\xrclib_xh_bmp.o: ../../src/xrc/xh_bmp.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<

@@ -12710,9 +12684,6 @@ $(OBJS)\richtextdll_richtextformatdlg.o: ../../src/richtext/richtextformatdlg.cp
 $(OBJS)\richtextdll_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp
 	$(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $<

-$(OBJS)\richtextdll_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp
-	$(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\richtextlib_dummy.o: ../../src/common/dummy.cpp
 	$(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $<

@@ -12737,9 +12708,6 @@ $(OBJS)\richtextlib_richtextformatdlg.o: ../../src/richtext/richtextformatdlg.cp
 $(OBJS)\richtextlib_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp
 	$(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $<

-$(OBJS)\richtextlib_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp
-	$(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\gldll_dummy.o: ../../src/common/dummy.cpp
 	$(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $<

--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -990,7 +990,6 @@ XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_384)$(__DEBUGRUNTIME) /DWIN32 \
 XRCDLL_OBJECTS =  \
 	$(OBJS)\xrcdll_dummy.obj \
 	$(OBJS)\xrcdll_version.res \
-	$(OBJS)\xrcdll_xh_animatctrl.obj \
 	$(OBJS)\xrcdll_xh_bmp.obj \
 	$(OBJS)\xrcdll_xh_bmpcbox.obj \
 	$(OBJS)\xrcdll_xh_bmpbt.obj \
@@ -1055,7 +1054,6 @@ XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_397)$(__DEBUGRUNTIME) /DWIN32 \
 	/Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrclib.pch" $(CPPFLAGS) $(CXXFLAGS)
 XRCLIB_OBJECTS =  \
 	$(OBJS)\xrclib_dummy.obj \
-	$(OBJS)\xrclib_xh_animatctrl.obj \
 	$(OBJS)\xrclib_xh_bmp.obj \
 	$(OBJS)\xrclib_xh_bmpcbox.obj \
 	$(OBJS)\xrclib_xh_bmpbt.obj \
@@ -1164,8 +1162,7 @@ RICHTEXTDLL_OBJECTS =  \
 	$(OBJS)\richtextdll_richtextxml.obj \
 	$(OBJS)\richtextdll_richtexthtml.obj \
 	$(OBJS)\richtextdll_richtextformatdlg.obj \
-	$(OBJS)\richtextdll_richtextsymboldlg.obj \
-	$(OBJS)\richtextdll_richtextstyledlg.obj
+	$(OBJS)\richtextdll_richtextsymboldlg.obj
 RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_451)$(__DEBUGRUNTIME) /DWIN32 \
 	$(__DEBUGINFO) \
 	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.pdb \
@@ -1185,8 +1182,7 @@ RICHTEXTLIB_OBJECTS =  \
 	$(OBJS)\richtextlib_richtextxml.obj \
 	$(OBJS)\richtextlib_richtexthtml.obj \
 	$(OBJS)\richtextlib_richtextformatdlg.obj \
-	$(OBJS)\richtextlib_richtextsymboldlg.obj \
-	$(OBJS)\richtextlib_richtextstyledlg.obj
+	$(OBJS)\richtextlib_richtextsymboldlg.obj
 GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_465)$(__DEBUGRUNTIME) /DWIN32 \
 	$(__DEBUGINFO) \
 	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \
@@ -1374,7 +1370,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_debugrpt.obj \
 	$(OBJS)\monodll_dbgrptg.obj \
 	$(OBJS)\monodll_dbgrid.obj \
-	$(OBJS)\monodll_xh_animatctrl.obj \
 	$(OBJS)\monodll_xh_bmp.obj \
 	$(OBJS)\monodll_xh_bmpcbox.obj \
 	$(OBJS)\monodll_xh_bmpbt.obj \
@@ -1438,8 +1433,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_richtextxml.obj \
 	$(OBJS)\monodll_richtexthtml.obj \
 	$(OBJS)\monodll_richtextformatdlg.obj \
-	$(OBJS)\monodll_richtextsymboldlg.obj \
-	$(OBJS)\monodll_richtextstyledlg.obj
+	$(OBJS)\monodll_richtextsymboldlg.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
@@ -1980,7 +1974,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_debugrpt.obj \
 	$(OBJS)\monolib_dbgrptg.obj \
 	$(OBJS)\monolib_dbgrid.obj \
-	$(OBJS)\monolib_xh_animatctrl.obj \
 	$(OBJS)\monolib_xh_bmp.obj \
 	$(OBJS)\monolib_xh_bmpcbox.obj \
 	$(OBJS)\monolib_xh_bmpbt.obj \
@@ -2044,8 +2037,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_richtextxml.obj \
 	$(OBJS)\monolib_richtexthtml.obj \
 	$(OBJS)\monolib_richtextformatdlg.obj \
-	$(OBJS)\monolib_richtextsymboldlg.obj \
-	$(OBJS)\monolib_richtextstyledlg.obj
+	$(OBJS)\monolib_richtextsymboldlg.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
@@ -5292,9 +5284,6 @@ $(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
 $(OBJS)\monodll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**

-$(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
 $(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**

@@ -5487,9 +5476,6 @@ $(OBJS)\monodll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
 $(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**

-$(OBJS)\monodll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
 $(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**

@@ -7226,9 +7212,6 @@ $(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
 $(OBJS)\monolib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**

-$(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
 $(OBJS)\monolib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**

@@ -7421,9 +7404,6 @@ $(OBJS)\monolib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
 $(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**

-$(OBJS)\monolib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
 $(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**

@@ -12139,9 +12119,6 @@ $(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
 $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
 	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG) $**

-$(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
-
 $(OBJS)\xrcdll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**

@@ -12301,9 +12278,6 @@ $(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
 $(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) /Ycwx/wxprec.h $**

-$(OBJS)\xrclib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
-
 $(OBJS)\xrclib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**

@@ -12526,9 +12500,6 @@ $(OBJS)\richtextdll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.
 $(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**

-$(OBJS)\richtextdll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
-
 $(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) /Ycwx/wxprec.h $**

@@ -12553,9 +12524,6 @@ $(OBJS)\richtextlib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.
 $(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**

-$(OBJS)\richtextlib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**
-
 $(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h $**

--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -133,7 +133,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_debugrpt.obj &
 	$(OBJS)\monodll_dbgrptg.obj &
 	$(OBJS)\monodll_dbgrid.obj &
-	$(OBJS)\monodll_xh_animatctrl.obj &
 	$(OBJS)\monodll_xh_bmp.obj &
 	$(OBJS)\monodll_xh_bmpcbox.obj &
 	$(OBJS)\monodll_xh_bmpbt.obj &
@@ -197,8 +196,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_richtextxml.obj &
 	$(OBJS)\monodll_richtexthtml.obj &
 	$(OBJS)\monodll_richtextformatdlg.obj &
-	$(OBJS)\monodll_richtextsymboldlg.obj &
-	$(OBJS)\monodll_richtextstyledlg.obj
+	$(OBJS)\monodll_richtextsymboldlg.obj
 !endif
 ____CORE_SRC_FILENAMES_OBJECTS =
 !ifeq USE_GUI 1
@@ -743,7 +741,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_debugrpt.obj &
 	$(OBJS)\monolib_dbgrptg.obj &
 	$(OBJS)\monolib_dbgrid.obj &
-	$(OBJS)\monolib_xh_animatctrl.obj &
 	$(OBJS)\monolib_xh_bmp.obj &
 	$(OBJS)\monolib_xh_bmpcbox.obj &
 	$(OBJS)\monolib_xh_bmpbt.obj &
@@ -807,8 +804,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_richtextxml.obj &
 	$(OBJS)\monolib_richtexthtml.obj &
 	$(OBJS)\monolib_richtextformatdlg.obj &
-	$(OBJS)\monolib_richtextsymboldlg.obj &
-	$(OBJS)\monolib_richtextstyledlg.obj
+	$(OBJS)\monolib_richtextsymboldlg.obj
 !endif
 ____CORE_SRC_FILENAMES_1_OBJECTS =
 !ifeq USE_GUI 1
@@ -3599,7 +3595,6 @@ XRCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
 	$(CXXFLAGS)
 XRCDLL_OBJECTS =  &
 	$(OBJS)\xrcdll_dummy.obj &
-	$(OBJS)\xrcdll_xh_animatctrl.obj &
 	$(OBJS)\xrcdll_xh_bmp.obj &
 	$(OBJS)\xrcdll_xh_bmpcbox.obj &
 	$(OBJS)\xrcdll_xh_bmpbt.obj &
@@ -3662,7 +3657,6 @@ XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
 	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 XRCLIB_OBJECTS =  &
 	$(OBJS)\xrclib_dummy.obj &
-	$(OBJS)\xrclib_xh_animatctrl.obj &
 	$(OBJS)\xrclib_xh_bmp.obj &
 	$(OBJS)\xrclib_xh_bmpcbox.obj &
 	$(OBJS)\xrclib_xh_bmpbt.obj &
@@ -3763,8 +3757,7 @@ RICHTEXTDLL_OBJECTS =  &
 	$(OBJS)\richtextdll_richtextxml.obj &
 	$(OBJS)\richtextdll_richtexthtml.obj &
 	$(OBJS)\richtextdll_richtextformatdlg.obj &
-	$(OBJS)\richtextdll_richtextsymboldlg.obj &
-	$(OBJS)\richtextdll_richtextstyledlg.obj
+	$(OBJS)\richtextdll_richtextsymboldlg.obj
 RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
@@ -3781,8 +3774,7 @@ RICHTEXTLIB_OBJECTS =  &
 	$(OBJS)\richtextlib_richtextxml.obj &
 	$(OBJS)\richtextlib_richtexthtml.obj &
 	$(OBJS)\richtextlib_richtextformatdlg.obj &
-	$(OBJS)\richtextlib_richtextsymboldlg.obj &
-	$(OBJS)\richtextlib_richtextstyledlg.obj
+	$(OBJS)\richtextlib_richtextsymboldlg.obj
 GLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
@@ -5304,9 +5296,6 @@ $(OBJS)\monodll_dbgrptg.obj :  .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
 $(OBJS)\monodll_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

-$(OBJS)\monodll_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
 $(OBJS)\monodll_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

@@ -5499,9 +5488,6 @@ $(OBJS)\monodll_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtext
 $(OBJS)\monodll_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

-$(OBJS)\monodll_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
 $(OBJS)\monodll_xml.obj :  .AUTODEPEND ..\..\src\xml\xml.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

@@ -7338,9 +7324,6 @@ $(OBJS)\monolib_dbgrptg.obj :  .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
 $(OBJS)\monolib_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

-$(OBJS)\monolib_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
 $(OBJS)\monolib_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

@@ -7533,9 +7516,6 @@ $(OBJS)\monolib_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtext
 $(OBJS)\monolib_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

-$(OBJS)\monolib_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
 $(OBJS)\monolib_xml.obj :  .AUTODEPEND ..\..\src\xml\xml.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

@@ -12551,9 +12531,6 @@ $(OBJS)\xrcdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
 $(OBJS)\xrcdll_version.res :  .AUTODEPEND ..\..\src\msw\version.rc
 	wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_wat$(VENDORTAG) $<

-$(OBJS)\xrcdll_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
 $(OBJS)\xrcdll_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<

@@ -12713,9 +12690,6 @@ $(OBJS)\xrcdll_xmlrsall.obj :  .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp
 $(OBJS)\xrclib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<

-$(OBJS)\xrclib_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
 $(OBJS)\xrclib_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<

@@ -12938,9 +12912,6 @@ $(OBJS)\richtextdll_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\rich
 $(OBJS)\richtextdll_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<

-$(OBJS)\richtextdll_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
-
 $(OBJS)\richtextlib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<

@@ -12965,9 +12936,6 @@ $(OBJS)\richtextlib_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\rich
 $(OBJS)\richtextlib_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<

-$(OBJS)\richtextlib_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
-
 $(OBJS)\gldll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(GLDLL_CXXFLAGS) $<

--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -8757,10 +8757,6 @@ SOURCE=..\..\include\wx\dcclient.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\include\wx\dcgraph.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\dcmemory.h
 # End Source File
 # Begin Source File
@@ -9161,10 +9157,6 @@ SOURCE=..\..\include\wx\richtext\richtextformatdlg.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\include\wx\richtext\richtextstyledlg.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\richtext\richtextstyles.h
 # End Source File
 # Begin Source File
@@ -9369,10 +9361,6 @@ SOURCE=..\..\include\wx\xrc\xh_all.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\include\wx\xrc\xh_animatctrl.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\xrc\xh_bmp.h
 # End Source File
 # Begin Source File
--- a/build/msw/wx_richtext.dsp
+++ b/build/msw/wx_richtext.dsp
@@ -970,10 +970,6 @@ SOURCE=..\..\include\wx\richtext\richtextformatdlg.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\include\wx\richtext\richtextstyledlg.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\richtext\richtextstyles.h
 # End Source File
 # Begin Source File
@@ -1006,10 +1002,6 @@ SOURCE=..\..\src\richtext\richtexthtml.cpp
 # End Source File
 # Begin Source File

-SOURCE=..\..\src\richtext\richtextstyledlg.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\richtext\richtextstyles.cpp
 # End Source File
 # Begin Source File
--- a/build/msw/wx_xrc.dsp
+++ b/build/msw/wx_xrc.dsp
@@ -962,10 +962,6 @@ SOURCE=..\..\include\wx\xrc\xh_all.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\include\wx\xrc\xh_animatctrl.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\xrc\xh_bmp.h
 # End Source File
 # Begin Source File
@@ -1174,10 +1170,6 @@ SOURCE=..\..\include\wx\xrc\xmlres.h
 # PROP Default_Filter ""
 # Begin Source File

-SOURCE=..\..\src\xrc\xh_animatctrl.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\xrc\xh_bmp.cpp
 # End Source File
 # Begin Source File
--- a/1590
+++ b/1590
--- a/configure.in
+++ b/configure.in
@@ -35,7 +35,7 @@ dnl wx_release_number += 1
 wx_major_version_number=2
 wx_minor_version_number=7
 wx_release_number=1
-wx_subrelease_number=2
+wx_subrelease_number=0

 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
@@ -525,7 +525,6 @@ if test $DEBUG_CONFIGURE = 1; then
  DEFAULT_wxUSE_COMBOCTRL=no
  DEFAULT_wxUSE_DATEPICKCTRL=no
  DEFAULT_wxUSE_DISPLAY=no
-  DEFAULT_wxUSE_DETECT_SM=no
  DEFAULT_wxUSE_DIRPICKERCTRL=no
  DEFAULT_wxUSE_FILEPICKERCTRL=no
  DEFAULT_wxUSE_FONTPICKERCTRL=no
@@ -743,7 +742,6 @@ else
  DEFAULT_wxUSE_COMBOCTRL=yes
  DEFAULT_wxUSE_DATEPICKCTRL=yes
  DEFAULT_wxUSE_DISPLAY=yes
-  DEFAULT_wxUSE_DETECT_SM=yes
  DEFAULT_wxUSE_DIRPICKERCTRL=yes
  DEFAULT_wxUSE_FILEPICKERCTRL=yes
  DEFAULT_wxUSE_FONTPICKERCTRL=yes
@@ -1072,7 +1070,6 @@ if test "$wxUSE_CONTROLS" = "yes"; then
  DEFAULT_wxUSE_COMBOBOX=yes
  DEFAULT_wxUSE_DATEPICKCTRL=yes
  DEFAULT_wxUSE_DISPLAY=yes
-  DEFAULT_wxUSE_DETECT_SM=yes
  DEFAULT_wxUSE_DIRPICKERCTRL=yes
  DEFAULT_wxUSE_FILEPICKERCTRL=yes
  DEFAULT_wxUSE_FONTPICKERCTRL=yes
@@ -1123,7 +1120,6 @@ elif test "$wxUSE_CONTROLS" = "no"; then
  DEFAULT_wxUSE_COMBOBOX=no
  DEFAULT_wxUSE_DATEPICKCTRL=no
  DEFAULT_wxUSE_DISPLAY=no
-  DEFAULT_wxUSE_DETECT_SM=no
  DEFAULT_wxUSE_DIRPICKERCTRL=no
  DEFAULT_wxUSE_FILEPICKERCTRL=no
  DEFAULT_wxUSE_FONTPICKERCTRL=no
@@ -1177,7 +1173,6 @@ WX_ARG_ENABLE(comboctrl,   [  --enable-comboctrl      use wxComboCtrl class], wx
 WX_ARG_ENABLE(datepick,    [  --enable-datepick       use wxDatePickerCtrl class], wxUSE_DATEPICKCTRL)
 WX_ARG_ENABLE(dirpicker,   [  --enable-dirpicker      use wxDirPickerCtrl class], wxUSE_DIRPICKERCTRL)
 WX_ARG_ENABLE(display,     [  --enable-display        use wxDisplay class], wxUSE_DISPLAY)
-WX_ARG_ENABLE(detect_sm,   [  --enable-detect_sm      use code to detect X11 session manager], wxUSE_DETECT_SM)
 WX_ARG_ENABLE(filepicker,  [  --enable-filepicker     use wxFilePickerCtrl class], wxUSE_FILEPICKERCTRL)
 WX_ARG_ENABLE(fontpicker,  [  --enable-fontpicker     use wxFontPickerCtrl class], wxUSE_FONTPICKERCTRL)
 WX_ARG_ENABLE(gauge,       [  --enable-gauge          use wxGauge class], wxUSE_GAUGE)
@@ -3090,9 +3085,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
                AC_MSG_WARN([Unicode configuration not supported with GTK+ 1.x])
                wxUSE_UNICODE=no
            fi
-
-            dnl test for XIM support in libgdk
-            AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_XIM))
        fi

        AC_LANG_POP
@@ -3110,6 +3102,10 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
        TOOLKIT=GTK
        GUIDIST=GTK_DIST

+        dnl test for XIM support in libgdk
+        AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_XIM))
+
+
        dnl test for external libxpm if we're configured to use it
        if test "$wxUSE_GPE" = "yes"; then
            AC_MSG_CHECKING(for gpewidget library)
@@ -3206,8 +3202,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
    fi

    if test "$wxUSE_DFB" = 1; then
-       PKG_PROG_PKG_CONFIG()
-
       PKG_CHECK_MODULES(DIRECTFB,
                         [directfb >= 0.9.22],
                         [
@@ -3284,44 +3278,42 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
        fi

        if test "$wxUSE_UNICODE" = "yes"; then
-            PKG_PROG_PKG_CONFIG()
-
-            PKG_CHECK_MODULES(PANGOX, pangox,
-                [
-                    CXXFLAGS="$PANGOX_CFLAGS $CXXFLAGS"
-                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS"
-                ],
-                [
-                    AC_MSG_ERROR([pangox library not found, library cannot be compiled in Unicode mode])
-                ]
-            )
-            PKG_CHECK_MODULES(PANGOFT2, pangoft2,
-                [
-                    CXXFLAGS="$PANGOFT2_CFLAGS $CXXFLAGS"
-                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
-                ],
-                [
-                    AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support])
-                    wxUSE_PRINTING_ARCHITECTURE="no"
-                ]
-            )
-            PKG_CHECK_MODULES(PANGOXFT, pangoxft,
-                [
-                    AC_DEFINE(HAVE_PANGO_XFT)
-                    CXXFLAGS="$PANGOXFT_CFLAGS $CXXFLAGS"
-                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
-                ],
-                [
-                    AC_MSG_WARN([pangoxft library not found, library will be compiled without anti-aliasing support])
-                ]
-            )
-            save_CXXFLAGS="$CXXFLAGS"
-            save_LIBS="$LIBS"
-            CXXFLAGS="$PANGOX_CFLAGS $CXXFLAGS"
-            LIBS="$LIBS $PANGOX_LIBS"
-            AC_CHECK_FUNCS([pango_font_family_is_monospace])
-            CXXFLAGS="$save_CXXFLAGS"
-            LIBS="$save_LIBS"
+                PKG_CHECK_MODULES(PANGOX, pangox,
+                    [
+                        CXXFLAGS="$PANGOX_CFLAGS $CXXFLAGS"
+                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS"
+                    ],
+                    [
+                        AC_MSG_ERROR([pangox library not found, library cannot be compiled in Unicode mode])
+                    ]
+                )
+                PKG_CHECK_MODULES(PANGOFT2, pangoft2,
+                    [
+                        CXXFLAGS="$PANGOFT2_CFLAGS $CXXFLAGS"
+                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
+                    ],
+                    [
+                        AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support])
+                        wxUSE_PRINTING_ARCHITECTURE="no"
+                    ]
+                )
+                PKG_CHECK_MODULES(PANGOXFT, pangoxft,
+                    [
+                        AC_DEFINE(HAVE_PANGO_XFT)
+                        CXXFLAGS="$PANGOXFT_CFLAGS $CXXFLAGS"
+                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
+                    ],
+                    [
+                        AC_MSG_WARN([pangoxft library not found, library will be compiled without anti-aliasing support])
+                    ]
+                )
+                save_CXXFLAGS="$CXXFLAGS"
+                save_LIBS="$LIBS"
+                CXXFLAGS="$PANGOX_CFLAGS $CXXFLAGS"
+                LIBS="$LIBS $PANGOX_LIBS"
+                AC_CHECK_FUNCS([pango_font_family_is_monospace])
+                CXXFLAGS="$save_CXXFLAGS"
+                LIBS="$save_LIBS"
        fi

        wxUSE_UNIVERSAL="yes"
@@ -3797,31 +3789,6 @@ dnl ---------------------------------------------------------------------------
    fi
 fi

-dnl ---------------------------------------------------------------------------
-dnl X11 session management
-dnl ---------------------------------------------------------------------------
-if test "$wxUSE_DETECT_SM" = "yes"; then
-    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
-        AC_MSG_CHECKING([for -lSM - X11 session management])
-        WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],SM)
-        if test "$ac_find_libraries" != "" ; then
-            WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
-            if test "$ac_path_to_link" != " -L/usr/lib" ; then
-                LDFLAGS="$LDFLAGS $ac_path_to_link"
-            fi
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lSM"
-            AC_MSG_RESULT([yes])
-        else
-            AC_MSG_RESULT([no])
-            AC_MSG_WARN([libSM not found; disabling session management detection])
-            wxUSE_DETECT_SM="no"
-        fi
-    else
-        wxUSE_DETECT_SM="no"
-    fi
-fi
-
-
 dnl ---------------------------------------------------------------------------
 dnl OpenGL libraries
 dnl ---------------------------------------------------------------------------
@@ -6589,10 +6556,6 @@ if test "$wxUSE_DISPLAY" = "yes"; then
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
 fi

-if test "$wxUSE_DETECT_SM" = "yes"; then
-    AC_DEFINE(wxUSE_DETECT_SM)
-fi
-
 if test "$wxUSE_GAUGE" = "yes"; then
  AC_DEFINE(wxUSE_GAUGE)
  USES_CONTROLS=1
@@ -6963,6 +6926,10 @@ if test "$wxUSE_RICHTEXT" = "yes"; then
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
 fi

+if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
+  AC_DEFINE(wxUSE_GRAPHICS_CONTEXT)
+fi
+
 dnl ---------------------------------------------------------------------------
 dnl wxImage options
 dnl ---------------------------------------------------------------------------
@@ -7069,29 +7036,6 @@ if test "$wxUSE_WIZARDDLG" = "yes"; then
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard"
 fi

-dnl ---------------------------------------------------------------------------
-dnl wxGraphicsContext
-dnl ---------------------------------------------------------------------------
-
-if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
-   if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
-      AC_DEFINE(wxUSE_GRAPHICS_CONTEXT)
-   elif test "$wxUSE_GTK" != 1; then
-      dnl for other builds we'll just wing it for now...
-      AC_DEFINE(wxUSE_GRAPHICS_CONTEXT)
-   else  
-      dnl ...but let's check for cairo availability for wxGTK builds
-      PKG_CHECK_MODULES(CAIRO, cairo,
-	    [
-	    	AC_DEFINE(wxUSE_GRAPHICS_CONTEXT)
-	    ],
-	    [
-	        AC_MSG_WARN([Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT])
-	    ]
-      )
-   fi
-fi
-
 dnl ---------------------------------------------------------------------------
 dnl wxMediaCtrl
 dnl ---------------------------------------------------------------------------
--- a/contrib/src/Makefile.in
+++ b/contrib/src/Makefile.in
@@ -1,6 +1,6 @@
 # $Id$

-CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg deprecated #animate #applet
+CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg deprecated animate #applet

 all:
 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
--- a/contrib/src/gizmos/multicell.cpp
+++ b/contrib/src/gizmos/multicell.cpp
@@ -4,7 +4,7 @@
 // Author:      Jonathan Bayer
 // Modified by:
 // Created:
-// RCS-ID:      $Id$
+// RCS-ID:      $Id:
 // Copyright:   (c) Jonathan Bayer
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -651,3 +651,4 @@ void wxMultiCellCanvas :: CalculateConstraints()
 }

 /*** End of File ***/
+
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,3 @@
-wxwidgets2.7 (2.7.1.2-0) unstable; urgency=low
-
-  * Fixed a bug in the MaskedEdit controls caused by conflicting IsEmpty methods.
-  * Patch #1579280: Some mimetype optimizations on unix-like systems.
-
- -- Robin Dunn <robin@alldunn.com>  Sat, 21 Oct 2006 22:33:41 -0700
-
-wxwidgets2.7 (2.7.1.1-0) unstable; urgency=low
-
-  * First 2.7.x release from wxPython team.
-  * Many enhancements, changes, fixes and updates.  See 
-    http://wxpython.org/CHANGES.txt for details.
-
- -- Robin Dunn <robin@alldunn.com>  Wed, 18 Oct 2006 17:09:53 -0700
-
 wxwidgets2.7 (2.7.0.0-2) unstable; urgency=low

  * Fixes to ansi packages builds
--- a/debian/control.in
+++ b/debian/control.in
@@ -148,18 +148,6 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython version selector
 .
 This package provides the wxPython version selector.

-Package: python-wxaddons
-Architecture: all
-Section: python
-Conflicts: python-wxgtk2.6
-Replaces:
-Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython add-on packages base)
- wxWidgets (formerly known as wxWindows) is a class library for C++ providing
- GUI components and other facilities on several popular platforms (and some
- unpopular ones as well).  For more information see http://wxwidgets.org
- .
- This package provides a base Python package for 3rd party add-ons.
-
 Package: python-wxtools
 Architecture: all
 Section: python
--- a/debian/rules
+++ b/debian/rules
@@ -110,8 +110,6 @@ GTK_CONFIGURE_OPTIONS = $(COMMON_CONFIGURE_OPTIONS) \
    --enable-sound \
    --with-sdl \
    --enable-display \
-    --enable-geometry \
-    --enable-graphics_ctx \
    --with-libjpeg=sys \
    --with-libpng=sys \
    --with-libtiff=sys \
@@ -158,7 +156,6 @@ package_gtk_dbg         := libwxgtk$(release)$(unicode_suffix)-dbg
 package_gtk_py_lib      := python-wxgtk$(release)$(unicode_suffix)
 package_gtk_py_ver       = python-wxversion
 package_gtk_py_tools     = python-wxtools
-package_gtk_py_addons    = python-wxaddons

 package_headers         := wx$(release)-headers
 package_i18n            := wx$(release)-i18n
@@ -168,7 +165,7 @@ package_common           = wx-common

 # The packages listed here are common to all wx versions, and may be provided
 # by another source package if more than one is in the release simultaneously.
-common_packages	:= $(package_common) $(package_gtk_py_ver) $(package_gtk_py_tools) $(package_gtk_py_addons)
+common_packages	:= $(package_common) $(package_gtk_py_ver) $(package_gtk_py_tools)


 package_gtk_dbg_py      := python-wxgtk$(release)$(unicode_suffix)-dbg
@@ -733,8 +730,6 @@ else
 	rm debian/$(package_gtk_py_lib)/$(pydir)/wxversion.py
 endif

-
-
 install-gtk-py-tools: DH_OPTIONS=-p$(package_gtk_py_tools)
 install-gtk-py-tools: install-gtk-py-ver
 	dh_testdir
@@ -773,20 +768,7 @@ endif

 	rm -r debian/$(package_gtk_py_lib)/usr/bin

-install-gtk-py-addons: DH_OPTIONS=-p$(package_gtk_py_addons)
-install-gtk-py-addons: install-gtk-py-tools
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-ifndef DEBIAN_WX_DEFAULT_VERSION
-
-	dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) $(pydir)/wxaddons
-else
-	rm -r debian/$(package_gtk_py_lib)/$(pydir)/wxaddons
-endif
-
-
-install-gtk-py: install-gtk-py-addons
+install-gtk-py: install-gtk-py-tools


 install-common: DH_OPTIONS=-p$(package_common)
--- a/distrib/scripts/Bakefiles.release.bkgen
+++ b/distrib/scripts/Bakefiles.release.bkgen
@@ -2,6 +2,6 @@
 <bakefile-gen>
  <include file="../../build/bakefiles/Bakefiles.bkgen"/>
  <!-- add extra formats to release -->
-  <enable-formats>gnu,dmars,dmars_smake,msevc4prj</enable-formats>
+  <enable-formats>dmars,dmars_smake,msevc4prj</enable-formats>
 </bakefile-gen>

--- 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.7.1-rc
 BUILD_TAG=HEAD


--- a/distrib/scripts/create_archives.sh
+++ b/distrib/scripts/create_archives.sh
@@ -114,20 +114,11 @@ doinit()
 dospinport(){
    port=$1
    
-    case "$port" in
-        all)
-            portname="Widgets";;
-        base)
-            portname="Base";;
-        motif)
-            portname="Motif";;
-        mac)
-            portname="Mac";;
-        *)
-            # for all the others (DFB, GTK, MGL, MSW, X11) just use the
-            # upper-case version as they are abbreviations
-            portname=`echo $port | tr '[a-z]' '[A-Z]'`;;
-    esac
+    if [ $port != "all" ]; then
+        portname="`echo $port|tr '[a-z]' '[A-Z]'`"    
+    else
+        portname="Widgets"
+    fi
    
    echo "Creating wx$portname distribution..."

--- a/distrib/scripts/manifests/dmc.rsp
+++ b/distrib/scripts/manifests/dmc.rsp
@@ -114,6 +114,7 @@ samples/printing/makefile.dm?
 samples/propsize/makefile.dm?
 samples/regtest/makefile.dm?
 samples/render/makefile.dm?
+samples/richedit/makefile.dm?
 samples/rotate/makefile.dm?
 samples/sashtest/makefile.dm?
 samples/scroll/makefile.dm?
--- a/distrib/scripts/manifests/generic.rsp
+++ b/distrib/scripts/manifests/generic.rsp
@@ -714,7 +714,6 @@ samples/internat/*.ico
 samples/internat/*.bmp
 samples/internat/*.mo
 samples/internat/*.pro
-samples/internat/ar/*.?o
 samples/internat/bg/*.mo
 samples/internat/bg/*.po
 samples/internat/cs/*.mo
--- a/distrib/scripts/manifests/gtk.rsp
+++ b/distrib/scripts/manifests/gtk.rsp
@@ -9,7 +9,6 @@ docs/gtk/makewxgtk
 include/wx/gtk/*.h
 include/wx/gtk/*.xpm
 include/wx/gtk/gnome/*.h
-include/wx/gtk/private/*.h

 include/wx/mac/corefoundation/*.h
 src/mac/corefoundation/*.cpp
--- a/distrib/scripts/manifests/x11.rsp
+++ b/distrib/scripts/manifests/x11.rsp
@@ -10,7 +10,6 @@ src/x11/*.inc
 src/x11/*.xbm

 include/wx/x11/*.h
-include/wx/gtk/private/string.h
 include/wx/x11/nanox/X11/*.h

 include/wx/mac/corefoundation/*.h
--- a/distrib/scripts/pre-flight.sh
+++ b/distrib/scripts/pre-flight.sh
@@ -136,6 +136,6 @@ md5sum ${FTPDIR}/wx* > ${FTPDIR}/MD5SUM

 ## make sure updated at is really last
 sleep 10
-echo cvs checkout done at  `date -u` > ${FTPDIR}/updated_at.txt
+echo cvs checkout done at  date -u > ${FTPDIR}/updated_at.txt
       
 echo "Delivery complete. Flying."
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -5,25 +5,11 @@ wxWidgets Change Log - For more verbose changes, see the manual
 INCOMPATIBLE CHANGES SINCE 2.6.x
 ================================

-Changes in behaviour not resulting in compilation errors, please read this!
---------------------------------------------------------------------------
-
- For all wxInputStreams, Eof() becomes true after an attempt has been made
-  to read _past_ the end of file.
- wxFileName::DirExists() checks if the path of the file is a directory, not
-  if the whole name is a directory
- wxDialog::CreateButtonSizer() may return NULL now, please see the manual
- wxStaticBoxSizer now deletes the associated wxStaticBox when it is deleted
- Windows calling CaptureMouse() are now required to handle the
-  wxEVT_MOUSE_CAPTURE_LOST event and not call ReleaseMouse() in this case
-
-
-Changes in behaviour which may result in compilation errors
-----------------------------------------------------------
-
 - wxFontData::GetColour() now returns a const colour.
 - wxDC objects can't be created directly now (this never worked, now it doesn't
  even compile).
+- For all wxInputStreams, Eof() becomes true after an attempt has been made
+  to read _past_ the end of file.
 - wxCHECK family of macros now must be followed by a semicolon.
 - wxMBConv::cMB2WC() and cWC2MB() take size of the input buffer and return
  length of the converted string in all cases now.
@@ -40,12 +26,17 @@ Changes in behaviour which may result in compilation errors
  override it.
 - wxFontEnumerator::GetFacenames() and GetEncodings() now return arrays and
  not pointers to arrays.
+- wxStaticBoxSizer now deletes the associated wxStaticBox when it is deleted.
+- Windows calling CaptureMouse() are now required to handle
+  the wxEVT_MOUSE_CAPTURE_LOST event.
 - SetDefaultItem() method was moved from wxPanel to wxTopLevelWindow
 - wxDialog::OnOK/OnCancel() don't exist any more, use SetAffirmative/EscapeId()
 - wxPathList doesn't derive from (deprecated) wxStringList any more
 - wxGLContext class has no 1:1 coupling to a wxGLCanvas class any more.
  As a consequence, the class interface changed largely.
  Code updates, if any are required at all, are easy to accomplish though.
+- wxDialog::CreateButtonSizer() may return NULL now, please see the manual
+


 Deprecated methods since 2.6.x and their replacements
@@ -55,24 +46,12 @@ Deprecated methods since 2.6.x and their replacements
 - wxDC::BeginDrawing() and wxDC::EndDrawing() deprecated, just don't use them.


-Major new features in 2.7 release
---------------------------------
+Major changes in 2.7 release
+----------------------------

 - New AUI library supporting docking windows and much more


-2.7.2
-----
-
-All (GUI): 
-
- wxMemoryDC constructor now optionally accepts a wxBitmap parameter,
-  calling SelectObject itself if a valid bitmap is passed.
- Reverted wxBuffered[Paint]DC to pre 2.7.1 state, added
-  wxAutoBufferedPaintDC and wxAutoBufferedPaintDCFactory.
-
-
-
 2.7.1
 -----

--- a/docs/latex/wx/bufferdc.tex
+++ b/docs/latex/wx/bufferdc.tex
@@ -22,12 +22,11 @@ your \texttt{OnPaint()} handler, you should look at
 \helpref{wxBufferedPaintDC}{wxbufferedpaintdc} or \helpref{wxAutoBufferedPaintDC}{wxautobufferedpaintdc}.

 Please note that GTK+ 2.0 as well as OS X provide double buffering themselves
-+natively. Use \helpref{wxWindow::IsDoubleBuffered}{wxwindowisdoublebuffered} to
-+determine whether you need to use buffering or not.
+natively. wxBufferedDC is aware of this however, and will bypass the buffering
+unless explicit buffer bitmap is given.

 \wxheading{Derived from}

-\helpref{wxMemoryDC}{wxmemorydc}\\
 \helpref{wxDC}{wxdc}\\
 \helpref{wxObject}{wxobject}

@@ -49,10 +48,10 @@ Please note that GTK+ 2.0 as well as OS X provide double buffering themselves

 \func{}{wxBufferedDC}{\void}

-\func{}{wxBufferedDC}{\param{wxDC *}{dc}, \param{const wxSize\& }{area}, \param{int }{style = wxBUFFER\_CLIENT\_AREA}}
-
 \func{}{wxBufferedDC}{\param{wxDC *}{dc}, \param{const wxBitmap\& }{buffer}, \param{int }{style = wxBUFFER\_CLIENT\_AREA}}

+\func{}{wxBufferedDC}{\param{wxWindow*}{window}, \param{wxDC *}{dc}, \param{const wxSize\& }{area}, \param{int }{style = wxBUFFER\_CLIENT\_AREA}}
+
 If you use the first, default, constructor, you must call one of the 
 \helpref{Init}{wxbuffereddcinit} methods later in order to use the object.

@@ -65,6 +64,10 @@ must not be called after using them.
 flushed to this DC when this object is destroyed.  You may pass NULL
 in order to just initialize the buffer, and not flush it.}

+\docparam{window}{The window on which the dc paints. May be NULL, but
+you should normally specify this so that the DC can be aware whether the
+surface is natively double-buffered or not.}
+
 \docparam{area}{The size of the bitmap to be used for buffering (this bitmap is
 created internally when it is not given explicitly).}

@@ -80,10 +83,10 @@ device context).}

 \membersection{wxBufferedDC::Init}\label{wxbuffereddcinit}

-\func{void}{Init}{\param{wxDC *}{dc}, \param{const wxSize\& }{area}, \param{int }{style = wxBUFFER\_CLIENT\_AREA}}
-
 \func{void}{Init}{\param{wxDC *}{dc}, \param{const wxBitmap\& }{buffer}, \param{int }{style = wxBUFFER\_CLIENT\_AREA}}

+\func{void}{Init}{\param{wxWindow*}{window}, \param{wxDC *}{dc}, \param{const wxSize\& }{area}, \param{int }{style = wxBUFFER\_CLIENT\_AREA}}
+
 These functions initialize the object created using the default constructor.
 Please see \helpref{constructors documentation}{wxbuffereddcctor} for details.

@@ -113,7 +116,6 @@ already does this internally for the real underlying wxPaintDC.
 \wxheading{Derived from}

 \helpref{wxBufferedDC}{wxbuffereddc}\\
-\helpref{wxMemoryDC}{wxmemorydc}\\
 \helpref{wxDC}{wxdc}\\
 \helpref{wxObject}{wxobject}

--- a/docs/latex/wx/memorydc.tex
+++ b/docs/latex/wx/memorydc.tex
@@ -41,14 +41,13 @@ can be reselected into another memory DC.

 \membersection{wxMemoryDC::wxMemoryDC}\label{wxmemorydcctor}

-\func{}{wxMemoryDC}{\param{const wxBitmap\& }{bitmap = wxNullBitmap}}
+\func{}{wxMemoryDC}{\void}

 Constructs a new memory device context.

 Use the {\it Ok} member to test whether the constructor was successful
-in creating a usable device context. If you don't pass a valid bitmap
-to the constructor, don't forget to select a bitmap into the DC before
-drawing on it.
+in creating a usable device context. Don't forget to select a bitmap
+into the DC before drawing on it.

 \membersection{wxMemoryDC::SelectObject}\label{wxmemorydcselectobject}

--- a/docs/latex/wx/window.tex
+++ b/docs/latex/wx/window.tex
@@ -3603,10 +3603,9 @@ This function is currently only implemented under MSW.

 Calling this method immediately repaints the invalidated area of the window and
 all of its children recursively while this would usually only happen when the
-flow of control returns to the event loop. 
-Notice that this function doesn't invalidate any area of the window so
-nothing happens if nothing has been invalidated (i.e. marked as requiring
-a redraw). Use \helpref{Refresh}{wxwindowrefresh} first if you want to
+flow of control returns to the event loop. Notice that this function doesn't
+refresh the window and does nothing if the window hadn't been already
+repainted. Use \helpref{Refresh}{wxwindowrefresh} first if you want to
 immediately redraw the window unconditionally.


--- a/include/wx/animate.h
+++ b/include/wx/animate.h
@@ -19,7 +19,6 @@
 #include "wx/animdecod.h"
 #include "wx/control.h"
 #include "wx/timer.h"
-#include "wx/bitmap.h"

 class WXDLLIMPEXP_ADV wxAnimation;

@@ -65,6 +64,7 @@ protected:
 // auto-resizes by default to fit the new animation when SetAnimation() is called
 #define wxAC_DEFAULT_STYLE       (wxNO_BORDER)

+
 class WXDLLIMPEXP_ADV wxAnimationCtrlBase : public wxControl
 {
 public:
@@ -82,13 +82,6 @@ public:     // public API

    virtual bool IsPlaying() const = 0;

-    virtual void SetInactiveBitmap(const wxBitmap &bmp);
-    wxBitmap GetInactiveBitmap() const
-        { return m_bmpStatic; }
-
-protected:
-    wxBitmap m_bmpStatic;
-
 private:
    DECLARE_ABSTRACT_CLASS(wxAnimationCtrlBase)
 };
@@ -98,7 +91,7 @@ private:
 // include the platform-specific version of the wxAnimationCtrl class
 // ----------------------------------------------------------------------------

-#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
+#if defined(__WXGTK20__)
    #include "wx/gtk/animate.h"
 #else
    #include "wx/generic/animate.h"
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -118,10 +118,6 @@ 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 
-    // "KDE" or "GNOME". May return an empty string.
-    virtual wxString GetDesktopEnvironment() const { return wxEmptyString; }
 };

 // ----------------------------------------------------------------------------
--- a/include/wx/aui/floatpane.h
+++ b/include/wx/aui/floatpane.h
@@ -35,24 +35,18 @@ public:
    wxFloatingPane(wxWindow* parent,
                   wxFrameManager* owner_mgr,
                   const wxPaneInfo& pane,
-                   wxWindowID id = wxID_ANY,
-                   long style = wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION |
-                                wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | 
-                                wxCLIP_CHILDREN
+                   wxWindowID id = wxID_ANY
                   );
    virtual ~wxFloatingPane();
    void SetPaneWindow(const wxPaneInfo& pane);
-    
-protected:
-    virtual void OnMoveStart();
-    virtual void OnMoving(const wxRect& window_rect, wxDirection dir);
-    virtual void OnMoveFinished();
-    
 private:
    void OnSize(wxSizeEvent& event);
    void OnClose(wxCloseEvent& event);
    void OnMoveEvent(wxMoveEvent& event);
    void OnIdle(wxIdleEvent& event);
+    void OnMoveStart();
+    void OnMoving(const wxRect& window_rect, wxDirection dir);
+    void OnMoveFinished();
    void OnActivate(wxActivateEvent& event);
    static bool isMouseDown();
 private:
--- a/include/wx/aui/framemanager.h
+++ b/include/wx/aui/framemanager.h
@@ -218,7 +218,6 @@ public:
    bool IsRightDockable() const { return HasFlag(optionRightDockable); }
    bool IsFloatable() const { return HasFlag(optionFloatable); }
    bool IsMovable() const { return HasFlag(optionMovable); }
-    bool IsDestroyOnClose() const { return HasFlag(optionDestroyOnClose); }
    bool HasCaption() const { return HasFlag(optionCaption); }
    bool HasGripper() const { return HasFlag(optionGripper); }
    bool HasBorder() const { return HasFlag(optionPaneBorder); }
@@ -383,7 +382,7 @@ public:



-class WXDLLIMPEXP_AUI wxFloatingPane;
+

 class WXDLLIMPEXP_AUI wxFrameManager : public wxEvtHandler
 {
@@ -428,8 +427,6 @@ public:
                 int insert_level = wxAUI_INSERT_PANE);

    bool DetachPane(wxWindow* window);
-    
-    void ClosePane(wxPaneInfo& pane_info);

    wxString SavePaneInfo(wxPaneInfo& pane);
    void LoadPaneInfo(wxString pane_part, wxPaneInfo &pane);
@@ -443,7 +440,6 @@ public:


 public:
-    virtual wxFloatingPane * CreateFloatingFrame(wxWindow* parent, const wxPaneInfo& p);

    void DrawHintRect(wxWindow* pane_window,
                       const wxPoint& pt,
--- a/include/wx/bmpcbox.h
+++ b/include/wx/bmpcbox.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     Aug-31-2006
 // Copyright:   (c) Jaakko Salli
-// RCS-ID:      $Id$
+// RCS-ID:      $Id:
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

--- a/include/wx/bookctrl.h
+++ b/include/wx/bookctrl.h
@@ -42,14 +42,6 @@ enum
    wxBK_HITTEST_ONPAGE  = 8    // not on tab control, but over the selected page
 };

-// wxBookCtrl flags (common for wxNotebook, wxListbook, wxChoicebook, wxTreebook)
-#define wxBK_DEFAULT          0x0000
-#define wxBK_TOP              0x0010
-#define wxBK_BOTTOM           0x0020
-#define wxBK_LEFT             0x0040
-#define wxBK_RIGHT            0x0080
-#define wxBK_ALIGN_MASK       (wxBK_TOP | wxBK_BOTTOM | wxBK_LEFT | wxBK_RIGHT)
-
 // ----------------------------------------------------------------------------
 // wxBookCtrlBase
 // ----------------------------------------------------------------------------
--- a/include/wx/choicebk.h
+++ b/include/wx/choicebk.h
@@ -24,13 +24,6 @@ class WXDLLEXPORT wxChoice;
 extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED;
 extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING;

-// wxChoicebook flags
-#define wxCHB_DEFAULT          wxBK_DEFAULT
-#define wxCHB_TOP              wxBK_TOP
-#define wxCHB_BOTTOM           wxBK_BOTTOM
-#define wxCHB_LEFT             wxBK_LEFT
-#define wxCHB_RIGHT            wxBK_RIGHT
-#define wxCHB_ALIGN_MASK       wxBK_ALIGN_MASK

 // ----------------------------------------------------------------------------
 // wxChoicebook
--- a/include/wx/cocoa/NSPanel.h
+++ b/include/wx/cocoa/NSPanel.h
@@ -4,7 +4,7 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id$
+// RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
--- a/include/wx/cocoa/NSView.h
+++ b/include/wx/cocoa/NSView.h
@@ -4,7 +4,7 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -30,7 +30,7 @@ protected:
    static void *sm_cocoaObserver;
 public:
    virtual wxWindow* GetWxWindow() const
-    {   return NULL; }
+    {	return NULL;	}
    virtual void Cocoa_FrameChanged(void) = 0;
    virtual bool Cocoa_acceptsFirstMouse(bool &acceptsFirstMouse, WX_NSEvent theEvent)
    {   return false; }
@@ -61,9 +61,8 @@ public:
    virtual bool Cocoa_otherMouseUp(WX_NSEvent theEvent)
    {   return false; }
    virtual bool Cocoa_resetCursorRects()
-    {   return false; }
+    {	return false; }
    virtual ~wxCocoaNSView() { }
 };

-#endif
-    // __WX_COCOA_NSVIEW_H__
+#endif // _WX_COCOA_NSVIEW_H_
--- a/include/wx/cocoa/NSWindow.h
+++ b/include/wx/cocoa/NSWindow.h
@@ -4,7 +4,7 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id$
+// RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
--- a/include/wx/cocoa/ObjcAssociate.h
+++ b/include/wx/cocoa/ObjcAssociate.h
@@ -2,9 +2,9 @@
 // Name:        wx/cocoa/ObjcAssociate.h
 // Purpose:     Associates an Objective-C class with a C++ class
 // Author:      David Elliott
-// Modified by:
+// Modified by: 
 // Created:     2002/12/03
-// RCS-ID:      $Id$
+// RCS-ID:      $Id:
 // Copyright:   (c) 2002 David Elliott <dfe@cox.net>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -76,3 +76,4 @@ void wxClass::Set##ObjcClass(WX_##ObjcClass cocoaObjcClass) \
 }

 #endif // __WX_COCOA_OBJC_ASSOCIATE_H__
+
--- a/include/wx/cocoa/ObjcPose.h
+++ b/include/wx/cocoa/ObjcPose.h
@@ -2,9 +2,9 @@
 // Name:        wx/cocoa/ObjcPose.h
 // Purpose:     Macros for initializing poseAs, among other things
 // Author:      David Elliott
-// Modified by:
+// Modified by: 
 // Created:     2002/12/03
-// RCS-ID:      $Id$
+// RCS-ID:      $Id:
 // Copyright:   (c) 2002 David Elliott <dfe@cox.net>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,31 +22,31 @@ Objective-C Poser class initialization
 class wxPoseAsInitializer
 {
 public:
-    wxPoseAsInitializer()
-    : m_next(sm_first)
-    {
-        sm_first = this;
-    }
-    virtual ~wxPoseAsInitializer()
-    {
-        sm_first = m_next;
-    }
-    static void InitializePosers()
-    {
-        while(sm_first)
-        {
-            delete sm_first;
-        }
-    };
+	wxPoseAsInitializer()
+	: m_next(sm_first)
+	{
+		sm_first = this;
+	}
+	virtual ~wxPoseAsInitializer()
+	{
+		sm_first = m_next;
+	}
+	static void InitializePosers()
+	{
+		while(sm_first)
+		{
+			delete sm_first;
+		}
+	};
 protected:
-    wxPoseAsInitializer *m_next;
-    static wxPoseAsInitializer *sm_first;
+	wxPoseAsInitializer *m_next;
+	static wxPoseAsInitializer *sm_first;
 };

 class wxDummyForPoseAsInitializer
 {
 public:
-    wxDummyForPoseAsInitializer(void*) {}
+	wxDummyForPoseAsInitializer(void*) {}
 };

 #define WX_IMPLEMENT_POSER(poser) \
@@ -65,3 +65,4 @@ wxDummyForPoseAsInitializer wxDummyPoseAsInitializerFor##poser(new wxPoseAsIniti
 #endif // __OBJC__

 #endif // __WX_COCOA_PRIVATE_POSER_H__
+
--- a/include/wx/cocoa/bitmap.h
+++ b/include/wx/cocoa/bitmap.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/bitmap.h
+// Name:        include/wx/cocoa/bitmap.h
 // Purpose:     wxBitmap class
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/07/19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __WX_COCOA_BITMAP_H__
@@ -86,7 +86,7 @@ public:

    // destructor
    virtual ~wxBitmap();
-
+  
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
@@ -131,7 +131,7 @@ public:
    void SetMask(wxMask *mask) ;

    int GetBitmapType() const;
-
+  
    inline bool operator == (const wxBitmap& bitmap) const
    {   return m_refData == bitmap.m_refData; }
    inline bool operator != (const wxBitmap& bitmap) const
@@ -155,5 +155,4 @@ class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase
    DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
 };

-#endif
-    // __WX_COCOA_BITMAP_H__
+#endif // __WX_COCOA_BITMAP_H__
--- a/include/wx/cocoa/bmpbuttn.h
+++ b/include/wx/cocoa/bmpbuttn.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id$
+// RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __WX_COCOA_BMPBUTTN_H__
--- a/include/wx/cocoa/button.h
+++ b/include/wx/cocoa/button.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/29
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: 
 // Copyright:   (c) 2002 David Elliott
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __WX_COCOA_BUTTON_H__
@@ -36,7 +36,7 @@ public:
    {
        Create(parent, winid, label, pos, size, style, validator, name);
    }
-
+    

    bool Create(wxWindow *parent, wxWindowID winid,
            const wxString& label = wxEmptyString,
@@ -44,7 +44,7 @@ public:
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
-
+    
    virtual ~wxButton();

 // ------------------------------------------------------------------------
@@ -61,5 +61,4 @@ public:
    wxSize DoGetBestSize() const;
 };

-#endif
-    // __WX_COCOA_BUTTON_H__
+#endif // __WX_COCOA_BUTTON_H__
--- a/include/wx/cocoa/control.h
+++ b/include/wx/cocoa/control.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __WX_COCOA_CONTROL_H__
@@ -53,7 +53,7 @@ public:
    // --------------------------

    void OnEraseBackground(wxEraseEvent& event);
-
+   
    virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }

    // Calls the callback and appropriate event handlers
@@ -65,5 +65,4 @@ protected:
    virtual wxSize DoGetBestSize() const;
 };

-#endif
-    // __WX_COCOA_CONTROL_H__
+#endif // __WX_COCOA_CONTROL_H__
--- a/include/wx/cocoa/cursor.h
+++ b/include/wx/cocoa/cursor.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/cursor.h
+// Name:        cursor.h
 // Purpose:     wxCursor class
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2002/11/27
-// RCS-ID:      $Id$
+// RCS-ID:      
 // Copyright:   (c) David Elliott
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _WX_COCOA_CURSOR_H_
@@ -17,7 +17,7 @@
 class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
 {
    DECLARE_NO_COPY_CLASS(wxCursorRefData)
-
+        
    friend class WXDLLEXPORT wxBitmap;
    friend class WXDLLEXPORT wxCursor;
 public:
@@ -54,9 +54,9 @@ public:

  inline bool operator == (const wxCursor& cursor) const { return m_refData == cursor.m_refData; }
  inline bool operator != (const wxCursor& cursor) const { return m_refData != cursor.m_refData; }
-
+  
  inline WX_NSCursor GetNSCursor() const
-  {
+  {	
    return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0);
  }

@@ -64,5 +64,4 @@ public:

 extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);

-#endif
-    // _WX_COCOA_CURSOR_H_
+#endif // _WX_COCOA_CURSOR_H_
--- a/include/wx/cocoa/dcclient.h
+++ b/include/wx/cocoa/dcclient.h
@@ -6,7 +6,7 @@
 // Created:     2003/04/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __WX_COCOA_DCCLIENT_H__
@@ -66,5 +66,4 @@ protected:
    virtual bool CocoaUnlockFocus();
 };

-#endif
-    // __WX_COCOA_DCCLIENT_H__
+#endif // __WX_COCOA_DCCLIENT_H__
--- a/include/wx/cocoa/dcmemory.h
+++ b/include/wx/cocoa/dcmemory.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __WX_COCOA_DCMEMORY_H__
@@ -18,7 +18,7 @@ class WXDLLEXPORT wxMemoryDC: public wxDC
 {
    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 public:
-    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
+    wxMemoryDC(void);
    wxMemoryDC( wxDC *dc ); // Create compatible DC
    virtual ~wxMemoryDC(void);
    virtual void SelectObject(const wxBitmap& bitmap);
@@ -36,5 +36,4 @@ protected:
        int logicalFunc, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask);
 };

-#endif
-    // __WX_COCOA_DCMEMORY_H__
+#endif // __WX_COCOA_DCMEMORY_H__
--- a/include/wx/cocoa/dcscreen.h
+++ b/include/wx/cocoa/dcscreen.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id$
+// RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __WX_COCOA_DCSCREEN_H__
--- a/include/wx/cocoa/frame.h
+++ b/include/wx/cocoa/frame.h
@@ -4,7 +4,7 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id$
+// RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,7 +15,7 @@
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;

-class WXDLLEXPORT wxFrame: public wxFrameBase
+class WXDLLEXPORT wxFrame: public wxFrameBase 
 {
    DECLARE_EVENT_TABLE()
    DECLARE_DYNAMIC_CLASS(wxFrame)
@@ -95,7 +95,7 @@ public:
 #if wxUSE_TOOLBAR
    // create main toolbar bycalling OnCreateToolBar()
    virtual wxToolBar* CreateToolBar(long style = -1,
-                                     wxWindowID winid = wxID_ANY,
+                                     wxWindowID winid = -1,
                                     const wxString& name = wxToolBarNameStr);
    // sets the main tool bar
    virtual void SetToolBar(wxToolBar *toolbar);
--- a/include/wx/cocoa/gauge.h
+++ b/include/wx/cocoa/gauge.h
@@ -6,7 +6,7 @@
 // Created:     2003/07/15
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __WX_COCOA_GAUGE_H__
@@ -70,5 +70,4 @@ protected:
    virtual wxSize DoGetBestSize() const;
 };

-#endif
-    // __WX_COCOA_GAUGE_H__
+#endif // __WX_COCOA_GAUGE_H__
--- a/include/wx/cocoa/icon.h
+++ b/include/wx/cocoa/icon.h
@@ -6,7 +6,7 @@
 // Created:     2003/08/11
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _WX_COCOA_ICON_H__
@@ -58,5 +58,4 @@ public:
    bool CreateFromXpm(const char **bits);
 };

-#endif
-    // _WX_COCOA_ICON_H__
+#endif // _WX_COCOA_ICON_H__
--- a/include/wx/cocoa/radiobut.h
+++ b/include/wx/cocoa/radiobut.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/18
-// RCS-ID:      $Id$
+// RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __WX_COCOA_RADIOBUT_H__
--- a/include/wx/cocoa/region.h
+++ b/include/wx/cocoa/region.h
@@ -2,11 +2,11 @@
 // Name:        wx/cocoa/region.h
 // Purpose:     wxRegion class
 // Author:      David Elliott
-// Modified by:
+// Modified by: 
 // Created:     2004/04/12
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _WX_COCOA_REGION_H__
@@ -68,5 +68,4 @@ public:
    {   return *(wxRegionIterator*)&(this->wxRegionIteratorGeneric::operator=(iter)); }
 };

-#endif
-    //ndef _WX_COCOA_REGION_H__
+#endif //ndef _WX_COCOA_REGION_H__
--- a/include/wx/cocoa/scrolbar.h
+++ b/include/wx/cocoa/scrolbar.h
@@ -6,7 +6,7 @@
 // Created:     2004/04/25
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _WX_COCOA_SCROLBAR_H__
@@ -71,5 +71,4 @@ protected:
    int m_pageSize;
 };

-#endif
-    // _WX_COCOA_SCROLBAR_H__
+#endif // _WX_COCOA_SCROLBAR_H__
--- a/include/wx/cocoa/slider.h
+++ b/include/wx/cocoa/slider.h
@@ -6,7 +6,7 @@
 // Created:     2003/06/19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __WX_COCOA_SLIDER_H__
@@ -79,5 +79,4 @@ public:

 };

-#endif
-    // __WX_COCOA_SLIDER_H__
+#endif // __WX_COCOA_SLIDER_H__
--- a/include/wx/cocoa/spinbutt.h
+++ b/include/wx/cocoa/spinbutt.h
@@ -6,7 +6,7 @@
 // Created:     2003/07/14
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __WX_COCOA_SPINBUTT_H__
@@ -27,7 +27,7 @@ class WXDLLEXPORT wxSpinButton: public wxSpinButtonBase// , protected wxCocoaNSS
 // ------------------------------------------------------------------------
 public:
    wxSpinButton() { }
-    wxSpinButton(wxWindow *parent, wxWindowID winid = wxID_ANY,
+    wxSpinButton(wxWindow *parent, wxWindowID winid = -1,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
@@ -36,7 +36,7 @@ public:
        Create(parent, winid, pos, size, style, name);
    }

-    bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY,
+    bool Create(wxWindow *parent, wxWindowID winid = -1,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSP_HORIZONTAL,
@@ -60,5 +60,4 @@ public:
    virtual void SetRange(int minValue, int maxValue);
 };

-#endif
-    // __WX_COCOA_SPINBUTT_H__
+#endif // __WX_COCOA_SPINBUTT_H__
--- a/include/wx/cocoa/statbmp.h
+++ b/include/wx/cocoa/statbmp.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id$
+// RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __WX_COCOA_STATBMP_H__
--- a/include/wx/cocoa/statbox.h
+++ b/include/wx/cocoa/statbox.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/18
-// RCS-ID:      $Id$
+// RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __WX_COCOA_STATBOX_H__
--- a/include/wx/cocoa/statline.h
+++ b/include/wx/cocoa/statline.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/18
-// RCS-ID:      $Id$
+// RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __WX_COCOA_STATLINE_H__
--- a/include/wx/cocoa/stattext.h
+++ b/include/wx/cocoa/stattext.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __WX_COCOA_STATTEXT_H__
@@ -55,5 +55,4 @@ public:
    void SetLabel(const wxString& label);
 };

-#endif
-    // __WX_COCOA_STATTEXT_H__
+#endif // __WX_COCOA_STATTEXT_H__
--- a/include/wx/cocoa/textctrl.h
+++ b/include/wx/cocoa/textctrl.h
@@ -4,7 +4,7 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id$
+// RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -856,10 +856,6 @@ private:
    #include "wx/os2/dc.h"
 #endif

-#if wxUSE_GRAPHICS_CONTEXT
-    #include "wx/dcgraph.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // helper class: you can use it to temporarily change the DC text colour and
 // restore it automatically when the object goes out of scope
--- a/include/wx/dcbuffer.h
+++ b/include/wx/dcbuffer.h
@@ -16,15 +16,29 @@
 #include "wx/dcclient.h"
 #include "wx/window.h"

+
+// I think this patch should be test on wxMac with
+// wxTEST_PAINTDCDELEGATION as 1, and then with
+// with wxTEST_MEMORYDCDELEGATION as 1.
+#define wxTEST_PAINTDCDELEGATION        0
+#define wxTEST_MEMORYDCDELEGATION       0
+
+
 // Split platforms into two groups - those which have well-working
 // double-buffering by default, and those which do not.
-#if defined(__WXMAC__) || defined(__WXGTK20__) || defined(__WXDFB__)
+#if defined(__WXMAC__) || defined(__WXGTK20__)
    #define wxALWAYS_NATIVE_DOUBLE_BUFFER       1
 #else
    #define wxALWAYS_NATIVE_DOUBLE_BUFFER       0
 #endif


+#if wxTEST_PAINTDCDELEGATION || wxTEST_MEMORYDCDELEGATION
+    #undef wxALWAYS_NATIVE_DOUBLE_BUFFER
+    #define wxALWAYS_NATIVE_DOUBLE_BUFFER 0
+#endif
+
+
 // ----------------------------------------------------------------------------
 // Double buffering helper.
 // ----------------------------------------------------------------------------
@@ -37,11 +51,12 @@
 // does not prepare the window DC
 #define wxBUFFER_CLIENT_AREA        0x02

-class WXDLLEXPORT wxBufferedDC : public wxMemoryDC
+class WXDLLEXPORT wxBufferedDC : public wxDC
 {
 public:
    // Default ctor, must subsequently call Init for two stage construction.
-    wxBufferedDC() : m_dc( 0 ), m_buffer(NULL), m_style(0)
+    wxBufferedDC() : wxDC(), m_targetDc(NULL), m_mainDc(NULL),
+                     m_buffer(NULL), m_style(0)
    {
    }

@@ -49,23 +64,38 @@ public:
    wxBufferedDC(wxDC *dc,
                 const wxBitmap &buffer = wxNullBitmap,
                 int style = wxBUFFER_CLIENT_AREA)
-        : m_dc( dc ),
-          m_buffer( &buffer ),
-          m_style(style)
+        : wxDC(),
+          m_targetDc(NULL),
+          m_mainDc(NULL)
    {
-        UseBuffer();
+        // All other members except dcs are initialized in Init
+        Init(dc, buffer, style);
    }

    // Construct a wxBufferedDC with an internal buffer of 'area'
    // (where area is usually something like the size of the window
    // being buffered)
    wxBufferedDC(wxDC *dc, const wxSize &area, int style = wxBUFFER_CLIENT_AREA)
-        : m_dc( dc ),
-          m_buffer(NULL),
-          m_style(style)
-
+        : wxDC(),
+          m_targetDc(NULL),
+          m_mainDc(NULL)
    {
-        UseBuffer(area.x, area.y);
+        // All other members except dcs are initialized in Init
+        Init(NULL, dc, area, style);
+    }
+
+    // Same, but also receives window to detect whether it is
+    // natively double-buffered.
+    wxBufferedDC(wxWindow* win,
+                 wxDC *dc,
+                 const wxSize &area,
+                 int style = wxBUFFER_CLIENT_AREA)
+        : wxDC(),
+          m_targetDc(NULL),
+          m_mainDc(NULL)
+    {
+        // All other members except dcs are initialized in Init
+        Init(win, dc, area, style);
    }

    // default copy ctor ok.
@@ -73,31 +103,55 @@ public:
    // The usually desired  action in the dtor is to blit the buffer.
    virtual ~wxBufferedDC()
    {
-        if ( m_dc ) UnMask();
+        UnMask();
    }

-    // These reimplement the actions of the ctors for two stage creation, but
-    // are not used by the ctors themselves to save a few cpu cycles.
    void Init(wxDC *dc,
-              const wxBitmap &buffer=wxNullBitmap,
+              const wxBitmap &buffer,
              int style = wxBUFFER_CLIENT_AREA)
    {
-        wxASSERT_MSG( m_dc == 0 && m_buffer == NULL,
-                      _T("wxBufferedDC already initialised") );
-        m_dc = dc;
+        wxASSERT_MSG( m_mainDc == NULL,
+                      wxT("wxBufferedDC already initialised") );
+        wxASSERT_MSG( buffer.Ok(),
+                      wxT("invalid bitmap") );
+        m_mainDc = dc;
        m_buffer = &buffer;
        m_style = style;
        UseBuffer();
    }

-    void Init(wxDC *dc, const wxSize &area, int style = wxBUFFER_CLIENT_AREA)
+    void Init(wxWindow* win,
+              wxDC *dc,
+              const wxSize &area = wxDefaultSize,
+              int style = wxBUFFER_CLIENT_AREA)
    {
-        wxASSERT_MSG( m_dc == 0 && m_buffer == NULL,
-                      _T("wxBufferedDC already initialised") );
-        m_dc = dc;
-        m_buffer = NULL;
+        wxASSERT_MSG( m_mainDc == NULL,
+                      wxT("wxBufferedDC already initialised") );
+
+        m_mainDc = dc;
        m_style = style;
-        UseBuffer(area.x, area.y);
+
+#if wxTEST_MEMORYDCDELEGATION
+        if ( 0 )
+#elif wxTEST_PAINTDCDELEGATION
+        if ( 1 )
+#else
+        if ( win && win->IsDoubleBuffered() )
+#endif
+        {
+            AttachDC(dc);
+            m_buffer = NULL;
+        }
+        else
+        {
+            PrepareBuffer(win, area);
+            UseBuffer();
+        }
+    }
+
+    void Init(wxDC *dc, const wxSize &area = wxDefaultSize, int style = wxBUFFER_CLIENT_AREA)
+    {
+        Init(NULL, dc, area, style);
    }

    // Blits the buffer to the dc, and detaches the dc from the buffer (so it
@@ -106,45 +160,443 @@ public:
    // Usually called in the dtor or by the dtor of derived classes if the
    // BufferedDC must blit before the derived class (which may own the dc it's
    // blitting to) is destroyed.
-    void UnMask()
-    {
-        wxASSERT_MSG( m_dc != 0,
-                      _T("No underlying DC associated with wxBufferedDC (anymore)") );
-
-        wxCoord x=0, y=0;
-
-        if (m_style & wxBUFFER_CLIENT_AREA)
-            GetDeviceOrigin(&x, &y);
-
-        m_dc->Blit( 0, 0,
-                    m_buffer->GetWidth(), m_buffer->GetHeight(), this,
-                    -x, -y );
-        m_dc = NULL;
-    }
+    void UnMask();

    // Set and get the style
    void SetStyle(int style) { m_style = style; }
    int GetStyle() const { return m_style; }

 private:
-    // check that the bitmap is valid and use it
-    void UseBuffer(wxCoord w = -1, wxCoord h = -1);
+    // Prepares wxMemoryDC.
+    void UseBuffer();

-    // the underlying DC to which we copy everything drawn on this one in
-    // UnMask()
+    // Allocate m_buffer, if necessary.
+    void PrepareBuffer(wxWindow* win, const wxSize& area);
+
+    // DC to which calls are delegated.
+    wxDC*           m_targetDc;
+
+    // This the underlying DC to which we copy everything drawn on
+    // this one in UnMask().
    //
    // NB: Without the existence of a wxNullDC, this must be a pointer, else it
    //     could probably be a reference.
-    wxDC *m_dc;
+    wxDC*           m_mainDc;

    // the buffer (selected in this DC)
-    const wxBitmap *m_buffer;
+    const wxBitmap* m_buffer;

    // the buffering style
-    int m_style;
+    int             m_style;

-    DECLARE_DYNAMIC_CLASS(wxBufferedDC)
    DECLARE_NO_COPY_CLASS(wxBufferedDC)
+public:
+    //
+    // BEGIN DC-DELEGATION IMPLEMENTATION
+    //
+
+    wxDC& GetAttachedDC()
+    {
+        return *m_targetDc;
+    }
+
+    // Use this to set the DC which receives delegated calls.
+    void AttachDC(wxDC* dc)
+    {
+        m_targetDc = dc;
+    #ifdef __WXMSW__
+        SetHDC( dc ? dc->GetHDC() : NULL );
+    #endif
+    }
+
+    // Sets DC to NULL
+    wxDC* DetachDC()
+    {
+        wxDC* retDc = m_targetDc;
+        AttachDC(NULL);
+        return retDc;
+    }
+
+#ifdef __WXGTK__
+    virtual GdkWindow* GetGDKWindow() const
+    {
+        return m_targetDc->GetGDKWindow();
+    }
+    virtual wxBitmap GetSelectedBitmap() const
+    {
+        return m_targetDc->GetSelectedBitmap();
+    }
+#endif
+
+    bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
+              wxDC *source, wxCoord xsrc, wxCoord ysrc,
+              int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord)
+        { return m_targetDc->Blit(xdest, ydest, width, height,
+                                  source, xsrc, ysrc, rop,
+                                  useMask, xsrcMask, ysrcMask); }
+    bool Blit(const wxPoint& destPt, const wxSize& sz,
+              wxDC *source, const wxPoint& srcPt,
+              int rop = wxCOPY, bool useMask = false, const wxPoint& srcPtMask = wxDefaultPosition)
+        { return m_targetDc->Blit(destPt, sz, source, srcPt,
+                                  rop, useMask, srcPtMask); }
+    virtual void CalcBoundingBox(wxCoord x, wxCoord y) { m_targetDc->CalcBoundingBox(x, y); }
+#if defined(__WXWINCE__)
+    void CalculateEllipticPoints( wxList* points,
+                                  wxCoord xStart, wxCoord yStart,
+                                  wxCoord w, wxCoord h,
+                                  double sa, double ea )
+        { m_targetDc->CalculateEllipticPoints(points, xStart, yStart, w,
+                                              h, sa, ea); }
+#endif // defined(__WXWINCE__)
+    virtual bool CanDrawBitmap() const { return m_targetDc->CanDrawBitmap(); }
+    virtual bool CanGetTextExtent() const { return m_targetDc->CanGetTextExtent(); }
+    virtual void Clear() { m_targetDc->Clear(); }
+    virtual void ComputeScaleAndOrigin() { m_targetDc->ComputeScaleAndOrigin(); }
+    void CrossHair(wxCoord x, wxCoord y) { m_targetDc->CrossHair(x, y); }
+    void CrossHair(const wxPoint& pt) { m_targetDc->CrossHair(pt); }
+    virtual void DestroyClippingRegion() { m_targetDc->DestroyClippingRegion(); }
+    wxCoord DeviceToLogicalX(wxCoord x) const { return m_targetDc->DeviceToLogicalX(x); }
+    wxCoord DeviceToLogicalXRel(wxCoord x) const { return m_targetDc->DeviceToLogicalXRel(x); }
+    wxCoord DeviceToLogicalY(wxCoord y) const { return m_targetDc->DeviceToLogicalY(y); }
+    wxCoord DeviceToLogicalYRel(wxCoord y) const { return m_targetDc->DeviceToLogicalYRel(y); }
+#if defined(__WXWINCE__)
+    virtual void DoDrawEllipticArcRot( wxCoord x, wxCoord y,
+                                       wxCoord w, wxCoord h,
+                                       double sa = 0, double ea = 0, double angle = 0 )
+        { m_targetDc->DoDrawEllipticArcRot(x, y, w, h,
+                                           sa, ea, angle); }
+#endif // defined(__WXWINCE__)
+    void DrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
+                 wxCoord xc, wxCoord yc)
+        { m_targetDc->DrawArc(x1, y1, x2, y2,
+                              xc, yc); }
+    void DrawArc(const wxPoint& pt1, const wxPoint& pt2, const wxPoint& centre)
+        { m_targetDc->DrawArc(pt1, pt2, centre); }
+    void DrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
+                    bool useMask = false)
+        { m_targetDc->DrawBitmap(bmp, x, y, useMask); }
+    void DrawBitmap(const wxBitmap &bmp, const wxPoint& pt,
+                    bool useMask = false)
+        { m_targetDc->DrawBitmap(bmp, pt, useMask); }
+    void DrawCheckMark(wxCoord x, wxCoord y,
+                       wxCoord width, wxCoord height)
+        { m_targetDc->DrawCheckMark(x, y, width, height); }
+    void DrawCheckMark(const wxRect& rect) { m_targetDc->DrawCheckMark(rect); }
+    void DrawCircle(wxCoord x, wxCoord y, wxCoord radius) { m_targetDc->DrawCircle(x, y, radius); }
+    void DrawCircle(const wxPoint& pt, wxCoord radius) { m_targetDc->DrawCircle(pt, radius); }
+    void DrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+        { m_targetDc->DrawEllipse(x, y, width, height); }
+    void DrawEllipse(const wxPoint& pt, const wxSize& sz) { m_targetDc->DrawEllipse(pt, sz); }
+    void DrawEllipse(const wxRect& rect) { m_targetDc->DrawEllipse(rect); }
+    void DrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
+                         double sa, double ea)
+        { m_targetDc->DrawEllipticArc(x, y, w, h,
+                                      sa, ea); }
+    void DrawEllipticArc(const wxPoint& pt, const wxSize& sz,
+                         double sa, double ea)
+        { m_targetDc->DrawEllipticArc(pt, sz, sa, ea); }
+#if defined(__WXWINCE__)
+    void DrawEllipticArcRot( wxCoord x, wxCoord y,
+                             wxCoord width, wxCoord height,
+                             double sa = 0, double ea = 0, double angle = 0 )
+        { m_targetDc->DrawEllipticArcRot(x, y, width, height,
+                                         sa, ea, angle); }
+    void DrawEllipticArcRot( const wxPoint& pt,
+                             const wxSize& sz,
+                             double sa = 0, double ea = 0, double angle = 0 )
+        { m_targetDc->DrawEllipticArcRot(pt, sz, sa, ea,
+                                         angle); }
+    void DrawEllipticArcRot( const wxRect& rect,
+                             double sa = 0, double ea = 0, double angle = 0 )
+        { m_targetDc->DrawEllipticArcRot(rect, sa, ea, angle); }
+#endif // defined(__WXWINCE__)
+    void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) { m_targetDc->DrawIcon(icon, x, y); }
+    void DrawIcon(const wxIcon& icon, const wxPoint& pt) { m_targetDc->DrawIcon(icon, pt); }
+    virtual void DrawLabel(const wxString& text,
+                           const wxBitmap& image,
+                           const wxRect& rect,
+                           int alignment = wxALIGN_LEFT | wxALIGN_TOP,
+                           int indexAccel = -1,
+                           wxRect *rectBounding = NULL)
+        { m_targetDc->DrawLabel(text, image, rect, alignment,
+                                indexAccel, rectBounding); }
+    void DrawLabel(const wxString& text, const wxRect& rect,
+                   int alignment = wxALIGN_LEFT | wxALIGN_TOP,
+                   int indexAccel = -1)
+        { m_targetDc->DrawLabel(text, rect, alignment, indexAccel); }
+    void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
+        { m_targetDc->DrawLine(x1, y1, x2, y2); }
+    void DrawLine(const wxPoint& pt1, const wxPoint& pt2) { m_targetDc->DrawLine(pt1, pt2); }
+    void DrawLines(int n, wxPoint points[],
+                   wxCoord xoffset = 0, wxCoord yoffset = 0)
+        { m_targetDc->DrawLines(n, points, xoffset, yoffset); }
+    void DrawLines(const wxList *list,
+                   wxCoord xoffset = 0, wxCoord yoffset = 0)
+        { m_targetDc->DrawLines(list, xoffset, yoffset); }
+    virtual void DrawObject(wxDrawObject* drawobject) { m_targetDc->DrawObject(drawobject); }
+    void DrawPoint(wxCoord x, wxCoord y) { m_targetDc->DrawPoint(x, y); }
+    void DrawPoint(const wxPoint& pt) { m_targetDc->DrawPoint(pt); }
+    void DrawPolyPolygon(int n, int count[], wxPoint points[],
+                         wxCoord xoffset = 0, wxCoord yoffset = 0,
+                         int fillStyle = wxODDEVEN_RULE)
+        { m_targetDc->DrawPolyPolygon(n, count, points, xoffset,
+                                      yoffset, fillStyle); }
+    void DrawPolygon(int n, wxPoint points[],
+                     wxCoord xoffset = 0, wxCoord yoffset = 0,
+                     int fillStyle = wxODDEVEN_RULE)
+        { m_targetDc->DrawPolygon(n, points, xoffset, yoffset,
+                                  fillStyle); }
+    void DrawPolygon(const wxList *list,
+                     wxCoord xoffset = 0, wxCoord yoffset = 0,
+                     int fillStyle = wxODDEVEN_RULE)
+        { m_targetDc->DrawPolygon(list, xoffset, yoffset, fillStyle); }
+    void DrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+        { m_targetDc->DrawRectangle(x, y, width, height); }
+    void DrawRectangle(const wxPoint& pt, const wxSize& sz) { m_targetDc->DrawRectangle(pt, sz); }
+    void DrawRectangle(const wxRect& rect) { m_targetDc->DrawRectangle(rect); }
+    void DrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)
+        { m_targetDc->DrawRotatedText(text, x, y, angle); }
+    void DrawRotatedText(const wxString& text, const wxPoint& pt, double angle)
+        { m_targetDc->DrawRotatedText(text, pt, angle); }
+    void DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height,
+                              double radius)
+        { m_targetDc->DrawRoundedRectangle(x, y, width, height,
+                                           radius); }
+    void DrawRoundedRectangle(const wxPoint& pt, const wxSize& sz,
+                             double radius)
+        { m_targetDc->DrawRoundedRectangle(pt, sz, radius); }
+    void DrawRoundedRectangle(const wxRect& r, double radius)
+        { m_targetDc->DrawRoundedRectangle(r, radius); }
+#if wxUSE_SPLINES
+    void DrawSpline(wxCoord x1, wxCoord y1,
+                    wxCoord x2, wxCoord y2,
+                    wxCoord x3, wxCoord y3)
+        { m_targetDc->DrawSpline(x1, y1, x2, y2,
+                                 x3, y3); }
+    void DrawSpline(int n, wxPoint points[]) { m_targetDc->DrawSpline(n, points); }
+    void DrawSpline(wxList *points) { m_targetDc->DrawSpline(points); }
+#endif // wxUSE_SPLINES
+    void DrawText(const wxString& text, wxCoord x, wxCoord y)
+        { m_targetDc->DrawText(text, x, y); }
+    void DrawText(const wxString& text, const wxPoint& pt) { m_targetDc->DrawText(text, pt); }
+    virtual void EndDoc() { m_targetDc->EndDoc(); }
+    virtual void EndPage() { m_targetDc->EndPage(); }
+    bool FloodFill(wxCoord x, wxCoord y, const wxColour& col,
+                   int style = wxFLOOD_SURFACE)
+        { return m_targetDc->FloodFill(x, y, col, style); }
+    bool FloodFill(const wxPoint& pt, const wxColour& col,
+                   int style = wxFLOOD_SURFACE)
+        { return m_targetDc->FloodFill(pt, col, style); }
+    virtual const wxBrush&  GetBackground() const { return m_targetDc->GetBackground(); }
+    virtual int GetBackgroundMode() const { return m_targetDc->GetBackgroundMode(); }
+    virtual const wxBrush&  GetBrush() const { return m_targetDc->GetBrush(); }
+    virtual wxCoord GetCharHeight() const { return m_targetDc->GetCharHeight(); }
+    virtual wxCoord GetCharWidth() const { return m_targetDc->GetCharWidth(); }
+    void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const
+        { m_targetDc->GetClippingBox(x, y, w, h); }
+    void GetClippingBox(wxRect& rect) const { m_targetDc->GetClippingBox(rect); }
+    void GetClippingBox(long *x, long *y, long *w, long *h) const
+        { m_targetDc->GetClippingBox(x, y, w, h); }
+    virtual int GetDepth() const { return m_targetDc->GetDepth(); }
+    void GetDeviceOrigin(wxCoord *x, wxCoord *y) const { m_targetDc->GetDeviceOrigin(x, y); }
+    wxPoint GetDeviceOrigin() const { return m_targetDc->GetDeviceOrigin(); }
+    void GetDeviceOrigin(long *x, long *y) const { m_targetDc->GetDeviceOrigin(x, y); }
+    virtual const wxFont&   GetFont() const { return m_targetDc->GetFont(); }
+    virtual int GetLogicalFunction() const { return m_targetDc->GetLogicalFunction(); }
+    void GetLogicalOrigin(wxCoord *x, wxCoord *y) const { m_targetDc->GetLogicalOrigin(x, y); }
+    wxPoint GetLogicalOrigin() const { return m_targetDc->GetLogicalOrigin(); }
+    void GetLogicalOrigin(long *x, long *y) const { m_targetDc->GetLogicalOrigin(x, y); }
+    virtual void GetLogicalScale(double *x, double *y) { m_targetDc->GetLogicalScale(x, y); }
+    virtual int GetMapMode() const { return m_targetDc->GetMapMode(); }
+    virtual void GetMultiLineTextExtent(const wxString& text,
+                                        wxCoord *width,
+                                        wxCoord *height,
+                                        wxCoord *heightLine = NULL,
+                                        wxFont *font = NULL)
+        { m_targetDc->GetMultiLineTextExtent(text, width, height, heightLine,
+                                             font); }
+#if WXWIN_COMPATIBILITY_2_4
+    virtual bool GetOptimization() { return m_targetDc->GetOptimization(); }
+#endif // WXWIN_COMPATIBILITY_2_4
+    virtual wxSize GetPPI() const { return m_targetDc->GetPPI(); }
+    bool GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
+        { return m_targetDc->GetPartialTextExtents(text, widths); }
+    virtual const wxPen&    GetPen() const { return m_targetDc->GetPen(); }
+    bool GetPixel(wxCoord x, wxCoord y, wxColour *col) const
+        { return m_targetDc->GetPixel(x, y, col); }
+    bool GetPixel(const wxPoint& pt, wxColour *col) const { return m_targetDc->GetPixel(pt, col); }
+    void GetSize(int *width, int *height) const { m_targetDc->GetSize(width, height); }
+    wxSize GetSize() const { return m_targetDc->GetSize(); }
+    void GetSizeMM(int* width, int* height) const { m_targetDc->GetSizeMM(width, height); }
+    wxSize GetSizeMM() const { return m_targetDc->GetSizeMM(); }
+    virtual const wxColour& GetTextBackground() const { return m_targetDc->GetTextBackground(); }
+    void GetTextExtent(const wxString& string,
+                       wxCoord *x, wxCoord *y,
+                       wxCoord *descent = NULL,
+                       wxCoord *externalLeading = NULL,
+                       wxFont *theFont = NULL) const
+        { m_targetDc->GetTextExtent(string, x, y, descent,
+                                    externalLeading, theFont); }
+    void GetTextExtent(const wxString& string,
+                       long *x, long *y,
+                       long *descent = NULL,
+                       long *externalLeading = NULL,
+                       wxFont *theFont = NULL) const
+        { m_targetDc->GetTextExtent(string, x, y, descent,
+                                    externalLeading, theFont); }
+    virtual const wxColour& GetTextForeground() const { return m_targetDc->GetTextForeground(); }
+    virtual void GetUserScale(double *x, double *y) const { m_targetDc->GetUserScale(x, y); }
+    void GradientFillConcentric(const wxRect& rect,
+                                const wxColour& initialColour,
+                                const wxColour& destColour)
+        { m_targetDc->GradientFillConcentric(rect, initialColour, destColour); }
+    void GradientFillConcentric(const wxRect& rect,
+                                const wxColour& initialColour,
+                                const wxColour& destColour,
+                                const wxPoint& circleCenter)
+        { m_targetDc->GradientFillConcentric(rect, initialColour, destColour, circleCenter); }
+    void GradientFillLinear(const wxRect& rect,
+                            const wxColour& initialColour,
+                            const wxColour& destColour,
+                            wxDirection nDirection = wxEAST)
+        { m_targetDc->GradientFillLinear(rect, initialColour, destColour, nDirection); }
+    wxCoord LogicalToDeviceX(wxCoord x) const { return m_targetDc->LogicalToDeviceX(x); }
+    wxCoord LogicalToDeviceXRel(wxCoord x) const { return m_targetDc->LogicalToDeviceXRel(x); }
+    wxCoord LogicalToDeviceY(wxCoord y) const { return m_targetDc->LogicalToDeviceY(y); }
+    wxCoord LogicalToDeviceYRel(wxCoord y) const { return m_targetDc->LogicalToDeviceYRel(y); }
+    wxCoord MaxX() const { return m_targetDc->MaxX(); }
+    wxCoord MaxY() const { return m_targetDc->MaxY(); }
+    wxCoord MinX() const { return m_targetDc->MinX(); }
+    wxCoord MinY() const { return m_targetDc->MinY(); }
+    virtual bool Ok() const { return m_targetDc->Ok(); }
+    void ResetBoundingBox()
+        { m_targetDc->ResetBoundingBox(); }
+#if defined(__WXWINCE__)
+    void Rotate( wxList* points, double angle, wxPoint center = wxPoint(0,0) )
+        { m_targetDc->Rotate(points, angle, center); }
+#endif // defined(__WXWINCE__)
+    virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp)
+        { m_targetDc->SetAxisOrientation(xLeftRight, yBottomUp); }
+    virtual void SetBackground(const wxBrush& brush) { m_targetDc->SetBackground(brush); }
+    virtual void SetBackgroundMode(int mode) { m_targetDc->SetBackgroundMode(mode); }
+    virtual void SetBrush(const wxBrush& brush) { m_targetDc->SetBrush(brush); }
+    void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+        { m_targetDc->SetClippingRegion(x, y, width, height); }
+    void SetClippingRegion(const wxPoint& pt, const wxSize& sz)
+        { m_targetDc->SetClippingRegion(pt, sz); }
+    void SetClippingRegion(const wxRect& rect) { m_targetDc->SetClippingRegion(rect); }
+    void SetClippingRegion(const wxRegion& region) { m_targetDc->SetClippingRegion(region); }
+    virtual void SetDeviceOrigin(wxCoord x, wxCoord y) { m_targetDc->SetDeviceOrigin(x, y); }
+    virtual void SetFont(const wxFont& font) { m_targetDc->SetFont(font); }
+    virtual void SetLogicalFunction(int function) { m_targetDc->SetLogicalFunction(function); }
+    virtual void SetLogicalOrigin(wxCoord x, wxCoord y) { m_targetDc->SetLogicalOrigin(x, y); }
+    virtual void SetLogicalScale(double x, double y) { m_targetDc->SetLogicalScale(x, y); }
+    virtual void SetMapMode(int mode) { m_targetDc->SetMapMode(mode); }
+#if WXWIN_COMPATIBILITY_2_4
+    virtual void SetOptimization(bool opt) { m_targetDc->SetOptimization(opt); }
+#endif // WXWIN_COMPATIBILITY_2_4
+#if wxUSE_PALETTE
+    virtual void SetPalette(const wxPalette& palette) { m_targetDc->SetPalette(palette); }
+#endif // wxUSE_PALETTE
+    virtual void SetPen(const wxPen& pen) { m_targetDc->SetPen(pen); }
+    virtual void SetTextBackground(const wxColour& colour) { m_targetDc->SetTextBackground(colour); }
+    virtual void SetTextForeground(const wxColour& colour) { m_targetDc->SetTextForeground(colour); }
+    virtual void SetUserScale(double x, double y) { m_targetDc->SetUserScale(x, y); }
+    virtual bool StartDoc(const wxString& message) { return m_targetDc->StartDoc(message); }
+    virtual void StartPage() { m_targetDc->StartPage(); }
+protected:
+    virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
+                        wxCoord width, wxCoord height,
+                        wxDC *source, wxCoord xsrc, wxCoord ysrc,
+                        int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord)
+        { return m_targetDc->Blit(xdest, ydest, width, height,
+                                  source, xsrc, ysrc, rop,
+                                  useMask, xsrcMask, ysrcMask); }
+    virtual void DoCrossHair(wxCoord x, wxCoord y) { m_targetDc->CrossHair(x, y); }
+    virtual void DoDrawArc(wxCoord x1, wxCoord y1,
+                           wxCoord x2, wxCoord y2,
+                           wxCoord xc, wxCoord yc)
+        { m_targetDc->DrawArc(x1, y1, x2, y2,
+                              xc, yc); }
+    virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
+                              bool useMask = false)
+        { m_targetDc->DrawBitmap(bmp, x, y, useMask); }
+    virtual void DoDrawCheckMark(wxCoord x, wxCoord y,
+                                 wxCoord width, wxCoord height)
+        { m_targetDc->DrawCheckMark(x, y, width, height); }
+    virtual void DoDrawEllipse(wxCoord x, wxCoord y,
+                               wxCoord width, wxCoord height)
+        { m_targetDc->DrawEllipse(x, y, width, height); }
+    virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
+                                   double sa, double ea)
+        { m_targetDc->DrawEllipticArc(x, y, w, h,
+                                      sa, ea); }
+    virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
+        { m_targetDc->DrawIcon(icon, x, y); }
+    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
+        { m_targetDc->DrawLine(x1, y1, x2, y2); }
+    virtual void DoDrawLines(int n, wxPoint points[],
+                             wxCoord xoffset, wxCoord yoffset)
+        { m_targetDc->DrawLines(n, points, xoffset, yoffset); }
+    virtual void DoDrawPoint(wxCoord x, wxCoord y) { m_targetDc->DrawPoint(x, y); }
+    virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
+                               wxCoord xoffset, wxCoord yoffset,
+                               int fillStyle)
+        { m_targetDc->DrawPolyPolygon(n, count, points, xoffset,
+                                      yoffset, fillStyle); }
+    virtual void DoDrawPolygon(int n, wxPoint points[],
+                               wxCoord xoffset, wxCoord yoffset,
+                               int fillStyle = wxODDEVEN_RULE)
+        { m_targetDc->DrawPolygon(n, points, xoffset, yoffset,
+                                  fillStyle); }
+    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+        { m_targetDc->DrawRectangle(x, y, width, height); }
+    virtual void DoDrawRotatedText(const wxString& text,
+                                   wxCoord x, wxCoord y, double angle)
+        { m_targetDc->DrawRotatedText(text, x, y, angle); }
+    virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
+                                        wxCoord width, wxCoord height,
+                                        double radius)
+        { m_targetDc->DrawRoundedRectangle(x, y, width, height,
+                                           radius); }
+#if wxUSE_SPLINES
+    virtual void DoDrawSpline(wxList *points) { m_targetDc->DrawSpline(points); }
+#endif // wxUSE_SPLINES
+    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y)
+        { m_targetDc->DrawText(text, x, y); }
+    virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
+                             int style = wxFLOOD_SURFACE)
+        { return m_targetDc->FloodFill(x, y, col, style); }
+    virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
+                                  wxCoord *w, wxCoord *h) const
+        { m_targetDc->GetClippingBox(x, y, w, h); }
+    virtual void DoGetDeviceOrigin(wxCoord *x, wxCoord *y) const
+        { m_targetDc->GetDeviceOrigin(x, y); }
+    virtual void DoGetLogicalOrigin(wxCoord *x, wxCoord *y) const
+        { m_targetDc->GetLogicalOrigin(x, y); }
+    virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
+        { return m_targetDc->GetPartialTextExtents(text, widths); }
+    virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
+        { return m_targetDc->GetPixel(x, y, col); }
+    virtual void DoGetSize(int *width, int *height) const { m_targetDc->GetSize(width, height); }
+    virtual void DoGetSizeMM(int* width, int* height) const { m_targetDc->GetSizeMM(width, height); }
+    virtual void DoGetTextExtent(const wxString& string,
+                                 wxCoord *x, wxCoord *y,
+                                 wxCoord *descent = NULL,
+                                 wxCoord *externalLeading = NULL,
+                                 wxFont *theFont = NULL) const
+        { m_targetDc->GetTextExtent(string, x, y, descent,
+                                    externalLeading, theFont); }
+    virtual void DoGradientFillLinear(const wxRect& rect,
+                                      const wxColour& initialColour,
+                                      const wxColour& destColour,
+                                      wxDirection nDirection = wxEAST)
+        { m_targetDc->GradientFillLinear(rect, initialColour, destColour, nDirection); }
+    virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
+                                     wxCoord width, wxCoord height)
+        { m_targetDc->SetClippingRegion(x, y, width, height); }
+    virtual void DoSetClippingRegionAsRegion(const wxRegion& region)
+        { m_targetDc->SetClippingRegion(region); }
 };


@@ -154,7 +606,7 @@ private:

 // Creates a double buffered wxPaintDC, optionally allowing the
 // user to specify their own buffer to use.
-class WXDLLEXPORT wxBufferedPaintDC : public wxBufferedDC
+class wxBufferedPaintDC : public wxBufferedDC
 {
 public:
    // If no bitmap is supplied by the user, a temporary one will be created.
@@ -168,7 +620,7 @@ public:
        if( buffer != wxNullBitmap )
            Init(&m_paintdc, buffer, style);
        else
-            Init(&m_paintdc, window->GetClientSize(), style);
+            Init(window, &m_paintdc, window->GetClientSize(), style);
    }

    // If no bitmap is supplied by the user, a temporary one will be created.
@@ -179,7 +631,7 @@ public:
        if (style & wxBUFFER_VIRTUAL_AREA)
            window->PrepareDC( m_paintdc );

-        Init(&m_paintdc, window->GetClientSize(), style);
+        Init(window, &m_paintdc, window->GetClientSize(), style);
    }

    // default copy ctor ok.
@@ -194,7 +646,6 @@ public:
 private:
    wxPaintDC m_paintdc;

-    DECLARE_ABSTRACT_CLASS(wxBufferedPaintDC)
    DECLARE_NO_COPY_CLASS(wxBufferedPaintDC)
 };

@@ -233,7 +684,7 @@ private:
    {
        // Help the user to get the double-buffering working properly.
        wxASSERT_MSG( win->GetBackgroundStyle() == wxBG_STYLE_CUSTOM,
-                      wxT("In constructor, you need to call SetBackgroundStyle(wxBG_STYLE_CUSTOM), ")
+                      wxT("In constructor, you need to call GetBackgroundStyle(wxBG_STYLE_CUSTOM), ")
                      wxT("and also, if needed, paint the background manually in the paint event handler."));
    }

@@ -248,16 +699,4 @@ typedef wxAutoBufferedPaintDCBase wxAutoBufferedPaintDC;
 #endif


-// Check if the window is natively double buffered and will return a wxPaintDC
-// if it is, a wxBufferedPaintDC otherwise.  It is the caller's responsibility
-// to delete the wxDC pointer when finished with it.
-inline wxDC* wxAutoBufferedPaintDCFactory(wxWindow* window)
-{
-    if ( window->IsDoubleBuffered() )
-        return new wxPaintDC(window);
-    else
-        return new wxBufferedPaintDC(window);
-}
-            
-
 #endif  // _WX_DCBUFFER_H_
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -1,181 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/graphdc.h
-// Purpose:     graphics context device bridge header
-// Author:      Stefan Csomor
-// Modified by:
-// Created:
-// Copyright:   (c) Stefan Csomor
-// RCS-ID:      $Id$
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GRAPHICS_DC_H_
-#define _WX_GRAPHICS_DC_H_
-
-#if wxUSE_GRAPHICS_CONTEXT
-
-#include "wx/geometry.h"
-#include "wx/dynarray.h"
-
-class WXDLLEXPORT wxGraphicsContext;
-class WXDLLEXPORT wxWindowDC;
-
-
-#ifdef __WXMAC__
-#define wxGCDC wxDC
-#endif
-
-class WXDLLEXPORT wxGCDC: 
-#ifdef __WXMAC__
-    public wxDCBase
-#else
-    public wxDC
-#endif
-{
-    DECLARE_DYNAMIC_CLASS(wxGCDC)
-    DECLARE_NO_COPY_CLASS(wxGCDC)
-
-public:
-    wxGCDC(const wxWindowDC& dc);
-    wxGCDC();
-    virtual ~wxGCDC();
-
-    void Init();
-
-
-    // implement base class pure virtuals
-    // ----------------------------------
-
-    virtual void Clear();
-
-    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; }
-    virtual void EndDoc(void) {}
-
-    virtual void StartPage(void) {}
-    virtual void EndPage(void) {}
-
-    virtual void SetFont(const wxFont& font);
-    virtual void SetPen(const wxPen& pen);
-    virtual void SetBrush(const wxBrush& brush);
-    virtual void SetBackground(const wxBrush& brush);
-    virtual void SetBackgroundMode(int mode);
-    virtual void SetPalette(const wxPalette& palette);
-
-    virtual void DestroyClippingRegion();
-
-    virtual wxCoord GetCharHeight() const;
-    virtual wxCoord GetCharWidth() const;
-
-    virtual bool CanDrawBitmap() const;
-    virtual bool CanGetTextExtent() const;
-    virtual int GetDepth() const;
-    virtual wxSize GetPPI() const;
-
-    virtual void SetMapMode(int mode);
-    virtual void SetUserScale(double x, double y);
-
-    virtual void SetLogicalScale(double x, double y);
-    virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
-    virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
-    virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
-    virtual void SetLogicalFunction(int function);
-
-    virtual void SetTextForeground(const wxColour& colour);
-    virtual void SetTextBackground(const wxColour& colour);
-
-    virtual void ComputeScaleAndOrigin();
-
-    wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; }
-    virtual void SetGraphicsContext( wxGraphicsContext* ctx );
-    
-protected:
-    // the true implementations
-    virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
-        int style = wxFLOOD_SURFACE);
-
-    virtual void DoGradientFillLinear(const wxRect& rect,
-        const wxColour& initialColour,
-        const wxColour& destColour,
-        wxDirection nDirection = wxEAST);
-
-    virtual void DoGradientFillConcentric(const wxRect& rect,
-        const wxColour& initialColour,
-        const wxColour& destColour,
-        const wxPoint& circleCenter);
-
-    virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
-
-    virtual void DoDrawPoint(wxCoord x, wxCoord y);
-
-#if wxUSE_SPLINES
-    virtual void DoDrawSpline(wxList *points);
-#endif
-
-    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
-
-    virtual void DoDrawArc(wxCoord x1, wxCoord y1,
-        wxCoord x2, wxCoord y2,
-        wxCoord xc, wxCoord yc);
-
-    virtual void DoDrawCheckMark(wxCoord x, wxCoord y,
-        wxCoord width, wxCoord height);
-
-    virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
-        double sa, double ea);
-
-    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-    virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
-        wxCoord width, wxCoord height,
-        double radius);
-    virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-
-    virtual void DoCrossHair(wxCoord x, wxCoord y);
-
-    virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
-    virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
-        bool useMask = false);
-
-    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
-    virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
-        double angle);
-
-    virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-        wxDC *source, wxCoord xsrc, wxCoord ysrc,
-        int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
-
-    virtual void DoGetSize(int *,int *) const;
-    virtual void DoGetSizeMM(int* width, int* height) const;
-
-    virtual void DoDrawLines(int n, wxPoint points[],
-        wxCoord xoffset, wxCoord yoffset);
-    virtual void DoDrawPolygon(int n, wxPoint points[],
-        wxCoord xoffset, wxCoord yoffset,
-        int fillStyle = wxODDEVEN_RULE);
-    virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
-        wxCoord xoffset, wxCoord yoffset,
-        int fillStyle);
-
-    virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
-    virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
-        wxCoord width, wxCoord height);
-
-    virtual void DoGetTextExtent(const wxString& string,
-        wxCoord *x, wxCoord *y,
-        wxCoord *descent = NULL,
-        wxCoord *externalLeading = NULL,
-        wxFont *theFont = NULL) const;
-
-    virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
-
-protected:
-    // scaling variables
-    double       m_mm_to_pix_x, m_mm_to_pix_y;
-
-    double m_formerScaleX, m_formerScaleY;
-
-    wxGraphicsContext* m_graphicContext;
-};
-
-#endif
-
-#endif // _WX_GRAPHICS_DC_H_
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1545,6 +1545,60 @@ enum wxBorder
 #define wxSP_ARROW_KEYS       0x1000
 #define wxSP_WRAP             0x2000

+/*
+ * wxBookCtrl flags (common for wxNotebook, wxListbook, wxChoicebook, wxTreebook)
+ */
+
+#define wxBK_DEFAULT          0x0000
+#define wxBK_TOP              0x0010
+#define wxBK_BOTTOM           0x0020
+#define wxBK_LEFT             0x0040
+#define wxBK_RIGHT            0x0080
+#define wxBK_ALIGN_MASK       ( wxBK_TOP | wxBK_BOTTOM | wxBK_LEFT | wxBK_RIGHT )
+
+/*
+ * wxNotebook flags
+ */
+#if WXWIN_COMPATIBILITY_2_6
+/* Use common book wxBK_* flags for describing alignment */
+#define wxNB_DEFAULT          wxBK_DEFAULT
+#define wxNB_TOP              wxBK_TOP
+#define wxNB_BOTTOM           wxBK_BOTTOM
+#define wxNB_LEFT             wxBK_LEFT
+#define wxNB_RIGHT            wxBK_RIGHT
+#endif
+
+#define wxNB_FIXEDWIDTH       0x0100
+#define wxNB_MULTILINE        0x0200
+#define wxNB_NOPAGETHEME      0x0400
+#define wxNB_FLAT             0x0800
+
+/*
+ * wxListbook flags
+ */
+#if WXWIN_COMPATIBILITY_2_6
+/* Use common book wxBK_* flags for describing alignment */
+#define wxLB_DEFAULT          wxBK_DEFAULT
+#define wxLB_TOP              wxBK_TOP
+#define wxLB_BOTTOM           wxBK_BOTTOM
+#define wxLB_LEFT             wxBK_LEFT
+#define wxLB_RIGHT            wxBK_RIGHT
+#define wxLB_ALIGN_MASK       wxBK_ALIGN_MASK
+#endif
+
+/*
+ * wxChoicebook flags
+ */
+#if WXWIN_COMPATIBILITY_2_6
+/* Use common book wxBK_* flags for describing alignment */
+#define wxCHB_DEFAULT          wxBK_DEFAULT
+#define wxCHB_TOP              wxBK_TOP
+#define wxCHB_BOTTOM           wxBK_BOTTOM
+#define wxCHB_LEFT             wxBK_LEFT
+#define wxCHB_RIGHT            wxBK_RIGHT
+#define wxCHB_ALIGN_MASK       wxBK_ALIGN_MASK
+#endif
+
 /*
 * wxTabCtrl flags
 */
--- a/include/wx/dfb/dcmemory.h
+++ b/include/wx/dfb/dcmemory.h
@@ -17,7 +17,7 @@
 class WXDLLIMPEXP_CORE wxMemoryDC : public wxDC
 {
 public:
-    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
+    wxMemoryDC();
    wxMemoryDC(wxDC *dc); // create compatible DC

    virtual void SelectObject(const wxBitmap& bitmap);
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -342,25 +342,15 @@ enum wxFileKind
            typedef unsigned long mode_t;
        #endif
        WXDLLIMPEXP_BASE int wxStat( const wxChar *file_name, wxStructStat *buf );
-        WXDLLIMPEXP_BASE int wxLstat( const wxChar *file_name, wxStructStat *buf );
        WXDLLIMPEXP_BASE int wxAccess( const wxChar *pathname, int mode );
        WXDLLIMPEXP_BASE int wxOpen( const wxChar *pathname, int flags, mode_t mode );
    #else
        #define   wxOpen       open
        #define   wxStat       stat
-        #define   wxLstat      lstat
        #define   wxAccess     access
    #endif
-
-    #define wxHAVE_NATIVE_LSTAT
 #endif // platforms

-// if the platform doesn't have symlinks, define wxLstat to be the same as
-// wxStat to avoid #ifdefs in the code using it
-#ifndef wxHAVE_NATIVE_LSTAT
-    #define wxLstat wxStat
-#endif
-
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
 //
 // VisualAge C++ V4.0 cannot have any external linkage const decs
--- a/include/wx/gdiobj.h
+++ b/include/wx/gdiobj.h
@@ -31,7 +31,7 @@ class WXDLLIMPEXP_CORE wxGDIObject: public wxObject
 public:
    bool IsNull() const { return m_refData == NULL; }

-#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXPALMOS__)
+#if defined(__WXMSW__) || defined(__WXOS2__) || defined(__WXPALMOS__)
    // Creates the resource
    virtual bool RealizeResource() { return false; }

@@ -42,7 +42,7 @@ public:

    // Returns handle.
    virtual WXHANDLE GetResourceHandle() const { return 0; }
-#endif // defined(__WXMSW__) || defined(__WXPM__)
+#endif // defined(__WXMSW__) || defined(__WXOS2__)

    DECLARE_DYNAMIC_CLASS(wxGDIObject)
 };
--- a/include/wx/generic/animate.h
+++ b/include/wx/generic/animate.h
@@ -108,8 +108,6 @@ public:
    wxAnimation GetAnimation() const
        { return m_animation; }

-    void SetInactiveBitmap(const wxBitmap &bmp);
-
 public:     // event handlers

    void OnPaint(wxPaintEvent& event);
@@ -142,11 +140,9 @@ protected:      // internal utilities
    void FitToAnimation();

    // Draw the background; use this when e.g. previous frame had wxANIM_TOBACKGROUND disposal.
-    void DisposeToBackground();
    void DisposeToBackground(wxDC& dc);
    void DisposeToBackground(wxDC& dc, const wxPoint &pos, const wxSize &sz);

-    void UpdateBackingStoreWithStaticImage();
    void IncrementalUpdateBackingStore();
    bool RebuildBackingStoreUpToFrame(size_t);
    void DrawFrame(wxDC &dc, size_t);
--- a/include/wx/generic/bmpcbox.h
+++ b/include/wx/generic/bmpcbox.h
@@ -4,7 +4,7 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Aug-30-2006
-// RCS-ID:      $Id$
+// RCS-ID:      $Id:
 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -28,7 +28,7 @@ extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxGridNameStr[];
 //
 #define WXGRID_DEFAULT_NUMBER_ROWS            10
 #define WXGRID_DEFAULT_NUMBER_COLS            10
-#if defined(__WXMSW__) || defined(__WXGTK20__)
+#ifdef __WXMSW__
 #define WXGRID_DEFAULT_ROW_HEIGHT             25
 #else
 #define WXGRID_DEFAULT_ROW_HEIGHT             30
--- a/include/wx/graphics.h
+++ b/include/wx/graphics.h
@@ -12,12 +12,16 @@
 #ifndef _WX_GRAPHICS_H_
 #define _WX_GRAPHICS_H_

+
 #if wxUSE_GRAPHICS_CONTEXT

-#include "wx/geometry.h"
-#include "wx/dynarray.h"
+// ---------------------------------------------------------------------------
+// macros
+// ---------------------------------------------------------------------------

-class WXDLLEXPORT wxWindowDC;
+#include "wx/geometry.h"
+#include "wx/dcclient.h"
+#include "wx/dynarray.h"

 /*
 * notes about the graphics context apis
@@ -82,89 +86,32 @@ public :
    void AddCurveToPoint( const wxPoint2DDouble& c1, const wxPoint2DDouble& c2, const wxPoint2DDouble& e);

    void AddArc( const wxPoint2DDouble& c, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise);
-	
+
    DECLARE_NO_COPY_CLASS(wxGraphicsPath)
 };

-/*
-class WXDLLEXPORT wxGraphicsMatrix
-{
-public :
-	wxGraphicsMatrix() {}
-	
-	virtual ~wxGraphicsMatrix() {}
-	
-	wxGraphicsMatrix* Concat( const wxGraphicsMatrix *t ) const;
-	
-	// returns the inverse matrix
-	wxGraphicsMatrix* Invert() const;
-	
-	// returns true if the elements of the transformation matrix are equal ?
-    bool operator==(const wxGraphicsMatrix& t) const;
-	
-	// return true if this is the identity matrix
-	bool IsIdentity();
-	
-    //
-    // transformation
-    //
-    
-    // translate
-    virtual void Translate( wxDouble dx , wxDouble dy ) = 0;
-
-    // scale
-    virtual void Scale( wxDouble xScale , wxDouble yScale ) = 0;
-
-    // rotate (radians)
-    virtual void Rotate( wxDouble angle ) = 0;	
-} ;
-*/
-
 class WXDLLEXPORT wxGraphicsContext
 {
 public:
    wxGraphicsContext() {}
-
    virtual ~wxGraphicsContext() {}
    
    static wxGraphicsContext* Create( const wxWindowDC& dc) ;
-	
-    static wxGraphicsContext* CreateFromNative( void * context ) ;
-
-#ifdef __WXMAC__
-    static wxGraphicsContext* CreateFromNativeWindow( void * window ) ;
-#endif
-    static wxGraphicsContext* Create( wxWindow* window ) ;

    // creates a path instance that corresponds to the type of graphics context, ie GDIPlus, cairo, CoreGraphics ...
    virtual wxGraphicsPath * CreatePath() = 0;
-	
-	/*
-	// create a 'native' matrix corresponding to these values
-	virtual wxGraphicsMatrix* CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, 
-		wxDouble tx=0.0, wxDouble ty=0.0) = 0;
-	*/
-	
+
    // push the current state of the context, ie the transformation matrix on a stack
    virtual void PushState() = 0;

    // pops a stored state from the stack
    virtual void PopState() = 0;

-    // clips drawings to the region, combined to current clipping region
+    // clips drawings to the region
    virtual void Clip( const wxRegion &region ) = 0;

-    // clips drawings to the rect
-    virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0;
-	
-	// resets the clipping to original extent
-	virtual void ResetClip() = 0 ;
-
-	// returns the native context
-	virtual void * GetNativeContext() = 0;
-
    //
-    // transformation : changes the current transformation matrix CTM of the context
+    // transformation
    //
    
    // translate
@@ -209,7 +156,7 @@ public:

    // draws a path by first filling and then stroking
    virtual void DrawPath( const wxGraphicsPath *path, int fillStyle = wxWINDING_RULE );
-	
+
    //
    // text
    //
@@ -261,6 +208,149 @@ public:
    DECLARE_NO_COPY_CLASS(wxGraphicsContext)
 };

+class WXDLLEXPORT wxGCDC: public wxDC
+{
+    DECLARE_DYNAMIC_CLASS(wxGCDC)
+    DECLARE_NO_COPY_CLASS(wxGCDC)
+
+public:
+    wxGCDC(const wxWindowDC& dc);
+    wxGCDC();
+    virtual ~wxGCDC();
+
+    void Init();
+
+
+    // implement base class pure virtuals
+    // ----------------------------------
+
+    virtual void Clear();
+
+    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; }
+    virtual void EndDoc(void) {}
+
+    virtual void StartPage(void) {}
+    virtual void EndPage(void) {}
+
+    virtual void SetFont(const wxFont& font);
+    virtual void SetPen(const wxPen& pen);
+    virtual void SetBrush(const wxBrush& brush);
+    virtual void SetBackground(const wxBrush& brush);
+    virtual void SetBackgroundMode(int mode);
+    virtual void SetPalette(const wxPalette& palette);
+
+    virtual void DestroyClippingRegion();
+
+    virtual wxCoord GetCharHeight() const;
+    virtual wxCoord GetCharWidth() const;
+
+    virtual bool CanDrawBitmap() const;
+    virtual bool CanGetTextExtent() const;
+    virtual int GetDepth() const;
+    virtual wxSize GetPPI() const;
+
+    virtual void SetMapMode(int mode);
+    virtual void SetUserScale(double x, double y);
+
+    virtual void SetLogicalScale(double x, double y);
+    virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
+    virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
+    virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
+    virtual void SetLogicalFunction(int function);
+
+    virtual void SetTextForeground(const wxColour& colour);
+    virtual void SetTextBackground(const wxColour& colour);
+
+    virtual void ComputeScaleAndOrigin();
+
+    wxGraphicsContext* GetGraphicContext() { return m_graphicContext; }
+
+protected:
+    // the true implementations
+    virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
+        int style = wxFLOOD_SURFACE);
+
+    virtual void DoGradientFillLinear(const wxRect& rect,
+        const wxColour& initialColour,
+        const wxColour& destColour,
+        wxDirection nDirection = wxEAST);
+
+    virtual void DoGradientFillConcentric(const wxRect& rect,
+        const wxColour& initialColour,
+        const wxColour& destColour,
+        const wxPoint& circleCenter);
+
+    virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
+
+    virtual void DoDrawPoint(wxCoord x, wxCoord y);
+
+#if wxUSE_SPLINES
+    virtual void DoDrawSpline(wxList *points);
 #endif

-#endif // _WX_GRAPHICS_H_
+    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
+
+    virtual void DoDrawArc(wxCoord x1, wxCoord y1,
+        wxCoord x2, wxCoord y2,
+        wxCoord xc, wxCoord yc);
+
+    virtual void DoDrawCheckMark(wxCoord x, wxCoord y,
+        wxCoord width, wxCoord height);
+
+    virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
+        double sa, double ea);
+
+    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
+    virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
+        wxCoord width, wxCoord height,
+        double radius);
+    virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
+
+    virtual void DoCrossHair(wxCoord x, wxCoord y);
+
+    virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
+    virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
+        bool useMask = false);
+
+    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
+    virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
+        double angle);
+
+    virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
+        wxDC *source, wxCoord xsrc, wxCoord ysrc,
+        int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
+
+    virtual void DoGetSize(int *,int *) const;
+    virtual void DoGetSizeMM(int* width, int* height) const;
+
+    virtual void DoDrawLines(int n, wxPoint points[],
+        wxCoord xoffset, wxCoord yoffset);
+    virtual void DoDrawPolygon(int n, wxPoint points[],
+        wxCoord xoffset, wxCoord yoffset,
+        int fillStyle = wxODDEVEN_RULE);
+    virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
+        wxCoord xoffset, wxCoord yoffset,
+        int fillStyle);
+
+    virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
+    virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
+        wxCoord width, wxCoord height);
+
+    virtual void DoGetTextExtent(const wxString& string,
+        wxCoord *x, wxCoord *y,
+        wxCoord *descent = NULL,
+        wxCoord *externalLeading = NULL,
+        wxFont *theFont = NULL) const;
+
+    virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
+
+protected:
+    // scaling variables
+    double       m_mm_to_pix_x, m_mm_to_pix_y;
+
+    wxGraphicsContext* m_graphicContext;
+};
+#endif
+
+#endif
+    // _WX_GRID_H_BASE_
--- a/include/wx/gtk/animate.h
+++ b/include/wx/gtk/animate.h
@@ -68,6 +68,9 @@ public:     // used by GTK callbacks
 protected:
    GdkPixbufAnimation *m_pixbuf;

+    // used temporary by Load()
+    //bool m_bLoadComplete;
+
 private:
    void UnRef();

@@ -129,14 +132,12 @@ public:     // public API
    virtual bool IsPlaying() const;

    bool SetBackgroundColour( const wxColour &colour );
-    void SetInactiveBitmap(const wxBitmap &bmp);

 protected:

    virtual wxSize DoGetBestSize() const;
    void FitToAnimation();
    void ClearToBackgroundColour();
-    void DisplayStaticImage();

    void ResetAnim();
    void ResetIter();
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -122,9 +122,6 @@ private:
    bool CreateFromImageAsPixmap(const wxImage& image, int depth);
    bool CreateFromImageAsPixbuf(const wxImage& image);

-    virtual wxObjectRefData* CreateRefData() const;
-    virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
-
    enum Representation
    {
        Pixmap,
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -99,6 +99,8 @@ public:
    virtual void SetDeviceOrigin( wxCoord x, wxCoord y );
    virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp );

+    virtual GdkWindow* GetGDKWindow() const { return m_window; }
+
 // protected:
    // implementation
    // --------------
@@ -126,7 +128,7 @@ public:
 protected:
    virtual void ComputeScaleAndOrigin();

-    virtual GdkWindow *GetGDKWindow() const { return m_window; }
+    GdkWindow *GetWindow() { return m_window; }

 private:
    DECLARE_DYNAMIC_CLASS(wxWindowDC)
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -26,7 +26,7 @@ class WXDLLIMPEXP_CORE wxMemoryDC;
 class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC
 {
 public:
-    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
+    wxMemoryDC();
    wxMemoryDC( wxDC *dc ); // Create compatible DC
    virtual ~wxMemoryDC();
    virtual void SelectObject( const wxBitmap& bitmap );
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -84,9 +84,6 @@ protected:
    // common part of all ctors
    void Init();

-    virtual wxObjectRefData* CreateRefData() const;
-    virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
-
 private:
    DECLARE_DYNAMIC_CLASS(wxFont)
 };
--- a/include/wx/gtk/gauge.h
+++ b/include/wx/gtk/gauge.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/gauge.h
+// Name:        gauge.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _WX_GTK_GAUGE_H_
@@ -57,12 +57,12 @@ public:
    virtual void Pulse();

    bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
-
+    
    static wxVisualAttributes
    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

    virtual wxVisualAttributes GetDefaultAttributes() const;
-
+    
    // implementation
    // -------------

@@ -83,5 +83,4 @@ private:
    DECLARE_DYNAMIC_CLASS(wxGauge)
 };

-#endif
-    // _WX_GTK_GAUGE_H_
+#endif // _WX_GTK_GAUGE_H_
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -75,7 +75,7 @@ public:
    virtual ~wxMenu();

    void Attach(wxMenuBarBase *menubar);
-
+    
    void SetLayoutDirection(const wxLayoutDirection dir);
    wxLayoutDirection GetLayoutDirection() const;

@@ -101,10 +101,9 @@ private:
    // common part of Append (if pos == -1)  and Insert
    bool GtkAppend(wxMenuItem *item, int pos=-1);

-    GtkWidget *m_prevRadio;
+	GtkWidget *m_prevRadio;

    DECLARE_DYNAMIC_CLASS(wxMenu)
 };

-#endif
-    // __GTKMENUH__
+#endif // __GTKMENUH__
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -15,7 +15,6 @@
 #include <gtk/gtk.h>

 #include "wx/event.h"
-#include "wx/gtk/private/string.h"

 // fail all version tests if the GTK+ version is so ancient that it doesn't
 // even have GTK_CHECK_VERSION
@@ -81,6 +80,26 @@ G_END_DECLS
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;

+//-----------------------------------------------------------------------------
+// Convenience class for g_freeing a gchar* on scope exit automatically
+//-----------------------------------------------------------------------------
+
+class wxGtkString
+{
+public:
+    explicit wxGtkString(gchar *s) : m_str(s) { }
+    ~wxGtkString() { g_free(m_str); }
+
+    const gchar *c_str() const { return m_str; }
+
+    operator gchar *() const { return m_str; }
+
+private:
+    gchar *m_str;
+
+    DECLARE_NO_COPY_CLASS(wxGtkString)
+};
+
 //-----------------------------------------------------------------------------
 // Misc. functions
 //-----------------------------------------------------------------------------
--- a/include/wx/gtk/private/string.h
+++ b/include/wx/gtk/private/string.h
@@ -1,35 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/private/string.h
-// Purpose:     wxGtkString class declaration
-// Author:      Vadim Zeitlin
-// Created:     2006-10-19
-// RCS-ID:      $Id$
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GTK_PRIVATE_STRING_H_
-#define _WX_GTK_PRIVATE_STRING_H_
-
-// ----------------------------------------------------------------------------
-// Convenience class for g_freeing a gchar* on scope exit automatically
-// ----------------------------------------------------------------------------
-
-class wxGtkString
-{
-public:
-    explicit wxGtkString(gchar *s) : m_str(s) { }
-    ~wxGtkString() { g_free(m_str); }
-
-    const gchar *c_str() const { return m_str; }
-
-    operator gchar *() const { return m_str; }
-
-private:
-    gchar *m_str;
-
-    DECLARE_NO_COPY_CLASS(wxGtkString)
-};
-
-#endif // _WX_GTK_PRIVATE_STRING_H_
-
--- a/include/wx/gtk/stattext.h
+++ b/include/wx/gtk/stattext.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/stattext.h
+// Name:        stattext.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _WX_GTK_STATTEXT_H_
@@ -22,7 +22,7 @@ public:
                 wxWindowID id,
                 const wxString &label,
                 const wxPoint &pos = wxDefaultPosition,
-                 const wxSize &size = wxDefaultSize,
+                 const wxSize &size = wxDefaultSize, 
                 long style = 0,
                 const wxString &name = wxStaticTextNameStr );

@@ -30,7 +30,7 @@ public:
                wxWindowID id,
                const wxString &label,
                const wxPoint &pos = wxDefaultPosition,
-                const wxSize &size = wxDefaultSize,
+                const wxSize &size = wxDefaultSize, 
                long style = 0,
                const wxString &name = wxStaticTextNameStr );

@@ -42,7 +42,7 @@ public:

    static wxVisualAttributes
    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
+    
    // see wx/stattext.h
    void Wrap(int width);

@@ -56,11 +56,10 @@ protected:
    virtual void DoSetSize(int x, int y,
                           int width, int height,
                           int sizeFlags = wxSIZE_AUTO);
-
+                           
    virtual wxSize DoGetBestSize() const;

    DECLARE_DYNAMIC_CLASS(wxStaticText)
 };

-#endif
-    // _WX_GTK_STATTEXT_H_
+#endif // _WX_GTK_STATTEXT_H_
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -174,9 +174,6 @@ public:
    static wxVisualAttributes
    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

-    // has the control been frozen by Freeze()?
-    bool IsFrozen() const { return m_frozenness > 0; }
-
 protected:
    virtual wxSize DoGetBestSize() const;
    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
@@ -189,6 +186,9 @@ protected:
    // override this and return true.
    virtual bool UseGTKStyleBase() const { return true; }

+    // has the control been frozen by Freeze()?
+    bool IsFrozen() const { return m_frozenness > 0; }
+
    virtual void DoSetValue(const wxString &value, int flags = 0);

 private:
--- a/include/wx/gtk/win_gtk.h
+++ b/include/wx/gtk/win_gtk.h
@@ -22,19 +22,51 @@ extern "C" {
 #define GTK_PIZZA(obj)          GTK_CHECK_CAST (obj, gtk_pizza_get_type (), GtkPizza)
 #define GTK_IS_PIZZA(obj)       GTK_CHECK_TYPE (obj, gtk_pizza_get_type ())

+/* Shadow types */
+typedef enum
+{
+    GTK_MYSHADOW_NONE,
+    GTK_MYSHADOW_THIN,
+    GTK_MYSHADOW_IN,
+    GTK_MYSHADOW_OUT
+} GtkMyShadowType;
+
+typedef struct _GtkPizzaChild    GtkPizzaChild;
 typedef struct _GtkPizza        GtkPizza;
+typedef struct _GtkPizzaClass   GtkPizzaClass;
+
+struct _GtkPizzaChild
+{
+    GtkWidget *widget;
+    gint x;
+    gint y;
+    gint width;
+    gint height;
+};

 struct _GtkPizza
 {
    GtkContainer container;
    GList *children;
+    GtkMyShadowType shadow_type;

    guint m_xoffset;
    guint m_yoffset;
    
+    gint  m_width;
+
    GdkWindow *bin_window;
 };

+struct _GtkPizzaClass
+{
+  GtkContainerClass parent_class;
+
+  void  (*set_scroll_adjustments)   (GtkPizza     *pizza,
+                                     GtkAdjustment  *hadjustment,
+                                     GtkAdjustment  *vadjustment);
+};
+
 WXDLLIMPEXP_CORE
 GtkType    gtk_pizza_get_type        (void);
 WXDLLIMPEXP_CORE
@@ -55,6 +87,9 @@ void       gtk_pizza_set_yoffset     (GtkPizza          *pizza, gint yoffset);
 WXDLLIMPEXP_CORE
 gint       gtk_pizza_get_rtl_offset  (GtkPizza          *pizza); 

+WXDLLIMPEXP_CORE
+void       gtk_pizza_set_shadow_type (GtkPizza          *pizza,
+                                      GtkMyShadowType    type);

 WXDLLIMPEXP_CORE
 void       gtk_pizza_scroll          (GtkPizza          *pizza,
--- a/include/wx/gtk1/dcmemory.h
+++ b/include/wx/gtk1/dcmemory.h
@@ -26,7 +26,7 @@ class WXDLLIMPEXP_CORE wxMemoryDC;
 class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC
 {
 public:
-    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
+    wxMemoryDC();
    wxMemoryDC( wxDC *dc ); // Create compatible DC
    virtual ~wxMemoryDC();
    virtual void SelectObject( const wxBitmap& bitmap );
--- a/include/wx/gtk1/gauge.h
+++ b/include/wx/gtk1/gauge.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __GTKGAUGEH__
@@ -99,5 +99,4 @@ private:

 #endif

-#endif
-    // __GTKGAUGEH__
+#endif // __GTKGAUGEH__
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -92,10 +92,9 @@ private:
    // common part of Append (if pos == -1)  and Insert
    bool GtkAppend(wxMenuItem *item, int pos=-1);

-    GtkWidget *m_prevRadio;
+	GtkWidget *m_prevRadio;

    DECLARE_DYNAMIC_CLASS(wxMenu)
 };

-#endif
-    // __GTKMENUH__
+#endif // __GTKMENUH__
--- a/include/wx/gtk1/stattext.h
+++ b/include/wx/gtk1/stattext.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __GTKSTATICTEXTH__
@@ -74,5 +74,4 @@ protected:
    DECLARE_DYNAMIC_CLASS(wxStaticText)
 };

-#endif
-    // __GTKSTATICTEXTH__
+#endif // __GTKSTATICTEXTH__
--- a/include/wx/html/webkit.h
+++ b/include/wx/html/webkit.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/html/webkit.h
+// Name:        webkit.h
 // Purpose:     wxWebKitCtrl - embeddable web kit control
 // Author:      Jethro Grassie / Kevin Ollivier
 // Modified by:
@@ -18,6 +18,9 @@
 #error "wxWebKitCtrl not implemented for this platform"
 #endif

+#ifdef __WXCOCOA
+#include <WebKit/WebKit.h>
+#endif
 #include "wx/control.h"

 // ----------------------------------------------------------------------------
@@ -59,36 +62,12 @@ public:
    void Stop();
    bool CanGetPageSource();
    wxString GetPageSource();
-    void SetPageSource(const wxString& source, const wxString& baseUrl = wxEmptyString);
+    void SetPageSource(wxString& source, const wxString& baseUrl = wxEmptyString);
 	wxString GetPageURL(){ return m_currentURL; }
-    void SetPageTitle(const wxString& title) { m_pageTitle = title; }
 	wxString GetPageTitle(){ return m_pageTitle; }
-    
-    // since these worked in 2.6, add wrappers
-    void SetTitle(const wxString& title) { SetPageTitle(title); }
-    wxString GetTitle() { return GetPageTitle(); }
-    
-    wxString GetSelection();
-    
-    bool CanIncreaseTextSize();
-    void IncreaseTextSize();
-    bool CanDecreaseTextSize();
-    void DecreaseTextSize();
-    
-    void Print(bool showPrompt=FALSE);
-    
-    void MakeEditable(bool enable=TRUE);
-    bool IsEditable();
-    
-    wxString RunScript(const wxString& javascript);
-    
-    void SetScrollPos(int pos);
-    int GetScrollPos();

    //we need to resize the webview when the control size changes
    void OnSize(wxSizeEvent &event);
-    void OnMove(wxMoveEvent &event);
-    void OnMouseEvents(wxMouseEvent &event);
 protected:
    DECLARE_EVENT_TABLE()
    void MacVisibilityChanged();
@@ -98,12 +77,7 @@ private:
    wxWindowID m_windowID;
    wxString m_currentURL;
    wxString m_pageTitle;
-    
    struct objc_object *m_webView;
-    
-    // we may use this later to setup our own mouse events,
-    // so leave it in for now.
-    void* m_webKitCtrlEventHandler;
    //It should be WebView*, but WebView is an Objective-C class
    //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.
 };
@@ -121,39 +95,6 @@ enum {
        wxWEBKIT_STATE_FAILED = 32
 };

-enum {
-    wxWEBKIT_NAV_LINK_CLICKED = 1,
-    wxWEBKIT_NAV_BACK_NEXT = 2,
-    wxWEBKIT_NAV_FORM_SUBMITTED = 4,
-    wxWEBKIT_NAV_RELOAD = 8,
-    wxWEBKIT_NAV_FORM_RESUBMITTED = 16,
-    wxWEBKIT_NAV_OTHER = 32
-
-};
-
-
-
-class wxWebKitBeforeLoadEvent : public wxCommandEvent
-{
-    DECLARE_DYNAMIC_CLASS( wxWebKitBeforeLoadEvent )
-    
-public:
-    bool IsCancelled() { return m_cancelled; }
-    void Cancel(bool cancel = true) { m_cancelled = cancel; }
-    wxString GetURL() { return m_url; }
-    void SetURL(const wxString& url) { m_url = url; }
-    void SetNavigationType(int navType) { m_navType = navType; }
-    int GetNavigationType() { return m_navType; }
-
-    wxWebKitBeforeLoadEvent( wxWindow* win = (wxWindow*) NULL );
-    wxEvent *Clone(void) const { return new wxWebKitBeforeLoadEvent(*this); }
-
-protected:
-    bool m_cancelled;
-    wxString m_url;
-    int m_navType;
-};
-
 class wxWebKitStateChangedEvent : public wxCommandEvent
 {
    DECLARE_DYNAMIC_CLASS( wxWebKitStateChangedEvent )
@@ -173,10 +114,8 @@ protected:
 };

 typedef void (wxEvtHandler::*wxWebKitStateChangedEventFunction)(wxWebKitStateChangedEvent&);
-typedef void (wxEvtHandler::*wxWebKitBeforeLoadEventFunction)(wxWebKitBeforeLoadEvent&);

 BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_WEBKIT_BEFORE_LOAD, wxID_ANY)
    DECLARE_LOCAL_EVENT_TYPE(wxEVT_WEBKIT_STATE_CHANGED, wxID_ANY)
 END_DECLARE_EVENT_TYPES()

@@ -187,16 +126,7 @@ END_DECLARE_EVENT_TYPES()
                            (wxObjectEventFunction)   \
                            (wxWebKitStateChangedEventFunction) & func, \
                            (wxObject *) NULL ),
-                            
-#define EVT_WEBKIT_BEFORE_LOAD(func) \
-            DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_BEFORE_LOAD, \
-                            wxID_ANY, \
-                            wxID_ANY, \
-                            (wxObjectEventFunction)   \
-                            (wxWebKitBeforeLoadEventFunction) & func, \
-                            (wxObject *) NULL ),

 #endif // wxUSE_WEBKIT

-#endif
-    // _WX_WEBKIT_H_
+#endif // _WX_WEBKIT_H_
--- a/include/wx/init.h
+++ b/include/wx/init.h
@@ -12,7 +12,6 @@
 #ifndef _WX_INIT_H_
 #define _WX_INIT_H_

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

 // ----------------------------------------------------------------------------
--- a/include/wx/listbook.h
+++ b/include/wx/listbook.h
@@ -24,14 +24,6 @@ class WXDLLEXPORT wxListEvent;
 extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED;
 extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING;

-// wxListbook flags
-#define wxLB_DEFAULT          wxBK_DEFAULT
-#define wxLB_TOP              wxBK_TOP
-#define wxLB_BOTTOM           wxBK_BOTTOM
-#define wxLB_LEFT             wxBK_LEFT
-#define wxLB_RIGHT            wxBK_RIGHT
-#define wxLB_ALIGN_MASK       wxBK_ALIGN_MASK
-
 // ----------------------------------------------------------------------------
 // wxListbook
 // ----------------------------------------------------------------------------
--- a/include/wx/mac/carbon/chkconf.h
+++ b/include/wx/mac/carbon/chkconf.h
@@ -34,15 +34,6 @@
    #define wxMAC_USE_CORE_GRAPHICS 1
 #endif

-/*
- * wxMAC_USE_CORE_GRAPHICS is now implemented in terms of wxUSE_GRAPHICS_CONTEXT
- */
- 
-#if wxMAC_USE_CORE_GRAPHICS 
-	#undef wxUSE_GRAPHICS_CONTEXT
-	#define wxUSE_GRAPHICS_CONTEXT 1
-#endif
-
 /*
 * check graphics context option
 */
--- a/include/wx/mac/carbon/config_xcode.h
+++ b/include/wx/mac/carbon/config_xcode.h
@@ -12,133 +12,90 @@
 // from config.log confdefs

 #define HAVE_SSIZE_T 1
+#define HAVE_BOOL 1
+#define HAVE_CONST_CAST
+#define HAVE_COS 1
+#define HAVE_EXPLICIT 1
+#define HAVE_FCNTL 1
+#define HAVE_FLOOR 1
+#define HAVE_FNMATCH 1
+#define HAVE_FNMATCH_H 1
+#define HAVE_GETTIMEOFDAY 1
+#define HAVE_ICONV 1
+#define HAVE_INET_ADDR 1
+#define HAVE_INET_ADDR 1
+#define HAVE_INET_ATON 1
+#define HAVE_INET_ATON 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_IOSTREAM 1
+#define HAVE_LANGINFO_H 1
+#define HAVE_LARGEFILE_SUPPORT 1
+#define HAVE_LOCALTIME 1
+#define HAVE_MEMORY_H 1
+#define HAVE_MKSTEMP 1
+#define HAVE_PTHREAD_CANCEL 1
+#define HAVE_PTHREAD_MUTEXATTR_T 1
+#define HAVE_PUTENV 1
+#define HAVE_PW_GECOS 1
+#define HAVE_REGCOMP 1
+#define HAVE_SCHED_H 1
+#define HAVE_SCHED_YIELD 1
+#define HAVE_SIGACTION 1
+#define HAVE_STATFS 1
+#define HAVE_STATIC_CAST
+#define HAVE_STDINT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRCASECMP_IN_STRING_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_STRING_H 1
+#define HAVE_STRPTIME 1
+#define HAVE_STRTOK_R 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_THREAD_PRIORITY_FUNCTIONS 1
+#define HAVE_TIMEGM 1
+#define HAVE_UNAME 1
+#define HAVE_UNISTD_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_USLEEP 1
+#define HAVE_VSNPRINTF 1
+#define HAVE_VSNPRINTF_DECL 1
+#define HAVE_WCHAR_H 1
+#define HAVE_WCSLEN 1
+#define HAVE_WPRINTF 1
+#define HAVE_WCSRTOMBS 1
+#define HAVE_X11_XKBLIB_H 1
+#define HAVE_X11_XLIB_H 1
+#define ICONV_CONST const
+#define PACKAGE_BUGREPORT "wx-dev@lists.wxwidgets.org"
+#define PACKAGE_NAME "wxWidgets"
+#define PACKAGE_STRING "wxWidgets 2.5.1"
+#define PACKAGE_TARNAME "wxwidgets"
+#define PACKAGE_VERSION "2.5.1"
+#define SIZEOF_CHAR 1
+#define SIZEOF_INT 4
+#define SIZEOF_LONG 4
+#define SIZEOF_LONG_LONG 8
+#define SIZEOF_SHORT 2
+#define SIZEOF_SIZE_T 4
+#define SIZEOF_VOID_P 4
+#define SIZEOF_WCHAR_T 4
+#define SOCKLEN_T socklen_t
 #define STDC_HEADERS 1
+#define TARGET_CARBON 1
 #if __BIG_ENDIAN__
 #define WORDS_BIGENDIAN 1
 #endif
-#define wxUSE_UNIX 1
-#define __UNIX__ 1
+#define WXWIN_OS_DESCRIPTION "Darwin 7.3.0 Power Macintosh"
+#define WX_GMTOFF_IN_TM 1
+#define WX_NO_REGEX_ADVANCED 1
+#define WX_STATFS_T struct statfs
+#define WX_TIMEZONE timezone
+#define _FILE_OFFSET_BITS 64
 #define __BSD__ 1
 #define __DARWIN__ 1
-#define wx_USE_NANOX 0
-#define TARGET_CARBON 1
-
-#define HAVE_BOOL 1
-#define HAVE_EXPLICIT 1
-#define HAVE_CONST_CAST 
-#define HAVE_REINTERPRET_CAST 
-#define HAVE_STATIC_CAST 
-#define HAVE_VA_COPY 1
-#define HAVE_VARIADIC_MACROS 1
-#define CONST_COMPATIBILITY 0
-#define WX_TIMEZONE timezone
-#define WX_SOCKLEN_T socklen_t
-#define SOCKOPTLEN_T socklen_t
-#define WX_STATFS_T struct statfs
-#define wxTYPE_SA_HANDLER int
-#define WX_GMTOFF_IN_TM 1
-#define HAVE_PW_GECOS 1
-#define HAVE_GETTIMEOFDAY 1
-#define HAVE_FSYNC 1
-#define HAVE_LARGEFILE_SUPPORT 1
-#define HAVE_LOCALTIME 1
-#define HAVE_SCHED_YIELD 1
-#define HAVE_PTHREAD_MUTEXATTR_T 1
-#define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1
-#define HAVE_PTHREAD_CANCEL 1
-#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
-#define HAVE_SIGACTION 1
-#define HAVE_SNPRINTF 1
-#define HAVE_SNPRINTF_DECL 1
-#define HAVE_UNIX98_PRINTF 1
-#define HAVE_STATFS 1
-#define HAVE_STATFS_DECL 1
-#define HAVE_STRPTIME 1
-#define HAVE_STRPTIME_DECL 1
-#define HAVE_THREAD_PRIORITY_FUNCTIONS 1
-#define HAVE_TIMEGM 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_VSNPRINTF_DECL 1
-#define HAVE_USLEEP 1
-#define HAVE_WCSLEN 1
-#define SIZEOF_CHAR 1
-#define SIZEOF_WCHAR_T 4
-#define SIZEOF_SHORT 2
-#define SIZEOF_INT 4
-#ifdef __LP64__
-#define SIZEOF_VOID_P 8
-#define SIZEOF_LONG 8
-#define SIZEOF_SIZE_T 8
-#else
-#define SIZEOF_VOID_P 4
-#define SIZEOF_LONG 4
-#define SIZEOF_SIZE_T 4
-#endif
-
-#define SIZEOF_LONG_LONG 8
+#define __POWERPC__ 1
+#define __UNIX__ 1
 #define wxSIZE_T_IS_ULONG 1
-#define HAVE_FCNTL 1
-#define HAVE_GETHOSTBYNAME 1
-#define HAVE_GETSERVBYNAME 1
-#define HAVE_GMTIME_R 1
-#define HAVE_INET_ADDR 1
-#define HAVE_INET_ATON 1
-#define HAVE_LOCALTIME_R 1
-#define HAVE_MKSTEMP 1
-#define HAVE_PUTENV 1
-#define HAVE_READDIR_R 1
-#define HAVE_STRTOK_R 1
-#define HAVE_UNAME 1
-#define HAVE_USLEEP 1
-#define HAVE_X11_XKBLIB_H 1
-#define HAVE_FNMATCH 1
-#define HAVE_FNMATCH_H 1
-#define HAVE_IOSTREAM 1
-#define HAVE_SCHED_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_WCHAR_H 1
-#define HAVE_ICONV 1
-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
-#define ICONV_CONST const
-#else
-#define ICONV_CONST
-#endif
-#define HAVE_LANGINFO_H 1
-#define HAVE_WCSRTOMBS 1
-#define HAVE_FPUTWS 1
-#define HAVE_STRCASECMP_IN_STRING_H 1
-#define HAVE_WPRINTF 1
-#define HAVE_SWPRINTF 1
-#define HAVE_VSWPRINTF 1
-#define HAVE_FSEEKO 1
-#define HAVE_SYS_SELECT_H 1
-
-#define WXWIN_OS_DESCRIPTION "Darwin 7.9.0 Power Macintosh"
-#define PACKAGE_BUGREPORT "wx-dev@lists.wxwidgets.org"
-#define PACKAGE_NAME "wxWidgets"
-#define PACKAGE_STRING "wxWidgets 2.7.1"
-#define PACKAGE_TARNAME "wxwidgets"
-#define PACKAGE_VERSION "2.7.1"
-
-// for regex
-#define WX_NO_REGEX_ADVANCED 1
-
-// for jpeg
-
-#define HAVE_STDLIB_H 1
-
-// OBSOLETE ?
- 
-#define HAVE_COS 1
-#define HAVE_FLOOR 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_MEMORY_H 1
-
-#define HAVE_REGCOMP 1
-#define HAVE_STRINGS_H 1
-#define HAVE_STRING_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_X11_XLIB_H 1
-#define SOCKLEN_T socklen_t
-#define _FILE_OFFSET_BITS 64
+#define wxTYPE_SA_HANDLER int
--- a/include/wx/mac/carbon/cursor.h
+++ b/include/wx/mac/carbon/cursor.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/cursor.h
+// Name:        cursor.h
 // Purpose:     wxCursor class
 // Author:      Stefan Csomor
 // Modified by:
@@ -34,7 +34,7 @@ public:
  wxCursor(int cursor_type);
  virtual ~wxCursor();

-  bool CreateFromXpm(const char **bits) ;
+	bool CreateFromXpm(const char **bits) ;
  virtual bool Ok() const { return IsOk(); }
  virtual bool IsOk() const ;

--- a/include/wx/mac/carbon/dc.h
+++ b/include/wx/mac/carbon/dc.h
@@ -36,8 +36,6 @@

 class wxMacPortStateHelper;

-#if !wxUSE_GRAPHICS_CONTEXT
-
 class WXDLLEXPORT wxGraphicPath
 {
 public :
@@ -243,7 +241,7 @@ public:
    }

 #if wxMAC_USE_CORE_GRAPHICS
-    wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; }
+    wxGraphicContext* GetGraphicContext() { return m_graphicContext; }
 #else
    WXHRGN MacGetCurrentClipRgn() { return m_macCurrentClipRgn; }
    static void MacSetupBackgroundForCurrentPort(const wxBrush& background );
@@ -344,7 +342,8 @@ public:
    WXHDC                           m_macPort;

 #if wxMAC_USE_CORE_GRAPHICS
-    wxGraphicsContext              *m_graphicContext;
+    wxGraphicContext                *m_graphicContext;
+    wxPoint                         m_macLocalOriginInPort;
 #else
    void                            MacInstallPen() const;
    void                            MacInstallBrush() const;
@@ -368,6 +367,4 @@ public:
 #endif
 };

-#endif
-
 #endif // _WX_DC_H_
--- a/include/wx/mac/carbon/dcclient.h
+++ b/include/wx/mac/carbon/dcclient.h
@@ -36,11 +36,6 @@ class WXDLLEXPORT wxWindowDC: public wxDC
  protected :
    virtual void DoGetSize( int *width, int *height ) const;
    wxWindow     *m_window;
-#if wxMAC_USE_CORE_GRAPHICS
-	bool		m_release;
-	int			m_width;
-	int			m_height;
-#endif
 };


@@ -57,9 +52,7 @@ class WXDLLEXPORT wxClientDC: public wxWindowDC
  virtual ~wxClientDC(void);

 protected:
-#if !wxMAC_USE_CORE_GRAPHICS
  virtual void DoGetSize( int *width, int *height ) const;
-#endif
 };

 class WXDLLEXPORT wxPaintDC: public wxWindowDC
@@ -75,9 +68,7 @@ class WXDLLEXPORT wxPaintDC: public wxWindowDC
  virtual ~wxPaintDC(void);

 protected:
-#if !wxMAC_USE_CORE_GRAPHICS
  virtual void DoGetSize( int *width, int *height ) const;
-#endif
 };

 #endif
--- a/include/wx/mac/carbon/dcmemory.h
+++ b/include/wx/mac/carbon/dcmemory.h
@@ -19,12 +19,11 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC
  DECLARE_DYNAMIC_CLASS(wxMemoryDC)

  public:
-    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
+    wxMemoryDC(void);
    wxMemoryDC( wxDC *dc ); // Create compatible DC
    virtual ~wxMemoryDC(void);
    virtual void SelectObject( const wxBitmap& bitmap );
-	wxBitmap    GetSelectedBitmap() { return m_selected ; }
-	wxBitmap    GetSelectedObject() { return GetSelectedBitmap() ; }
+        wxBitmap    GetSelectedObject() { return m_selected ; }

 protected:
    virtual void DoGetSize( int *width, int *height ) const;
--- a/include/wx/mac/carbon/dcscreen.h
+++ b/include/wx/mac/carbon/dcscreen.h
@@ -28,10 +28,6 @@ class WXDLLEXPORT wxScreenDC: public wxWindowDC
  static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return TRUE; }
  static bool StartDrawingOnTop(wxRect* WXUNUSED(rect) = NULL) { return TRUE; }
  static bool EndDrawingOnTop() { return TRUE; }
- private:
-#if wxMAC_USE_CORE_GRAPHICS
-	void* m_overlayWindow;
-#endif
 };

 #endif
--- a/include/wx/mac/carbon/dnd.h
+++ b/include/wx/mac/carbon/dnd.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/dnd.h
+// Name:        dnd.h
 // Purpose:     Declaration of the wxDropTarget, wxDropSource class etc.
 // Author:      Stefan Csomor
 // RCS-ID:      $Id$
@@ -55,7 +55,7 @@ class WXDLLEXPORT wxDropTarget: public wxDropTargetBase
    virtual bool OnDrop(wxCoord x, wxCoord y);
    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
    virtual bool GetData();
-
+    
    bool CurrentDragHasSupportedFormat() ;
    void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
    void* GetCurrentDrag() { return m_currentDrag ; }
@@ -95,14 +95,16 @@ public:
    wxWindow*     GetWindow() { return m_window ; }
    void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
    void* GetCurrentDrag() { return m_currentDrag ; }
-    bool MacInstallDefaultCursor(wxDragResult effect) ;
+	bool			MacInstallDefaultCursor(wxDragResult effect) ;
  protected :
-
+  	
    wxWindow        *m_window;
    void* m_currentDrag ;
 };

-#endif // wxUSE_DRAG_AND_DROP
-
 #endif
-   //_WX_DND_H_
+      // D&D
+
+#endif  
+       //_WX_DND_H_
+
--- a/include/wx/mac/carbon/drawer.h
+++ b/include/wx/mac/carbon/drawer.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/drawer.h
+// Name:        drawer.h
 // Purpose:     Drawer child window class.
 //              Drawer windows appear under their parent window and
 //              behave like a drawer, opening and closing to reveal
@@ -28,26 +28,26 @@
 class WXDLLEXPORT wxDrawerWindow : public wxTopLevelWindow
 {
    DECLARE_DYNAMIC_CLASS(wxDrawerWindow)
-
+    
 public:

    wxDrawerWindow();
-
+    
    wxDrawerWindow(wxWindow* parent,
-                   wxWindowID id,
-                   const wxString& title,
-                   wxSize size = wxDefaultSize,
-                   wxDirection edge = wxLEFT,
-                   const wxString& name = wxT("drawerwindow"))
+     wxWindowID id,
+     const wxString& title,
+     wxSize size = wxDefaultSize,
+     wxDirection edge = wxLEFT,
+     const wxString& name = wxT("drawerwindow"))
    {
        this->Create(parent, id, title, size, edge, name);
    }
-
+     
    virtual ~wxDrawerWindow();
-
-    // Create a drawer window.
+    
+    // Create a drawer window. 
    // If parent is NULL, create as a tool window.
-    // If parent is not NULL, then wxTopLevelWindow::Attach this window to parent.
+    // If parent is not NULL, then wxTopLevelWindow::Attach this window to parent. 
    bool Create(wxWindow *parent,
     wxWindowID id,
     const wxString& title,
@@ -58,14 +58,13 @@ public:
    bool Open(bool show = true); // open or close the drawer, possibility for async param, i.e. animate
    bool Close() { return this->Open(false); }
    bool IsOpen() const;
-
+    
    // Set the edge of the parent where the drawer attaches.
    bool SetPreferredEdge(wxDirection edge);
    wxDirection GetPreferredEdge() const;
-    wxDirection GetCurrentEdge() const; // not necessarily the preferred, due to screen constraints
+    wxDirection GetCurrentEdge() const;	// not necessarily the preferred, due to screen constraints
 };

 #endif // defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )

-#endif
-    // _WX_DRAWERWINDOW_H_
+#endif // _WX_DRAWERWINDOW_H_
--- a/Show More
+++ b/Show More