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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/COPY_OBJECT@12564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-21 20:51:16 +00:00
1111 changed files with 42263 additions and 357085 deletions
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -125,15 +125,11 @@ Refer to the readme.txt and install.txt files in docs/mac to build
 wxWindows under Classic Mac OS using CodeWarrior.

 If you are checking out the CVS sources using cvs under Mac OS X and
-compiling under Classic Mac OS:
-
- make sure that all text files have a Mac OS type of 'TEXT' otherwise
-  CodeWarrior may ignore them. Checking out the CVS sources using cvs
-  under Mac OS X creates untyped files which can lead to compilation
-  errors under CodeWarrior which are hard to track down.
-
- convert the xml files to CodeWarrior binary projects using the supplied
-  AppleScript in docs/mac (M5xml2mcp.applescript for CodeWarrior 5.3)
+compiling under Classic Mac OS, make sure that all text files have a
+Mac OS type of 'TEXT' otherwise CodeWarrior may ignore them. Checking
+out the CVS sources using cvs under Mac OS X creates untyped files
+which can lead to compialtion errors under CodeWarrior which are hard
+to track down.

 V) MacOS X using configure and the Developer Tools
 ----------------------------------------
--- a/Makefile.in
+++ b/Makefile.in
@@ -114,7 +114,6 @@ INTLDIR  = $(WXDIR)/locale
 ########################## Archive name ###############################

 # append a version suffix x.y.z to all file names
-VER_MAJMIN=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)
 VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)$(EXTRA_VER)
 WXARCHIVE=@DISTDIR@-$(VER_SUFFIX).tar.gz
 WXGLARCHIVE=@DISTDIR@-gl-$(VER_SUFFIX).tar.gz
@@ -395,15 +394,10 @@ CREATE_INSTALLED_LINKS_GL: preinstall_gl
 afminstall: preinstall
 	@if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
 	$(INSTALL) -d $(datadir)/wx
-	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)
-	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/afm
-	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm
-	$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm
-	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm
-        
-m4datainstall: preinstall
-	$(INSTALL) -d $(datadir)/aclocal
-	$(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal
+	$(INSTALL) -d $(datadir)/wx/afm
+	$(INSTALL) -d $(datadir)/wx/gs_afm
+	$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
+	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm

 # this is the real install target: copies the library, wx-config and the
 # headers to the installation directory
@@ -418,7 +412,7 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM

 	$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
 	cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config
-	@INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
+	$(INSTALL_PROGRAM) $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
 	@if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then	\
 		$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi

@@ -436,9 +430,6 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
 	@if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi

-	@# always install msw headers for wxBase, it's much simpler
-	@if test "$(USE_GUI)" = 0; then $(INSTALL) -d $(includedir)/wx/msw; fi
-
 	$(INSTALL) -d $(includedir)/wx/protocol
 	$(INSTALL) -d $(includedir)/wx/unix
 	@list='$(HEADERS)'; for p in $$list; do \
@@ -466,9 +457,9 @@ preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@
 	@echo " Installing wxWindows OpenGl add-on..."
 	@echo " "
 	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
-	@INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
+	$(INSTALL_PROGRAM) $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@

-install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall
+install: @AFMINSTALL@ @WX_ALL_INSTALLED@
 	@echo " "
 	@echo " The installation of wxWindows is finished.  On certain"
 	@echo " platforms (e.g. Linux) you'll now have to run ldconfig"
@@ -533,8 +524,9 @@ uninstall:
 ALL_DIST: distclean
 	mkdir _dist_dir
 	mkdir $(DISTDIR)
-	cp $(WXDIR)/wxwin.m4 $(DISTDIR)
 	cp $(WXDIR)/aclocal.m4 $(DISTDIR)
+	cp $(WXDIR)/configure.in $(DISTDIR)
+	cp $(WXDIR)/configure $(DISTDIR)
 	cp $(WXDIR)/config.sub $(DISTDIR)
 	cp $(WXDIR)/config.guess $(DISTDIR)
 	cp $(WXDIR)/install-sh $(DISTDIR)
@@ -544,11 +536,11 @@ ALL_DIST: distclean
 	cp $(WXDIR)/setup.h_vms $(DISTDIR)
 	cp $(WXDIR)/descrip.mms $(DISTDIR)
 	cp $(WXDIR)/Makefile.in $(DISTDIR)
-	cp $(WXDIR)/wxBase.spec $(DISTDIR)
 	cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
 	cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
 	cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt
 	cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
+	cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
 	mkdir $(DISTDIR)/lib
 	cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
 	cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
@@ -557,6 +549,7 @@ ALL_DIST: distclean
 	mkdir $(DISTDIR)/src/zlib
 	cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
 	cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
+	cp $(ZLIBDIR)/*.mcp $(DISTDIR)/src/zlib
 	cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
 	cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
 	mkdir $(DISTDIR)/src/regex
@@ -573,9 +566,7 @@ ALL_DIST: distclean
 # this target is the common part of distribution script for all GUI toolkits,
 # but is not used when building wxBase distribution
 ALL_GUI_DIST: ALL_DIST
-	cp $(WXDIR)/configure.in $(DISTDIR)
-	cp $(WXDIR)/configure $(DISTDIR)
-	cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
+	cp $(WXDIR)/wxBase.spec $(DISTDIR)
 	cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt        
 	if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \
 	  cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi
@@ -623,12 +614,15 @@ ALL_GUI_DIST: ALL_DIST
 	cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
 	cp $(PNGDIR)/*.h $(DISTDIR)/src/png
 	cp $(PNGDIR)/*.c $(DISTDIR)/src/png
+	cp $(PNGDIR)/*.mcp $(DISTDIR)/src/png
 	cp $(PNGDIR)/README $(DISTDIR)/src/png
 	cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
 	cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
+	cp $(JPEGDIR)/*.mcp $(DISTDIR)/src/jpeg
 	cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
 	cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff
 	cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
+	cp $(TIFFDIR)/*.mcp $(DISTDIR)/src/tiff
 	cp $(TIFFDIR)/README $(DISTDIR)/src/tiff
 	cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
 	cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
@@ -639,25 +633,19 @@ ALL_GUI_DIST: ALL_DIST
 	cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc

 BASE_DIST: ALL_DIST
-	# make --disable-gui the default
-	sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \
-		$(WXDIR)/configure.in > $(DISTDIR)/configure.in
-	sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \
-		$(WXDIR)/configure > $(DISTDIR)/configure
-	chmod +x $(DISTDIR)/configure
 	mkdir $(DISTDIR)/include
 	mkdir $(DISTDIR)/include/wx
 	mkdir $(DISTDIR)/include/wx/protocol
 	mkdir $(DISTDIR)/include/wx/unix
-	mkdir $(DISTDIR)/include/wx/msw
 	mkdir $(DISTDIR)/src/common
 	mkdir $(DISTDIR)/src/unix
 	mkdir $(DISTDIR)/src/msw
+	cp $(WXDIR)/wxBase.spec $(DISTDIR)
 	cp @PORT_FILES@ $(DISTDIR)
 	cp $(WXDIR)/src/wxBase*.dsp $(DISTDIR)
 	cp $(WXDIR)/src/wxBase*.dsw $(DISTDIR)
 	cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
-	cp $(DOCDIR)/install.txt $(DISTDIR)/README.txt
+	cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
 	cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
 	cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
@@ -678,7 +666,6 @@ BASE_DIST: ALL_DIST
 	cp $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
 	cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
 	cp $(SAMPDIR)/console/console.cpp $(DISTDIR)/samples/console
-	cp $(SAMPDIR)/console/console.dsp $(DISTDIR)/samples/console
 	cp $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console

 GTK_DIST: ALL_GUI_DIST
@@ -708,6 +695,7 @@ MOTIF_DIST: ALL_GUI_DIST
 MACX_DIST: ALL_GUI_DIST
 	cp $(INCDIR)/*.* $(DISTDIR)/include
 	cp $(INCDIR)/wx/mac/*.h $(DISTDIR)/include/wx/mac
+	cp $(SRCDIR)/*.mcp $(DISTDIR)/src
 	cp $(MACDIR)/files.lst $(DISTDIR)/src/mac
 	cp $(MACDIR)/*.cpp $(DISTDIR)/src/mac
 	cp $(MACDIR)/*.c $(DISTDIR)/src/mac
@@ -716,6 +704,14 @@ MACX_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/src/mac/morefile
 	cp $(MACDIR)/morefile/*.h $(DISTDIR)/src/mac/morefile
 	cp $(MACDIR)/morefile/*.c $(DISTDIR)/src/mac/morefile
+	mkdir $(DISTDIR)/src/mac/cdef
+	cp $(MACDIR)/cdef/*.h $(DISTDIR)/src/mac/cdef
+	cp $(MACDIR)/cdef/*.c $(DISTDIR)/src/mac/cdef
+	cp $(MACDIR)/cdef/*.mcp $(DISTDIR)/src/mac/cdef
+	mkdir $(DISTDIR)/src/mac/ldef
+	cp $(MACDIR)/ldef/*.h $(DISTDIR)/src/mac/ldef
+	cp $(MACDIR)/ldef/*.c $(DISTDIR)/src/mac/ldef
+	cp $(MACDIR)/ldef/*.mcp $(DISTDIR)/src/mac/cdef
 	mkdir $(DISTDIR)/src/mac/macsock
 	cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock

@@ -758,6 +754,8 @@ DEMOS_DIST: ALL_GUI_DIST
 	cp $(DEMODIR)/configure $(DISTDIR)/demos
 	cp $(DEMODIR)/configure.in $(DISTDIR)/demos

+	cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
+
 	mkdir $(DISTDIR)/demos/bombs
 	cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
 	cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs
@@ -766,8 +764,6 @@ DEMOS_DIST: ALL_GUI_DIST
 	cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
 	cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs

-	cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
-
 	mkdir $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty
@@ -810,6 +806,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples/calendar
 	cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar
 	cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar
+	cp $(SAMPDIR)/calendar/*.mcp $(DISTDIR)/samples/calendar
 	cp $(SAMPDIR)/calendar/*.cpp $(DISTDIR)/samples/calendar

 	mkdir $(DISTDIR)/samples/caret
@@ -821,6 +818,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples/checklst
 	cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
 	cp $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst
+	cp $(SAMPDIR)/checklst/*.mcp $(DISTDIR)/samples/checklst
 	cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
 	cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
 	cp $(SAMPDIR)/checklst/*.mms $(DISTDIR)/samples/checklst
@@ -828,6 +826,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples/config
 	cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config
 	cp $(SAMPDIR)/config/makefile.unx $(DISTDIR)/samples/config
+	cp $(SAMPDIR)/config/*.mcp $(DISTDIR)/samples/config
 	cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config

 	mkdir $(DISTDIR)/samples/console
@@ -839,6 +838,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples/controls/icons
 	cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls
+	cp $(SAMPDIR)/controls/*.mcp $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/*.mms $(DISTDIR)/samples/controls
@@ -854,6 +854,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/makefile.unx $(DISTDIR)/samples/dialogs
+	cp $(SAMPDIR)/dialogs/*.mcp $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
@@ -1311,7 +1312,6 @@ MANUAL_DIST:
 PYTHON_DIST:
 	mkdir $(DISTDIR)/wxPython
 	mkdir $(DISTDIR)/wxPython/contrib
-	mkdir $(DISTDIR)/wxPython/contrib/gizmos
 	mkdir $(DISTDIR)/wxPython/contrib/glcanvas
 	mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
 	mkdir $(DISTDIR)/wxPython/contrib/ogl
@@ -1332,7 +1332,6 @@ PYTHON_DIST:
 	cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
 	cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython
 	cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython
-	cp $(WXDIR)/wxPython/contrib/gizmos/*.{py,cpp,i} $(DISTDIR)/wxPython/contrib/gizmos
 	-cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas
 	cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk
 	-cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl
@@ -1453,7 +1452,7 @@ cleanall: clean

 RPMTOP=_dist_dir/_rpm_top

-rpm: bzip-dist
+rpm: dist
 	@echo "*** Building RPMs ***"
 	-mkdir $(RPMTOP)
 	-mkdir $(RPMTOP)/SOURCES
@@ -1461,7 +1460,7 @@ rpm: bzip-dist
 	-mkdir $(RPMTOP)/BUILD
 	-mkdir $(RPMTOP)/RPMS
 	-mkdir $(RPMTOP)/SRPMS
-	cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES
+	cp -f $(WXARCHIVE) $(RPMTOP)/SOURCES
 	rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
 	mv -f `find $(RPMTOP) -name "wx$(TARGET)*.rpm"` .

--- a/1471
+++ b/1471
--- a/configure.in
+++ b/configure.in
@@ -397,6 +397,7 @@ USE_SUN=
 USE_SOLARIS=
 USE_SUNOS=
 USE_ALPHA=
+USE_IA64=
 USE_OSF=
 USE_BSD=
 USE_DARWIN=
@@ -461,6 +462,10 @@ case "${host}" in
      USE_ALPHA=1
      AC_DEFINE(__ALPHA__)
    fi
+    if test "x$TMP" = "xia64"; then
+      USE_IA64=1
+      AC_DEFINE(__IA64__)
+    fi
    DEFAULT_DEFAULT_wxUSE_GTK=1
  ;;
  *-*-irix5* | *-*-irix6* )
@@ -651,7 +656,6 @@ if test $DEBUG_CONFIGURE = 1; then
  DEFAULT_wxUSE_LOG=yes
  DEFAULT_wxUSE_LOGWINDOW=no
  DEFAULT_wxUSE_LOGGUI=no
-  DEFAULT_wxUSE_LOGDIALOG=no

  DEFAULT_wxUSE_GUI=yes
  DEFAULT_wxUSE_CONTROLS=no
@@ -780,7 +784,6 @@ if test $DEBUG_CONFIGURE = 1; then
  DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
  DEFAULT_wxUSE_TREECTRL=no
  DEFAULT_wxUSE_POPUPWIN=no
-  DEFAULT_wxUSE_TIPWINDOW=no

  DEFAULT_wxUSE_UNICODE=no
  DEFAULT_wxUSE_WCSRTOMBS=no
@@ -816,7 +819,6 @@ else
  DEFAULT_wxUSE_LOG=yes
  DEFAULT_wxUSE_LOGWINDOW=yes
  DEFAULT_wxUSE_LOGGUI=yes
-  DEFAULT_wxUSE_LOGDIALOG=yes

  DEFAULT_wxUSE_GUI=yes

@@ -944,7 +946,6 @@ else
  DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
  DEFAULT_wxUSE_TREECTRL=yes
  DEFAULT_wxUSE_POPUPWIN=yes
-  DEFAULT_wxUSE_TIPWINDOW=yes

  DEFAULT_wxUSE_UNICODE=no
  DEFAULT_wxUSE_WCSRTOMBS=no
@@ -1008,7 +1009,7 @@ WX_ARG_WITH(opengl,        [  --with-opengl           use OpenGL (or Mesa)], wxU
 fi
 dnl for GUI only

-WX_ARG_WITH(dmalloc,       [  --with-dmalloc          use dmalloc library (http://dmalloc.com/)], wxUSE_DMALLOC)
+WX_ARG_WITH(dmalloc,       [  --with-dmalloc          use dmalloc library (www.letters.com/dmalloc)], wxUSE_DMALLOC)
 WX_ARG_SYS_WITH(regex,     [  --with-regex            enable support for wxRegEx class], wxUSE_REGEX)
 WX_ARG_SYS_WITH(zlib,      [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
 WX_ARG_WITH(odbc,          [  --with-odbc             use the IODBC and wxODBC classes], wxUSE_ODBC)
@@ -1088,7 +1089,7 @@ WX_ARG_ENABLE(zipstream,     [  --enable-zipstream      use wxZipInputStream], w
 WX_ARG_ENABLE(catch_segvs,   [  --enable-catch_segvs    catch signals and pass them to wxApp::OnFatalException], wxUSE_ON_FATAL_EXCEPTION)
 WX_ARG_ENABLE(snglinst,      [  --enable-snglinst       use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER)

-WX_ARG_ENABLE(mimetype,      [  --enable-mimetype       use wxMimeTypesManager], wxUSE_MIMETYPE)
+WX_ARG_ENABLE(mimetype,      [  --enable-mimetypes      use wxMimeTypesManager], wxUSE_MIMETYPE)
 WX_ARG_ENABLE(system_options,[  --enable-sysoptions     use wxSystemOptions], wxUSE_SYSTEM_OPTIONS)

 dnl ---------------------------------------------------------------------------
@@ -1114,7 +1115,6 @@ WX_ARG_ENABLE(printarch,   [  --enable-printarch      use printing architecture]
 WX_ARG_ENABLE(mdi,         [  --enable-mdi            use multiple document interface architecture], wxUSE_MDI_ARCHITECTURE)
 WX_ARG_ENABLE(loggui,      [  --enable-loggui         use standard GUI logger], wxUSE_LOGGUI)
 WX_ARG_ENABLE(logwin,      [  --enable-logwin         use wxLogWindow], wxUSE_LOGWINDOW)
-WX_ARG_ENABLE(logdialog,   [  --enable-logdialog      use wxLogDialog], wxUSE_LOGDIALOG)

 dnl ---------------------------------------------------------------------------
 dnl PostScript options
@@ -1191,7 +1191,6 @@ if test "$wxUSE_CONTROLS" = "yes"; then
  DEFAULT_wxUSE_TOOLTIPS=yes
  DEFAULT_wxUSE_TREECTRL=yes
  DEFAULT_wxUSE_POPUPWIN=yes
-  DEFAULT_wxUSE_TIPWINDOW=yes
 elif test "$wxUSE_CONTROLS" = "no"; then
  DEFAULT_wxUSE_ACCEL=no
  DEFAULT_wxUSE_BMPBUTTON=no
@@ -1230,7 +1229,6 @@ elif test "$wxUSE_CONTROLS" = "no"; then
  DEFAULT_wxUSE_TOOLTIPS=no
  DEFAULT_wxUSE_TREECTRL=no
  DEFAULT_wxUSE_POPUPWIN=no
-  DEFAULT_wxUSE_TIPWINDOW=no
 fi

 WX_ARG_ENABLE(accel,       [  --enable-accel          use accelerators], wxUSE_ACCEL)
@@ -1270,7 +1268,6 @@ WX_ARG_ENABLE(toolbar,     [  --enable-toolbar        use wxToolBar class], wxUS
 WX_ARG_ENABLE(tbarnative,  [  --enable-tbarnative     use native wxToolBar class], wxUSE_TOOLBAR_NATIVE)
 WX_ARG_ENABLE(tbarsmpl,    [  --enable-tbarsmpl       use wxToolBarSimple class], wxUSE_TOOLBAR_SIMPLE)
 WX_ARG_ENABLE(treectrl,    [  --enable-treectrl       use wxTreeCtrl class], wxUSE_TREECTRL)
-WX_ARG_ENABLE(tipwindow,   [  --enable-tipwindow      use wxTipWindow class], wxUSE_TIPWINDOW)
 WX_ARG_ENABLE(popupwin,    [  --enable-popupwin       use wxPopUpWindow class], wxUSE_POPUPWIN)

 dnl ---------------------------------------------------------------------------
@@ -1281,7 +1278,7 @@ WX_ARG_ENABLE(commondlg,   [  --enable-commondlg      use all common dialogs], w
 WX_ARG_ENABLE(choicedlg,   [  --enable-choicedlg      use wxChoiceDialog], wxUSE_CHOICEDLG)
 WX_ARG_ENABLE(coldlg,      [  --enable-coldlg         use wxColourDialog], wxUSE_COLOURDLG)
 WX_ARG_ENABLE(filedlg,     [  --enable-filedlg        use wxFileDialog], wxUSE_FILEDLG)
-WX_ARG_ENABLE(finddlg,     [  --enable-finddlg        use wxFindReplaceDialog], wxUSE_FINDREPLDLG)
+WX_ARG_ENABLE(filedlg,     [  --enable-finddlg        use wxFindReplaceDialog], wxUSE_FINDREPLDLG)
 WX_ARG_ENABLE(fontdlg,     [  --enable-fontdlg        use wxFontDialog], wxUSE_FONTDLG)
 WX_ARG_ENABLE(dirdlg,      [  --enable-dirdlg         use wxDirDialog], wxUSE_DIRDLG)
 WX_ARG_ENABLE(msgdlg,      [  --enable-msgdlg         use wxMessageDialog], wxUSE_MSGDLG)
@@ -1315,7 +1312,7 @@ WX_ARG_ENABLE(image,       [  --enable-image          use wxImage class], wxUSE_
 WX_ARG_ENABLE(gif,         [  --enable-gif            use gif images (GIF file format)], wxUSE_GIF)
 WX_ARG_ENABLE(pcx,         [  --enable-pcx            use pcx images (PCX file format)], wxUSE_PCX)
 WX_ARG_ENABLE(pnm,         [  --enable-pnm            use pnm images (PNM file format)], wxUSE_PNM)
-WX_ARG_ENABLE(xpm,         [  --enable-xpm            use xpm images (XPM file format)], wxUSE_XPM)
+WX_ARG_ENABLE(pnm,         [  --enable-xpm            use xpm images (XPM file format)], wxUSE_XPM)

 fi
 dnl for GUI only
@@ -2446,11 +2443,9 @@ WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a"

 dnl define which libs wx-config should link.
 WXCONFIG_LIBS="-l${WX_LIBRARY}"
-WXCONFIG_LIBS_STATIC="lib${WX_LIBRARY}.a"

 if test "$wxUSE_OPENGL" = "yes"; then
-    WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} ${OPENGL_LIBS}"
-    WXCONFIG_LIBS_STATIC_GL="lib${WX_LIBRARY_GL}.a ${OPENGL_LIBS}"
+    WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} $OPENGL_LIBS"
 fi


@@ -2537,9 +2532,9 @@ if test "$wxUSE_SHARED" = "yes"; then
      ;;

      *-*-darwin* )
-        CFLAGS="$CFLAGS -fno-common -DDYLIB_INIT"
-        CXXFLAGS="$CXXFLAGS -fno-common -DDYLIB_INIT"
-        SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -o"
+        CFLAGS="$CFLAGS -fno-common"
+        CXXFLAGS="$CXXFLAGS -fno-common"
+        SHARED_LD="$CXX -dynamiclib -o"
        PIC_FLAG="-dynamic -fPIC"
      ;;

@@ -2597,7 +2592,6 @@ if test "$wxUSE_SHARED" = "yes"; then

    dnl do not alter the LIBRARY_TYPE strings "so" and "a", they are magic
    WX_TARGET_LIBRARY_TYPE="so"
-    INSTALL_LIBRARY='$(INSTALL_PROGRAM)'
 fi

 dnl do not 'else' this, it may be changed in the above conditional.
@@ -2624,7 +2618,6 @@ if test "$wxUSE_SHARED" = "no"; then
    WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"

    WX_TARGET_LIBRARY_TYPE="a"
-    INSTALL_LIBRARY='$(INSTALL_DATA)'
 fi

 if test "$wxUSE_MAC" = 1; then
@@ -2632,7 +2625,7 @@ if test "$wxUSE_MAC" = 1; then
    WX_ALL="${WX_ALL} \$(build_libdir)/lib${WX_LIBRARY}.r"
    WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
    AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
-    AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
+    AC_CHECK_PROG(DEREZ, Derez, Derez, /Developer/Tools/Derez)
    LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r"
    LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
    LIBWXMACRESWXCONFIG="${RESCOMP} Carbon.r -t APPL \${prefix}/lib/${WX_RESOURCES_MACOSX_COMPILED} -o"
@@ -2652,16 +2645,12 @@ fi

 dnl defines HAVE_STDLIB_H
 AC_CHECK_HEADERS(stdlib.h)
-dnl defines HAVE_MALLOC_H
-AC_CHECK_HEADERS(malloc.h)
 dnl defines HAVE_UNISTD_H
 AC_CHECK_HEADERS(unistd.h)
 dnl defines HAVE_WCHAR_H
 AC_CHECK_HEADERS(wchar.h)
 dnl defines HAVE_WCSTR_H
 AC_CHECK_HEADERS(wcstr.h)
-dnl defined HAVE_WCTYPE_H
-AC_CHECK_HEADERS(wctype.h)
 dnl defines HAVE_FNMATCH_H
 AC_CHECK_HEADERS(fnmatch.h)
 dnl defines HAVE_ICONV_H (Unix98 encoding conversion routines)
@@ -2693,15 +2682,11 @@ AC_TYPE_UID_T

 dnl   check for wchar_t
 dnl   Mac OS X does not provide wchar.h and wchar_t is defined by stdlib.h (GD)
-dnl   on Cygwin wchar.h needs stddef.h to be #included by hand
 AC_CACHE_CHECK([for wchar_t], wx_cv_type_wchar_t,
 [
    AC_TRY_COMPILE(
        [
            #ifdef HAVE_WCHAR_H
-            #  ifdef __CYGWIN__
-            #    include <stddef.h>
-            #  endif
            #  include <wchar.h>
            #endif
            #ifdef HAVE_STDLIB_H
@@ -2826,9 +2811,6 @@ AC_CACHE_CHECK([size of wchar_t], wx_cv_sizeof_wchar_t,
    AC_TRY_RUN(
        [
            #ifdef HAVE_WCHAR_H
-            #  ifdef __CYGWIN__
-            #    include <stddef.h>
-            #  endif
            #  include <wchar.h>
            #endif
            #ifdef HAVE_STDLIB_H
@@ -3055,9 +3037,6 @@ fi
 dnl check for vfork() (even if it's the same as fork() in modern Unices)
 AC_CHECK_FUNCS(vfork)

-dnl check for the function for temp files creation
-AC_CHECK_FUNCS(mkstemp mktemp, break)
-
 dnl get the library function to use for wxGetDiskSpace(): it is statfs() under
 dnl Linux and *BSD and statvfs() under Solaris
 AC_CACHE_CHECK(for statfs, wx_cv_func_statfs,
@@ -3241,10 +3220,10 @@ if test "$TOOLKIT" != "MSW"; then

    if test "$wxUSE_THREADS" = "yes" ; then
        if test "$wxUSE_WINE" = 1 ; then
-            AC_MSG_WARN([Threads are not supported under WINE... disabled])
+            AC_MSG_WARN([Threads are not supported under WINE])
            wxUSE_THREADS="no"
        elif test "$USE_BEOS" = 1; then
-            AC_MSG_WARN([BeOS threads are not yet supported... disabled])
+            AC_MSG_WARN([BeOS threads are not yet supported])
            wxUSE_THREADS="no"
        fi
    fi
@@ -3280,7 +3259,7 @@ if test "$TOOLKIT" != "MSW"; then

        if test -z "$THREADS_OBJ" ; then
            wxUSE_THREADS=no
-            AC_MSG_WARN([No thread support on this system... disabled])
+            AC_MSG_WARN(No thread support on this system)
        fi
    fi

@@ -3658,7 +3637,7 @@ fi

 if test "$wxUSE_TEXTFILE" = "yes"; then
  if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then
-    AC_MSG_WARN(wxTextFile requires wxFile and wxTextBuffer... disabled)
+    AC_MSG_WARN(wxTextFile requires wxFile and wxTextBuffer and won't be compiled without them)
  else
    AC_DEFINE(wxUSE_TEXTFILE)
  fi
@@ -3666,7 +3645,7 @@ fi

 if test "$wxUSE_CONFIG" = "yes" ; then
  if test "$wxUSE_TEXTFILE" != "yes"; then
-    AC_MSG_WARN(wxConfig requires wxTextFile... disabled)
+    AC_MSG_WARN(wxConfig requires wxTextFile and it won't be compiled without it)
  else
    AC_DEFINE(wxUSE_CONFIG)
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
@@ -3675,7 +3654,7 @@ fi

 if test "$wxUSE_INTL" = "yes" ; then
  if test "$wxUSE_FILE" != "yes"; then
-    AC_MSG_WARN(I18n code requires wxFile... disabled)
+    AC_MSG_WARN(I18n code requires wxFile and it won't be compiled without it)
  else
    AC_DEFINE(wxUSE_INTL)
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
@@ -3693,10 +3672,6 @@ if test "$wxUSE_LOG" = "yes"; then
    if test "$wxUSE_LOGWINDOW" = "yes"; then
      AC_DEFINE(wxUSE_LOGWINDOW)
    fi
-
-    if test "$wxUSE_LOGDIALOG" = "yes"; then
-      AC_DEFINE(wxUSE_LOG_DIALOG)
-    fi
 fi

 if test "$wxUSE_LONGLONG" = "yes"; then
@@ -3943,15 +3918,6 @@ dnl ---------------------------------------------------------------------------

 if test "$wxUSE_GUI" = "yes"; then

-    if test "$TOOLKIT" = "MAC"; then
-        AC_MSG_WARN([Joystick not yet supported under Mac OS X... disabled])
-        wxUSE_JOYSTICK=no
-     fi
-    if test "$TOOLKIT" = "MOTIF"; then
-        AC_MSG_WARN([Joystick not yet supported under Motif... disabled])
-        wxUSE_JOYSTICK=no
-     fi
-
    dnl under MSW we always have joystick support
    if test "$TOOLKIT" != "MSW"; then
        if test "$wxUSE_JOYSTICK" = "yes"; then
@@ -3959,7 +3925,7 @@ if test "$wxUSE_GUI" = "yes"; then
            AC_CHECK_HEADERS(linux/joystick.h)
            if test "$ac_cv_header_linux_joystick_h" != "yes"; then
                wxUSE_JOYSTICK=no
-                AC_MSG_WARN(Joystick not supported by this system... disabled)
+                AC_MSG_WARN(Joystick not supported by this system, disabled)
            fi
        fi
    fi
@@ -4101,7 +4067,7 @@ fi

 if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
    if test "$wxUSE_UNIVERSAL" = "yes"; then
-        AC_MSG_WARN(MDI not yet supported for wxUNIVERSAL... disabled)
+        AC_MSG_WARN(MDI is not supported for wxUNIVERSAL yet... disabled)
        wxUSE_MDI_ARCHITECTURE=no
    fi

@@ -4208,7 +4174,7 @@ fi

 if test "$wxUSE_IPC" = "yes"; then
    if test "$wxUSE_SOCKETS" != "yes"; then
-        AC_MSG_WARN(wxWindows IPC classes require sockets... disabled)
+        AC_MSG_WARN(wxWindows IPC classes require sockets, disabled)
    fi

    AC_DEFINE(wxUSE_IPC)
@@ -4224,18 +4190,18 @@ fi
 if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
    if test "$wxUSE_GTK" = 1; then
        if test "$WXGTK12" != 1; then
-            AC_MSG_WARN([Drag and drop is only supported under GTK+ 1.2... disabled])
+            AC_MSG_WARN([Drag and drop is only supported under GTK+ 1.2])
            wxUSE_DRAG_AND_DROP=no
        fi
    fi

    if test "$wxUSE_MOTIF" = 1; then
-        AC_MSG_WARN([Drag and drop not yet supported under Motif... disabled])
+        AC_MSG_WARN([Drag and drop is not yet supported under Motif])
        wxUSE_DRAG_AND_DROP=no
    fi

    if test "$wxUSE_MAC" = 1; then
-        AC_MSG_WARN([Drag and drop not yet supported under Mac OS X... disabled])
+        AC_MSG_WARN([Drag and drop is not yet supported under Mac OS X])
        wxUSE_DRAG_AND_DROP=no
    fi

@@ -4440,12 +4406,8 @@ if test "$wxUSE_TEXTCTRL" = "yes"; then
 fi

 if test "$wxUSE_TOGGLEBTN" = "yes"; then
-    if test "$wxUSE_MAC" = 1; then
-        AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
-        wxUSE_TOGGLEBTN=no
-    fi
-    if test "$wxUSE_UNIVERSAL" = "yes"; then
-        AC_MSG_WARN([Toggle button not yet supported under wxUNIVERSAL... disabled])
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_UNIVERSAL" = "yes"; then
+        AC_MSG_WARN([Toggle button not yet supported under Mac OS X or wxUNIVERSAL... disabled])
        wxUSE_TOGGLEBTN=no
    fi

@@ -4480,19 +4442,15 @@ fi

 if test "$wxUSE_TOOLTIPS" = "yes"; then
    if test "$wxUSE_MOTIF" = 1; then
-        AC_MSG_WARN([wxTooltip not supported yet under Motif... disabled])
+        AC_MSG_WARN(wxTooltip not supported yet under Motif)
    else
        if test "$wxUSE_WINE" = 1; then
-            AC_MSG_WARN([wxTooltip not supported under WINE... disabled])
-        else
-            if test "$wxUSE_UNIVERSAL" = "yes"; then
-                AC_MSG_WARN([wxTooltip not supported yet in wxUNIVERSAL... disabled])
+            AC_MSG_WARN(wxTooltip not supported under WINE)
        else
            AC_DEFINE(wxUSE_TOOLTIPS)
        fi
    fi
 fi
-fi

 if test "$wxUSE_TREECTRL" = "yes"; then
    if test "$wxUSE_IMAGLIST" = "yes"; then
@@ -4506,21 +4464,12 @@ fi

 if test "$wxUSE_POPUPWIN" = "yes"; then
    if test "$wxUSE_MAC" = 1; then
-        AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
-    else
-        if test "$wxUSE_MOTIF" = 1; then
-            AC_MSG_WARN([wxPopupWindow not yet supported under Motif... disabled])
+        AC_MSG_WARN(Popup window is not yet supported under Mac OS)
    else
        AC_DEFINE(wxUSE_POPUPWIN)
-
        USES_CONTROLS=1
    fi
 fi
-fi
-
-if test "$wxUSE_TIPWINDOW" = "yes"; then
-    AC_DEFINE(wxUSE_TIPWINDOW)
-fi

 if test "$USES_CONTROLS" = 1; then
    AC_DEFINE(wxUSE_CONTROLS)
@@ -4834,8 +4783,6 @@ AC_SUBST(host_alias)
 AC_SUBST(cross_compiling)
 AC_SUBST(WXCONFIG_LIBS)
 AC_SUBST(WXCONFIG_LIBS_GL)
-AC_SUBST(WXCONFIG_LIBS_STATIC)
-AC_SUBST(WXCONFIG_LIBS_STATIC_GL)
 AC_SUBST(WXCONFIG_INCLUDE)

 dnl what to compile
@@ -4875,10 +4822,10 @@ AC_SUBST(AS)
 AC_SUBST(NM)
 AC_SUBST(LD)
 AC_SUBST(MAKEINFO)
-AC_SUBST(INSTALL_LIBRARY)
+

 dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
-dnl itself (this macro is required if SUBDIRS variable is used in Makefile.am
+dnl itself (this is macro is required if SUBDIRS variable is used in Makefile.am
 dnl - and we do use it)
 AC_PROG_MAKE_SET

--- a/contrib/include/wx/fl/controlbar.h
+++ b/contrib/include/wx/fl/controlbar.h
@@ -1098,9 +1098,6 @@ public:
 	bool    mAuxBoolVal;
 	*/

-	// Not used, but required
-    virtual wxEvent* Clone() const { return NULL; }
-
 #if wxCHECK_VERSION(2,3,0)
 	cbPluginEvent( wxEventType eventType, cbDockPane* pPane )
 		: mpPane( pPane )
--- a/contrib/include/wx/gizmos/dynamicsash.h
+++ b/contrib/include/wx/gizmos/dynamicsash.h
@@ -13,13 +13,6 @@
 #ifndef _WX_DYNAMICSASH_H_
 #define _WX_DYNAMICSASH_H_

-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
-
-
 /*

    wxDynamicSashWindow
@@ -51,7 +44,7 @@
    for instance, you wish to scroll a subwindow of the view you add to
    your wxDynamicSashWindow object, rather than scrolling the whole view.)
    In this case, you will need to construct your wxDynamicSashWindow without
-    the wxDS_MANAGE_SCROLLBARS style and  you will need to use the
+    the wxMANAGE_SCROLLBARS style and  you will need to use the
    GetHScrollBar() and GetVScrollBar() methods to retrieve the scrollbar
    controls and call SetEventHanler() on them to redirect the scrolling
    events whenever your window is reparented by wxDyanmicSashWindow.
@@ -80,19 +73,11 @@ class wxScrollBar;


 /*
-    wxDS_MANAGE_SCROLLBARS is a default style of wxDynamicSashWindow which
+    wxMANAGE_SCROLLBARS is a default style of wxDynamicSashWindow which
    will cause it to respond to scrollbar events for your application by
    automatically scrolling the child view.
 */
-#define wxDS_MANAGE_SCROLLBARS  0x0010
-
-
-/*
-  wxDS_DRAG_CORNER style indicates that the views can also be resized by
-  dragging the corner piece between the scrollbars, and which is reflected up
-  to the frame if necessary.
-*/
-#define wxDS_DRAG_CORNER        0x0020
+#define wxMANAGE_SCROLLBARS     0x00800000


 /*
@@ -102,14 +87,11 @@ class wxScrollBar;
    a child of the wxDynamicSashWindow.  wxDynamicSashWindow will
    automatically reparent it to the proper place in its window hierarchy.
 */
-class GIZMODLLEXPORT wxDynamicSashSplitEvent : public wxCommandEvent {
+class wxDynamicSashSplitEvent : public wxCommandEvent {
 public:
    wxDynamicSashSplitEvent();
-    wxDynamicSashSplitEvent(const wxDynamicSashSplitEvent& event): wxCommandEvent(event) { }
    wxDynamicSashSplitEvent(wxObject *target);

-    virtual wxEvent* Clone() const { return new wxDynamicSashSplitEvent(*this); }
-
 private:
    DECLARE_DYNAMIC_CLASS(wxDynamicSashSplitEvent)
 };
@@ -124,14 +106,11 @@ private:
    the scrollbars' event handlers connected to your view's event handler
    class.
 */
-class GIZMODLLEXPORT wxDynamicSashUnifyEvent : public wxCommandEvent {
+class wxDynamicSashUnifyEvent : public wxCommandEvent {
 public:
    wxDynamicSashUnifyEvent();
-    wxDynamicSashUnifyEvent(const wxDynamicSashUnifyEvent& event): wxCommandEvent(event) {}
    wxDynamicSashUnifyEvent(wxObject *target);

-    virtual wxEvent* Clone() const { return new wxDynamicSashUnifyEvent(*this); }
-
 private:
    DECLARE_DYNAMIC_CLASS(wxDynamicSashUnifyEvent);
 };
@@ -139,18 +118,18 @@ private:
 /*
    wxDynamicSashWindow.  See above.
 */
-class GIZMODLLEXPORT wxDynamicSashWindow : public wxWindow {
+class wxDynamicSashWindow : public wxWindow {
 public:
    wxDynamicSashWindow();
    wxDynamicSashWindow(wxWindow *parent, wxWindowID id,
                        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                        long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
+                        long style = wxCLIP_CHILDREN | wxMANAGE_SCROLLBARS,
                        const wxString& name = "dynamicSashWindow");
    virtual ~wxDynamicSashWindow();

    virtual bool Create(wxWindow *parent, wxWindowID id,
                        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                        long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
+                        long style = wxCLIP_CHILDREN | wxMANAGE_SCROLLBARS,
                        const wxString& name = "dynamicSashWindow");
    virtual wxScrollBar *GetHScrollBar(const wxWindow *child) const;
    virtual wxScrollBar *GetVScrollBar(const wxWindow *child) const;
--- a/contrib/include/wx/gizmos/editlbox.h
+++ b/contrib/include/wx/gizmos/editlbox.h
@@ -17,12 +17,6 @@

 #include "wx/panel.h"

-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
-

 class WXDLLEXPORT wxBitmapButton;
 class WXDLLEXPORT wxListCtrl;
@@ -31,7 +25,7 @@ class WXDLLEXPORT wxListEvent;
 // This class provides a composite control that lets the
 // user easily enter list of strings

-class GIZMODLLEXPORT wxEditableListBox : public wxPanel
+class WXDLLEXPORT wxEditableListBox : public wxPanel
 {
 	DECLARE_CLASS(wxEditableListBox);

--- a/contrib/include/wx/gizmos/ledctrl.h
+++ b/contrib/include/wx/gizmos/ledctrl.h
@@ -1,89 +0,0 @@
-#ifndef _WX_LEDNUMBERCTRL_H_
-#define _WX_LEDNUMBERCTRL_H_
-
-#ifdef __GNUG__
-    #pragma interface "wxLEDNumberCtrl.h"
-#endif
-
-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
-
-
-#include <wx/window.h>
-#include <wx/control.h>
-
-class wxEraseEvent;
-class wxPaintEvent;
-class wxSizeEvent;
-
-// ----------------------------------------------------------------------------
-// enum and styles
-// ----------------------------------------------------------------------------
-
-enum wxLEDValueAlign
-{
-    wxLED_ALIGN_LEFT   = 0x01,
-    wxLED_ALIGN_RIGHT  = 0x02,
-    wxLED_ALIGN_CENTER = 0x04,
-
-    wxLED_ALIGN_MASK   = 0x04
-};
-
-#define wxLED_DRAW_FADED 0x08
-
-// ----------------------------------------------------------------------------
-// wxLEDNumberCtrl
-// ----------------------------------------------------------------------------
-
-class GIZMODLLEXPORT wxLEDNumberCtrl :	public wxControl
-{
-public:
-    // Constructors.
-    wxLEDNumberCtrl();
-    wxLEDNumberCtrl(wxWindow *parent, wxWindowID id = -1,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style = wxLED_ALIGN_LEFT | wxLED_DRAW_FADED);
-
-    // Create functions.
-    bool Create(wxWindow *parent, wxWindowID id = -1,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style = 0);
-
-    wxLEDValueAlign GetAlignment() const { return m_Alignment; }
-    bool GetDrawFaded() const { return m_DrawFaded; }
-    const wxString &GetValue() const { return m_Value; }
-
-    void SetAlignment(wxLEDValueAlign Alignment, bool Redraw = TRUE);
-    void SetDrawFaded(bool DrawFaded, bool Redraw = TRUE);
-    void SetValue(const wxString &Value, bool Redraw = TRUE);
-
-private:
-    // Members.
-    wxString m_Value;
-    wxLEDValueAlign m_Alignment;
-
-    int m_LineMargin;
-    int m_DigitMargin;
-    int m_LineLength;
-    int m_LineWidth;
-    bool m_DrawFaded;
-    int m_LeftStartPos;
-
-    // Functions.
-    void DrawDigit(wxDC &Dc, int Digit, int Column);
-    void RecalcInternals(const wxSize &CurrentSize);
-
-    // Events.
-    DECLARE_EVENT_TABLE()
-
-    void OnEraseBackground(wxEraseEvent &Event);
-    void OnPaint(wxPaintEvent &Event);
-    void OnSize(wxSizeEvent &Event);
-};
-
-#endif
--- a/contrib/include/wx/gizmos/multicell.h
+++ b/contrib/include/wx/gizmos/multicell.h
@@ -19,14 +19,6 @@
 	#pragma interface "multicell.h"
 #endif

-
-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
-
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -53,7 +45,7 @@ enum wxResizable
 // wxMultiCellItemHandle
 //---------------------------------------------------------------------------

-class GIZMODLLEXPORT wxMultiCellItemHandle: public wxObject
+class WXDLLEXPORT wxMultiCellItemHandle: public wxObject
 {
 	DECLARE_CLASS(wxMultiCellItemHandle);
 protected:
@@ -89,7 +81,7 @@ private:
 // wxMultiCellSizer
 //---------------------------------------------------------------------------

-class GIZMODLLEXPORT wxMultiCellSizer : virtual public wxSizer
+class WXDLLEXPORT wxMultiCellSizer : virtual public wxSizer
 {
 	DECLARE_CLASS(wxMultiCellSizer);

@@ -139,7 +131,7 @@ class wxCell;
 // wxMultiCellCanvas
 //---------------------------------------------------------------------------

-class GIZMODLLEXPORT wxMultiCellCanvas : public wxFlexGridSizer
+class wxMultiCellCanvas : public wxFlexGridSizer
 {
 public:
 	wxMultiCellCanvas(wxWindow *parent, int numRows = 2, int numCols = 2);
--- a/contrib/include/wx/gizmos/splittree.h
+++ b/contrib/include/wx/gizmos/splittree.h
@@ -18,12 +18,6 @@
 	#pragma interface "splittree.h"
 #endif

-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
-
 // Set this to 1 to use generic tree control (doesn't yet work properly)
 #define USE_GENERIC_TREECTRL 0

@@ -52,7 +46,7 @@ class wxSplitterScrolledWindow;
 * It also updates the scrolled window vertical scrollbar as appropriate.
 */

-class GIZMODLLEXPORT wxRemotelyScrolledTreeCtrl: public wxTreeCtrl
+class wxRemotelyScrolledTreeCtrl: public wxTreeCtrl
 {
 	DECLARE_CLASS(wxRemotelyScrolledTreeCtrl)
 public:
@@ -64,7 +58,6 @@ public:
 	void OnSize(wxSizeEvent& event);
 	void OnExpand(wxTreeEvent& event);
    void OnScroll(wxScrollWinEvent& event);
-    void OnPaint(wxPaintEvent& event);

 //// Overrides
    // Override this in case we're using the generic tree control.
@@ -117,7 +110,6 @@ public:
    DECLARE_EVENT_TABLE()
 protected:
 	wxWindow*	m_companionWindow;
-    bool        m_drawRowLines;
 };

 /*
@@ -126,7 +118,7 @@ protected:
 * A window displaying values associated with tree control items.
 */

-class GIZMODLLEXPORT wxTreeCompanionWindow: public wxWindow
+class wxTreeCompanionWindow: public wxWindow
 {
 public:
    DECLARE_CLASS(wxTreeCompanionWindow)
@@ -165,7 +157,7 @@ protected:
 * than the usual one.
 */

-class GIZMODLLEXPORT wxThinSplitterWindow: public wxSplitterWindow
+class wxThinSplitterWindow: public wxSplitterWindow
 {
 public:
    DECLARE_DYNAMIC_CLASS(wxThinSplitterWindow)
@@ -205,7 +197,7 @@ protected:
 * scroll appropriately.
 */

-class GIZMODLLEXPORT wxSplitterScrolledWindow: public wxScrolledWindow
+class wxSplitterScrolledWindow: public wxScrolledWindow
 {
 public:
    DECLARE_DYNAMIC_CLASS(wxSplitterScrolledWindow)
--- a/contrib/include/wx/ogl/basic.h
+++ b/contrib/include/wx/ogl/basic.h
@@ -124,7 +124,7 @@ class WXDLLEXPORT wxExprDatabase;



-class wxShapeEvtHandler: public wxObject, public wxClientDataContainer
+class wxShapeEvtHandler: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxShapeEvtHandler)

@@ -299,6 +299,8 @@ class wxShape: public wxShapeEvtHandler

  void SetPen(wxPen *pen);
  void SetBrush(wxBrush *brush);
+  inline void SetClientData(wxObject *client_data) { m_clientData = client_data; };
+  inline wxObject *GetClientData() const { return m_clientData; };

  virtual void Show(bool show);
  virtual bool IsShown() const { return m_visible; }
@@ -513,10 +515,8 @@ class wxShape: public wxShapeEvtHandler
  // Clears points from a list of wxRealPoints
  void ClearPointList(wxList& list);

-  // Return pen or brush of the right colour for the background
-  wxPen GetBackgroundPen();
-  wxBrush GetBackgroundBrush();
-
+ private:
+  wxObject*             m_clientData;

 protected:
  wxShapeEvtHandler*    m_eventHandler;
--- a/contrib/include/wx/ogl/misc.h
+++ b/contrib/include/wx/ogl/misc.h
@@ -99,6 +99,7 @@ extern wxPen*           g_oglWhiteBackgroundPen;
 extern wxPen*           g_oglTransparentPen;
 extern wxBrush*         g_oglWhiteBackgroundBrush;
 extern wxPen*           g_oglBlackForegroundPen;
+extern wxCursor*        g_oglBullseyeCursor;

 extern wxFont*          oglMatchFont(int point_size);

--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
@@ -1594,14 +1594,6 @@ public:
    // Send a message to Scintilla
    long SendMsg(int msg, long wp=0, long lp=0);

-
-    // Set the vertical scrollbar to use instead of the ont that's built-in.
-    void SetVScrollBar(wxScrollBar* bar) { m_vScrollBar = bar; }
-
-
-    // Set the horizontal scrollbar to use instead of the ont that's built-in.
-    void SetHScrollBar(wxScrollBar* bar) { m_hScrollBar = bar; }
-
 //----------------------------------------------------------------------


@@ -1610,12 +1602,10 @@ private:
    // Event handlers
    void OnPaint(wxPaintEvent& evt);
    void OnScrollWin(wxScrollWinEvent& evt);
-    void OnScroll(wxScrollEvent& evt);
    void OnSize(wxSizeEvent& evt);
    void OnMouseLeftDown(wxMouseEvent& evt);
    void OnMouseMove(wxMouseEvent& evt);
    void OnMouseLeftUp(wxMouseEvent& evt);
-    void OnMouseRightUp(wxMouseEvent& evt);
    void OnContextMenu(wxContextMenuEvent& evt);
    void OnMouseWheel(wxMouseEvent& evt);
    void OnChar(wxKeyEvent& evt);
@@ -1639,8 +1629,6 @@ private:

    ScintillaWX*        m_swx;
    wxStopWatch         m_stopWatch;
-    wxScrollBar*        m_vScrollBar;
-    wxScrollBar*        m_hScrollBar;

    bool                m_lastKeyDownConsumed;

@@ -1654,9 +1642,6 @@ private:
 class wxStyledTextEvent : public wxCommandEvent {
 public:
    wxStyledTextEvent(wxEventType commandType=0, int id=0);
-#ifndef SWIG
-    wxStyledTextEvent(const wxStyledTextEvent& event);
-#endif
    ~wxStyledTextEvent() {}

    void SetPosition(int pos)             { m_position = pos; }
@@ -1709,7 +1694,7 @@ public:
    bool GetControl() const;
    bool GetAlt() const;

-    virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); }
+    void CopyObject(wxObject& obj) const;

 #ifndef SWIG
 private:
--- a/contrib/samples/Makefile.in
+++ b/contrib/samples/Makefile.in
@@ -1,6 +1,6 @@
 # $Id$

-CONTRIB_SAMPLES=canvas fl gizmos mmedia net ogl plot stc xrc #applet
+CONTRIB_SAMPLES=mmedia ogl stc gizmos canvas xrc plot applet fl

 all:
 	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done
--- a/contrib/samples/gizmos/multicell/makefile.unx
+++ b/contrib/samples/gizmos/multicell/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for multicell example (Unix)
 # Created 2000-07-28

-CXX = $(shell wx-config --cxx)
+CC = gcc

 PROGRAM = mtest

@@ -13,12 +13,12 @@ EXTRAINC=-I../include
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CXX) -c `wx-config --cxxflags` -o $@ $<
+	$(CC) -c `wx-config --cflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/contrib/samples/gizmos/splittree/makefile.unx
+++ b/contrib/samples/gizmos/splittree/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CXX = $(shell wx-config --cxx)
+CC = gcc

 PROGRAM = minimal

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CXX) -c `wx-config --cxxflags` -o $@ $<
+	$(CC) -c `wx-config --cflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/contrib/samples/gizmos/splittree/tree.cpp
+++ b/contrib/samples/gizmos/splittree/tree.cpp
@@ -169,10 +169,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
    m_splitter = new wxThinSplitterWindow(m_scrolledWindow, idSPLITTER_WINDOW, wxDefaultPosition,
 		wxDefaultSize, wxSP_3DBORDER | wxCLIP_CHILDREN /* | wxSP_LIVE_UPDATE */);
 	m_splitter->SetSashSize(2);
-
-	/* Note the wxTR_ROW_LINES style: draws horizontal lines between items */
    m_tree = new TestTree(m_splitter, idTREE_CTRL, wxDefaultPosition,
-		wxDefaultSize, wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxNO_BORDER | wxTR_ROW_LINES );
+		wxDefaultSize, wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxNO_BORDER );
    m_valueWindow = new TestValueWindow(m_splitter, idVALUE_WINDOW, wxDefaultPosition,
 		wxDefaultSize, wxNO_BORDER);
    m_splitter->SplitVertically(m_tree, m_valueWindow);
@@ -232,6 +230,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 IMPLEMENT_CLASS(TestTree, wxRemotelyScrolledTreeCtrl)

 BEGIN_EVENT_TABLE(TestTree, wxRemotelyScrolledTreeCtrl)
+	EVT_PAINT(TestTree::OnPaint)
 END_EVENT_TABLE()

 TestTree::TestTree(wxWindow* parent, wxWindowID id, const wxPoint& pt,
@@ -274,6 +273,39 @@ TestTree::~TestTree()
 	delete m_imageList;
 }

+void TestTree::OnPaint(wxPaintEvent& event)
+{
+	wxPaintDC dc(this);
+
+	wxTreeCtrl::OnPaint(event);
+
+    // Reset the device origin since it may have been set
+    dc.SetDeviceOrigin(0, 0);
+
+	wxPen pen(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
+	dc.SetPen(pen);
+	dc.SetBrush(* wxTRANSPARENT_BRUSH);
+
+    wxSize clientSize = GetClientSize();
+	wxRect itemRect;
+	int cy=0;
+	wxTreeItemId h, lastH;
+	for(h=GetFirstVisibleItem();h;h=GetNextVisible(h))
+	{
+		if (GetBoundingRect(h, itemRect))
+		{
+			cy = itemRect.GetTop();
+			dc.DrawLine(0, cy, clientSize.x, cy);
+			lastH = h;
+		}
+	}
+	if (GetBoundingRect(lastH, itemRect))
+	{
+		cy = itemRect.GetBottom();
+		dc.DrawLine(0, cy, clientSize.x, cy);
+	}
+}
+
 /*
 * TestValueWindow
 */
--- a/contrib/samples/gizmos/splittree/tree.h
+++ b/contrib/samples/gizmos/splittree/tree.h
@@ -45,7 +45,6 @@ protected:
    wxRemotelyScrolledTreeCtrl*        m_tree;
    wxThinSplitterWindow*   m_splitter;
 	wxSplitterScrolledWindow* m_scrolledWindow;
-	//wxScrolledWindow* m_scrolledWindow;
    TestValueWindow*		m_valueWindow;

 private:
@@ -79,6 +78,7 @@ public:
        const wxSize& sz = wxDefaultSize, long style = wxTR_HAS_BUTTONS);
 	~TestTree();

+	void OnPaint(wxPaintEvent& event);
    DECLARE_EVENT_TABLE()
 protected:
 	wxImageList*	m_imageList;
--- a/contrib/samples/ogl/ogledit/makefile.unx
+++ b/contrib/samples/ogl/ogledit/makefile.unx
@@ -12,7 +12,8 @@
 # on your system.
 #

-CXX = $(shell wx-config --cxx)
+CPP = gcc -g
+CC = gcc
 WXCONFIG=../../../../wx-config
 WXINCLUDE=-I../../../../include -I../../../include
 WXLIB=-L../../../../lib -L../../../src/ogl
@@ -20,19 +21,19 @@ WXLIB=-L../../../../lib -L../../../src/ogl
 OBJECTS=ogledit.o palette.o doc.o view.o

 ogledit: $(OBJECTS)
-	$(CXX) -o ogledit $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl
+	$(CPP) -o ogledit $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl

 ogledit.o: ogledit.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c ogledit.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c ogledit.cpp

 palette.o: palette.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c palette.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c palette.cpp

 doc.o: doc.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c doc.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c doc.cpp

 view.o: view.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c view.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c view.cpp

 clean: 
 	rm -f *.o ogledit
--- a/contrib/samples/ogl/studio/makefile.unx
+++ b/contrib/samples/ogl/studio/makefile.unx
@@ -12,7 +12,8 @@
 # on your system.
 #

-CXX = $(shell wx-config --cxx)
+CPP = gcc -g
+CC = gcc
 WXCONFIG=../../../../wx-config
 WXINCLUDE=-I../../../../include -I../../../include
 WXLIB=-L../../../../lib -L../../../src/ogl
@@ -20,37 +21,37 @@ WXLIB=-L../../../../lib -L../../../src/ogl
 OBJECTS=studio.o cspalette.o csprint.o dialogs.o doc.o mainfrm.o project.o shapes.o symbols.o view.o

 studio: $(OBJECTS)
-	$(CXX) -o studio $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl
+	$(CPP) -o studio $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl

 studio.o: studio.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c studio.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c studio.cpp

 cspalette.o: cspalette.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c cspalette.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c cspalette.cpp

 doc.o: doc.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c doc.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c doc.cpp

 view.o: view.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c view.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c view.cpp

 dialogs.o: dialogs.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c dialogs.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c dialogs.cpp

 mainfrm.o: mainfrm.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c mainfrm.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c mainfrm.cpp

 project.o: project.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c project.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c project.cpp

 shapes.o: shapes.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c shapes.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c shapes.cpp

 symbols.o: symbols.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c symbols.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c symbols.cpp

 csprint.o: csprint.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c csprint.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c csprint.cpp

 clean: 
 	rm -f *.o studio
--- a/contrib/samples/plot/PlotVC.dsp
+++ b/contrib/samples/plot/PlotVC.dsp
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib plot.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/plot.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib plot.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/plot.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ELSEIF  "$(CFG)" == "PlotVC - Win32 Debug"

@@ -83,7 +83,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib plotd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/plot.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib plotd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/plot.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ELSEIF  "$(CFG)" == "PlotVC - Win32 Debug DLL"

@@ -109,7 +109,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw232d.lib plotd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/plot.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxdlld.lib plotd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/plot.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ELSEIF  "$(CFG)" == "PlotVC - Win32 Release DLL"

@@ -136,7 +136,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw232.lib plot.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/plot.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxdll.lib plot.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/plot.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ENDIF 

@@ -169,7 +169,7 @@ SOURCE=.\plot.cpp

 SOURCE=.\plot.rc
 # ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "..\..\..\include" /i "..\..\..\contrib\include"
+# ADD RSC /l 0x809 /i "..\..\..\include"
 # End Source File
 # End Target
 # End Project
--- a/contrib/src/Makefile.in
+++ b/contrib/src/Makefile.in
@@ -1,6 +1,6 @@
 # $Id$

-CONTRIB_SUBDIRS=canvas fl gizmos mmedia net ogl plot stc xrc #applet
+CONTRIB_SUBDIRS=ogl mmedia stc xrc plot canvas animate fl #applet

 all:
 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
--- a/contrib/src/fl/bardragpl.cpp
+++ b/contrib/src/fl/bardragpl.cpp
@@ -371,7 +371,7 @@ void cbBarDragPlugin::UnstickFromPane( cbDockPane* pPane, wxPoint& mousePos )

 	if ( pPane->IsHorizontal() && fromLowerEdge )
 	{	
-//		bool fromLowerEdge = mousePos.y > bounds.y;
+		bool fromLowerEdge = mousePos.y > bounds.y;

 		mHintRect.y = wxMax( bounds.y + bounds.height + 1, mousePos.y - newHeight );

--- a/contrib/src/fl/barhintspl.cpp
+++ b/contrib/src/fl/barhintspl.cpp
@@ -140,7 +140,7 @@ void cbBarHintsPlugin::DrawGrooves( wxDC& dc, const wxPoint& pos, int length )

   int i;
 	for( i = 0; i != mGrooveCount; ++i, ofs += ( GROOVE_WIDTH + GROOVE_TO_GROOVE_GAP ) )
-    {
+	
 		if ( mpPane->IsHorizontal() )
 		{
 			dc.SetPen( mpLayout->mLightPen );
@@ -164,7 +164,6 @@ void cbBarHintsPlugin::DrawGrooves( wxDC& dc, const wxPoint& pos, int length )
 			dc.DrawPoint( pos.x + length - 1, pos.y + ofs );
 		}
 }
-}

 void cbBarHintsPlugin::ExcludeHints( wxRect& rect, cbBarInfo& info )
 {
@@ -240,21 +239,20 @@ void cbBarHintsPlugin::GetHintsLayout( wxRect& rect, cbBarInfo& info,
 									   int& boxOfs, int& grooveOfs, int& pos )
 {
 	int boxHeight = BTN_BOX_HEIGHT;
-//  int boxWidth  = BTN_BOX_WIDTH + BOX_TO_GROOVE_GAP + BTN_BOX_WIDTH;
+	int boxWidth  = BTN_BOX_WIDTH + BOX_TO_GROOVE_GAP + BTN_BOX_WIDTH;

 	// collapse and close box are not placed on fixed bars

 	if ( info.IsFixed() || ( !mCloseBoxOn && !mCollapseBoxOn ) )
 	{
 		boxHeight = 0;
-//      boxWidth = 0;
+		boxWidth = 0;
 	}
-/*
 	else
 	if ( !mCloseBoxOn || !mCollapseBoxOn ) 

 		boxWidth = BTN_BOX_WIDTH;
-*/
+
 	int grooveHeight = mGrooveCount*(GROOVE_WIDTH + GROOVE_TO_GROOVE_GAP) 
 		               - GROOVE_TO_GROOVE_GAP;

@@ -301,9 +299,9 @@ void cbBarHintsPlugin::GetHintsLayout( wxRect& rect, cbBarInfo& info,

      int i;
 		for( i = 0; i != BOXES_IN_HINT; ++i )
-        {
+
 			mBoxes[i]->mpPane = mpPane;
-        }
+

 		if ( mpPane->IsHorizontal() )
 		{
@@ -447,8 +445,8 @@ void cbBarHintsPlugin::OnDrawBarDecorations( cbDrawBarDecorEvent& event )
 void cbBarHintsPlugin::OnLeftDown( cbLeftDownEvent& event )
 {
 	mpPane           = event.mpPane;
-    wxPoint inFrame = event.mPos;

+	wxPoint inFrame = event.mPos;
 	mpPane->PaneToFrame( &inFrame.x, &inFrame.y );

 	wxBarIterator iter( mpPane->GetRowList() );
@@ -505,12 +503,12 @@ void cbBarHintsPlugin::OnLeftUp( cbLeftUpEvent&   event )
 			if ( mBoxes[i]->WasClicked() )
 			{
 				if ( i == 0 )
-                {
+
 					mpLayout->SetBarState( mpClickedBar, wxCBAR_HIDDEN, TRUE );
-                }
 				else
 				{
 					if ( mpClickedBar->IsExpanded() )
+
 						mpPane->ContractBar( mpClickedBar );
 					else
 						mpPane->ExpandBar( mpClickedBar );
@@ -536,10 +534,9 @@ void cbBarHintsPlugin::OnMotion( cbMotionEvent&   event )

      int i;
 		for( i = 0; i != BOXES_IN_HINT; ++i )
-        {
+		
 			mBoxes[i]->OnMotion( inFrame );
 	}
-    }
 	else
 		event.Skip();
 }
--- a/contrib/src/fl/controlbar.cpp
+++ b/contrib/src/fl/controlbar.cpp
@@ -293,8 +293,8 @@ wxFrameLayout::wxFrameLayout(void)
 {
 	CreateCursors();

-    int i;
-    for ( i = 0; i != MAX_PANES; ++i )
+	for( int i = 0; i != MAX_PANES; ++i )
+	
 		mPanes[i]  = NULL;

 	mFloatingOn = CanReparent();
@@ -329,8 +329,8 @@ wxFrameLayout::wxFrameLayout( wxWindow* pParentFrame, wxWindow* pFrameClient, bo
 {
 	CreateCursors();

-    int i;
-    for ( i = 0; i != MAX_PANES; ++i )
+	for( int i = 0; i != MAX_PANES; ++i )
+	
 		mPanes[i]  = new cbDockPane( i, this );

 	if ( activateNow )
@@ -421,8 +421,7 @@ void wxFrameLayout::DestroyBarWindows()

 	mBarSpyList.Clear();

-    size_t i;
-    for ( i = 0; i != mAllBars.Count(); ++i )
+	for( size_t i = 0; i != mAllBars.Count(); ++i )
 	{
 		if ( mAllBars[i]->mpBarWnd )
 		{
@@ -477,6 +476,7 @@ wxFrameLayout::~wxFrameLayout()
 	// destroy contents of arrays and lists

 	size_t i = 0;
+
 	for( i = 0; i != MAX_PANES; ++i )
   {
 		if ( mPanes[i] ) 
@@ -509,6 +509,7 @@ wxFrameLayout::~wxFrameLayout()
 	}

 	for( i = 0; i != mAllBars.Count(); ++i )
+	
 		delete mAllBars[i];
 }

@@ -651,9 +652,10 @@ bool wxFrameLayout::RedockBar( cbBarInfo*    pBar,

 cbBarInfo* wxFrameLayout::FindBarByName( const wxString& name )
 {
-    size_t i;
-    for ( i = 0; i != mAllBars.Count(); ++i )
+	for( size_t i = 0; i != mAllBars.Count(); ++i )
+
 		if ( mAllBars[i]->mName == name )
+
 			return mAllBars[i];

 	return NULL;
@@ -661,9 +663,10 @@ cbBarInfo* wxFrameLayout::FindBarByName( const wxString& name )

 cbBarInfo* wxFrameLayout::FindBarByWindow( const wxWindow* pWnd )
 {
-    size_t i;
-    for ( i = 0; i != mAllBars.Count(); ++i )
+	for( size_t i = 0; i != mAllBars.Count(); ++i )
+
 		if ( mAllBars[i]->mpBarWnd == pWnd )
+
 			return mAllBars[i];

 	return NULL;
@@ -952,8 +955,7 @@ void wxFrameLayout::RemoveBar( cbBarInfo* pBarInfo )
 		pPane->RemoveBar( pBarInfo );
 	}

-    size_t i;
-    for ( i = 0; i != mAllBars.Count(); ++i )
+	for( size_t i = 0; i != mAllBars.Count(); ++i )
 	{
 		if ( mAllBars[i] == pBarInfo )
 		{
@@ -971,7 +973,9 @@ void wxFrameLayout::RemoveBar( cbBarInfo* pBarInfo )
 			return;
 		}
 	}
-    wxFAIL_MSG("bar info should be present in the list of all bars of all panes");
+	int avoidCompilerWarning = 0;
+	wxASSERT(avoidCompilerWarning); // DBG:: bar info should be present in the list of all bars of all panes
+
 }

 bool wxFrameLayout::LocateBar( cbBarInfo* pBarInfo, 
@@ -981,8 +985,7 @@ bool wxFrameLayout::LocateBar( cbBarInfo* pBarInfo,
 	(*ppRow)  = NULL;
 	(*ppPane) = NULL;

-    int n;
-    for ( n = 0; n != MAX_PANES; ++n )
+	for( int n = 0; n != MAX_PANES; ++n )
 	{
 		wxBarIterator i( mPanes[n]->GetRowList() );

@@ -1143,8 +1146,8 @@ void wxFrameLayout::PositionPanes()
 	// FOR NOW:: excessive updates!
 	// reposition bars within all panes

-    int i;
-    for ( i = 0; i != MAX_PANES; ++i )
+	for( int i = 0; i != MAX_PANES; ++i )
+		
 		mPanes[i]->SizePaneObjects();
 }

@@ -1159,9 +1162,10 @@ void wxFrameLayout::OnSize( wxSizeEvent& event )

 void wxFrameLayout::HideBarWindows()
 {
-    size_t i;
-    for ( i = 0; i != mAllBars.Count(); ++i )
+	for( size_t i = 0; i != mAllBars.Count(); ++i )
+
 		if ( mAllBars[i]->mpBarWnd && mAllBars[i]->mState != wxCBAR_FLOATING )
+		
 			mAllBars[i]->mpBarWnd->Show( FALSE );

 	// then floated frames
@@ -1247,10 +1251,9 @@ void wxFrameLayout::HookUpToFrame()

 cbDockPane* wxFrameLayout::GetBarPane( cbBarInfo* pBar )
 {
-    int i;
-    for ( i = 0; i != MAX_PANES; ++i )
-        if ( mPanes[i]->BarPresent( pBar ) )
-            return mPanes[i];
+	for( int i = 0; i != MAX_PANES; ++i )
+
+		if ( mPanes[i]->BarPresent( pBar ) ) return mPanes[i];

 	return NULL;
 }
@@ -1299,15 +1302,13 @@ cbDockPane* wxFrameLayout::HitTestPanes( const wxRect& rect,
 	
 		return pCurPane;

-    int i;
-    for ( i = 0; i != MAX_PANES; ++i )
-    {
+	for( int i = 0; i != MAX_PANES; ++i )
+	
 		if ( pCurPane != mPanes[i] &&
 		     rect_hits_rect( mPanes[i]->GetRealRect(), rect ) ) 
-        {
+
 			return mPanes[i];
-        }
-    }
+
 	return 0;
 }

@@ -1318,6 +1319,7 @@ void wxFrameLayout::ForwardMouseEvent( wxMouseEvent& event,
 	wxPoint pos( event.m_x, event.m_y );
 	pToPane->FrameToPane( &pos.x, &pos.y );

+#if wxCHECK_VERSION(2,3,0)
 	if ( eventType == cbEVT_PL_LEFT_DOWN )
 	{
 		cbLeftDownEvent evt( pos, pToPane );
@@ -1353,6 +1355,36 @@ void wxFrameLayout::ForwardMouseEvent( wxMouseEvent& event,
 		int avoidCompilerWarning = 0;
 		wxASSERT(avoidCompilerWarning); // DBG::
 	}
+#else
+	switch ( eventType )
+	{
+		case cbEVT_PL_LEFT_DOWN : { cbLeftDownEvent evt( pos, pToPane );
+								    FirePluginEvent( evt ); break;
+								  }
+
+		case cbEVT_PL_LEFT_DCLICK:{ cbLeftDClickEvent evt( pos, pToPane );
+								    FirePluginEvent( evt ); break;
+								  }
+
+		case cbEVT_PL_LEFT_UP   : { cbLeftUpEvent evt( pos, pToPane );
+								    FirePluginEvent( evt ); break;
+								  }
+
+		case cbEVT_PL_RIGHT_DOWN: { cbRightDownEvent evt( pos, pToPane );
+								    FirePluginEvent( evt ); break;
+								  }
+
+		case cbEVT_PL_RIGHT_UP  : { cbRightUpEvent evt( pos, pToPane );
+								    FirePluginEvent( evt ); break;
+								  }
+
+		case cbEVT_PL_MOTION    : { cbMotionEvent evt( pos, pToPane );
+								    FirePluginEvent( evt ); break;
+								  }
+
+		default : wxASSERT(0); // DBG::
+	}
+#endif // #if wxCHECK_VERSION(2,3,0)
 }  // wxFrameLayout::ForwardMouseEvent()


@@ -1362,18 +1394,15 @@ void wxFrameLayout::RouteMouseEvent( wxMouseEvent& event, int pluginEvtType )

 		ForwardMouseEvent( event, mpPaneInFocus, pluginEvtType );
 	else
-    {
-        int i;
-        for ( i = 0; i != MAX_PANES; ++i )
-        {
+	for( int i = 0; i != MAX_PANES; ++i )
+	
 		if ( HitTestPane( mPanes[i], event.m_x, event.m_y ) )
 		{
 			ForwardMouseEvent( event, mPanes[i], pluginEvtType );
+
 			return;
 		}
 }
-    }
-}

 /*** event handlers ***/

@@ -1408,10 +1437,8 @@ void wxFrameLayout::OnMouseMove( wxMouseEvent& event )
 	
 		ForwardMouseEvent( event, mpPaneInFocus, cbEVT_PL_MOTION );
 	else
-    {
-        int i;
-        for ( i = 0; i != MAX_PANES; ++i )
-        {
+		for( int i = 0; i != MAX_PANES; ++i )
+		
 			if ( HitTestPane( mPanes[i], event.m_x, event.m_y ) )
 			{
 				if ( mpLRUPane && mpLRUPane != mPanes[i] )
@@ -1426,8 +1453,6 @@ void wxFrameLayout::OnMouseMove( wxMouseEvent& event )

 				return;
 			}
-        }
-    }

 	if ( mpLRUPane )
 	{
@@ -1440,12 +1465,12 @@ void wxFrameLayout::OnMouseMove( wxMouseEvent& event )
 void wxFrameLayout::OnPaint( wxPaintEvent& event )
 {
 	if ( mRecalcPending  )
+	
 		RecalcLayout( TRUE );

 	wxPaintDC dc(mpFrame);

-    int i;
-    for ( i = 0; i != MAX_PANES; ++i )
+	for( int i = 0; i != MAX_PANES; ++i )
 	{
 		wxRect& rect = mPanes[i]->mBoundsInParent;

@@ -1520,19 +1545,17 @@ void wxFrameLayout::GetPaneProperties( cbCommonPaneProperties& props, int alignm

 void wxFrameLayout::SetPaneProperties( const cbCommonPaneProperties& props, int paneMask )
 {
-    int i;
-    for ( i = 0; i != MAX_PANES; ++i )
-    {
+	for( int i = 0; i != MAX_PANES; ++i )
+	
 		if ( mPanes[i]->MatchesMask( paneMask ) )
+
 			mPanes[i]->mProps = props;
 }
-}

 void wxFrameLayout::SetMargins( int top, int bottom, int left, int right,
 		                        int paneMask )
 {
-    int i;
-    for ( i = 0; i != MAX_PANES; ++i )
+	for( int i = 0; i != MAX_PANES; ++i )
 	{
 		cbDockPane& pane = *mPanes[i];

@@ -1712,7 +1735,7 @@ void wxFrameLayout::AddPlugin( wxClassInfo* pPlInfo, int paneMask )
 void wxFrameLayout::AddPluginBefore( wxClassInfo* pNextPlInfo, wxClassInfo* pPlInfo, 
 									   int paneMask )
 {
-    wxASSERT( pNextPlInfo != pPlInfo ); // DBG:: no sense
+	wxASSERT( pNextPlInfo != pPlInfo ); // DBG:: no sence

 	cbPluginBase* pNextPl = FindPlugin( pNextPlInfo );

@@ -1906,8 +1929,7 @@ cbDimInfo::cbDimInfo()
 	  mIsFixed(TRUE),
 	  mpHandler( NULL )
 {
-    size_t i;
-    for ( i = 0; i != MAX_BAR_STATES; ++i )
+	for( size_t i = 0; i != MAX_BAR_STATES; ++i )
 	{
 		mSizes[i].x = 20;
 		mSizes[i].y = 20;
@@ -1931,8 +1953,7 @@ cbDimInfo::cbDimInfo( cbBarDimHandlerBase* pDimHandler,
 		mpHandler->AddRef();
 	}
 	
-    size_t i;
-    for ( i = 0; i != MAX_BAR_STATES; ++i )
+	for( size_t i = 0; i != MAX_BAR_STATES; ++i )
 	{
 		mSizes[i].x = -1;
 		mSizes[i].y = -1;
@@ -1969,8 +1990,7 @@ cbDimInfo::cbDimInfo( int dh_x, int dh_y,
 	mSizes[wxCBAR_FLOATING           ].x = f_x;
 	mSizes[wxCBAR_FLOATING           ].y = f_y;

-    size_t i;
-    for ( i = 0; i != MAX_BAR_STATES; ++i )
+	for( size_t i = 0; i != MAX_BAR_STATES; ++i )
 		mBounds[i] = wxRect( -1,-1,-1,-1 );
 }	 

@@ -1995,8 +2015,7 @@ cbDimInfo::cbDimInfo( int x, int y,
    mSizes[wxCBAR_FLOATING           ].x = x;
    mSizes[wxCBAR_FLOATING           ].y = y;
 	
-    size_t i;
-    for ( i = 0; i != MAX_BAR_STATES; ++i )
+    for( size_t i = 0; i != MAX_BAR_STATES; ++i )
        mBounds[i] = wxRect( -1,-1,-1,-1 );
 }

@@ -2009,11 +2028,10 @@ cbDimInfo::~cbDimInfo()

 const cbDimInfo& cbDimInfo::operator=( const cbDimInfo& other )
 {
-    if ( this == &other )
-        return *this;
+	if ( this == &other ) return *this;
+
+	for( int i = 0; i != MAX_BAR_STATES; ++i )

-    int i;
-    for ( i = 0; i != MAX_BAR_STATES; ++i )
 		mSizes[i] = other.mSizes[i];

 	mIsFixed  = other.mIsFixed;
@@ -2122,8 +2140,8 @@ cbDockPane::cbDockPane( int alignment, wxFrameLayout* pPanel )

 cbDockPane::~cbDockPane()
 {
-    size_t i;
-    for ( i = 0; i != mRows.Count(); ++i )
+	for( size_t i = 0; i != mRows.Count(); ++i )
+
 		delete mRows[i];

 	mRowShapeData.DeleteContents( TRUE );
@@ -2231,6 +2249,7 @@ void cbDockPane::PaintPane( wxDC& dc )

 	// than handles
 	for( i = 0; i != mRows.Count(); ++i )
+	
 		PaintRowHandles( mRows[i], dc );

 	// and finally
@@ -2247,15 +2266,15 @@ void cbDockPane::SizeBar( cbBarInfo* pBar )

 void cbDockPane::SizeRowObjects( cbRowInfo* pRow )
 {
-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
+	for( size_t i = 0; i != pRow->mBars.Count(); ++i )
+
 		SizeBar( pRow->mBars[i] );
 }

 void cbDockPane::SizePaneObjects()
 {
-    size_t i;
-    for ( i = 0; i != mRows.Count(); ++i )
+	for( size_t i = 0; i != mRows.Count(); ++i )
+
 		SizeRowObjects( mRows[i] );
 }

@@ -2286,12 +2305,9 @@ int cbDockPane::GetNotFixedBarsCount( cbRowInfo* pRow )
 {
 	int cnt = 0;

-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        if ( !pRow->mBars[i]->IsFixed() )
-            ++cnt;
-    }
+	for( size_t i = 0; i != pRow->mBars.Count(); ++i )
+
+		if ( !pRow->mBars[i]->IsFixed() )  ++cnt;

 	return cnt;
 }
@@ -2320,8 +2336,7 @@ void cbDockPane::SyncRowFlags( cbRowInfo* pRow )

 	pRow->mNotFixedBarsCnt = 0;

-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
+	for( size_t i = 0; i != pRow->mBars.Count(); ++i )
 	{
 		cbBarInfo& bar = *pRow->mBars[i];

@@ -2415,8 +2430,7 @@ void cbDockPane::PaneToFrame( wxRect* pRect )

 int cbDockPane::GetRowAt( int paneY )
 {
-    if ( paneY < 0 )
-        return -1;
+	if ( paneY < 0 ) return -1;

 	int curY = 0;

@@ -2480,8 +2494,7 @@ int cbDockPane::GetRowAt( int upperY, int lowerY )

 	int mid = upperY + (lowerY - upperY)/2;

-    if ( mid < 0 )
-        return -1;
+	if ( mid < 0 ) return -1;

 	int curY = 0;
 	size_t i = 0;
@@ -2502,11 +2515,9 @@ int cbDockPane::GetRowY( cbRowInfo* pRow )
 {
 	int curY = 0;

-    size_t i;
-    for ( i = 0; i != mRows.Count(); ++i )
+	for( size_t i = 0; i != mRows.Count(); ++i )
 	{
-        if ( mRows[i] == pRow )
-            break;
+		if ( mRows[i] == pRow ) break;

 		curY += mRows[i]->mRowHeight;
 	}
@@ -2583,6 +2594,7 @@ void cbDockPane::CalcLengthRatios( cbRowInfo* pInRow )
 		cbBarInfo& bar = *pInRow->mBars[i];

 		if ( !bar.IsFixed() )
+
 			totalWidth += bar.mBounds.width;
 	}

@@ -2593,6 +2605,7 @@ void cbDockPane::CalcLengthRatios( cbRowInfo* pInRow )
 		cbBarInfo& bar = *pInRow->mBars[i];

 		if ( !bar.IsFixed() )
+
 			bar.mLenRatio = double(bar.mBounds.width)/double(totalWidth);
 	}
 }
@@ -2690,17 +2703,18 @@ void cbDockPane::ContractBar( cbBarInfo* pBar )

 void cbDockPane::InitLinksForRow( cbRowInfo* pRow )
 {
-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
+	for( size_t i = 0; i != pRow->mBars.Count(); ++i )
 	{
 		cbBarInfo& bar = *pRow->mBars[i];

 		if ( i == 0 )
+
 			bar.mpPrev = NULL;
 		else
 			bar.mpPrev = pRow->mBars[i-1];

 		if ( i == pRow->mBars.Count() - 1 )
+
 			bar.mpNext = NULL;
 		else
 			bar.mpNext = pRow->mBars[i+1];
@@ -2709,17 +2723,18 @@ void cbDockPane::InitLinksForRow( cbRowInfo* pRow )

 void cbDockPane::InitLinksForRows()
 {
-    size_t i;
-    for ( i = 0; i != mRows.Count(); ++i )
+	for( size_t i = 0; i != mRows.Count(); ++i )
 	{
 		cbRowInfo& row = *mRows[i];

 		if ( i == 0 )
+
 			row.mpPrev = NULL;
 		else
 			row.mpPrev = mRows[i-1];

 		if ( i == mRows.Count() - 1 )
+
 			row.mpNext = NULL;
 		else
 			row.mpNext = mRows[i+1];
@@ -2810,13 +2825,12 @@ void cbDockPane::InsertBar( cbBarInfo* pBarInfo )

 void cbDockPane::RemoveRow( cbRowInfo* pRow )
 {
-    size_t i;
 	// first, hide all bar-windows in the removed row
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
+	for( size_t i = 0; i != pRow->mBars.Count(); ++i )
+
 		if ( pRow->mBars[i]->mpBarWnd )
+
 			pRow->mBars[i]->mpBarWnd->Show( FALSE );
-    }

 	mRows.Remove( pRow );

@@ -2835,8 +2849,8 @@ void cbDockPane::InsertRow( cbRowInfo* pRow, cbRowInfo* pBeforeRow )

 	pRow->mUMgrData.SetDirty(TRUE);

-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
+	for( size_t i = 0; i != pRow->mBars.Count(); ++i )
+
 			pRow->mBars[i]->mUMgrData.SetDirty( TRUE );

 	SyncRowFlags( pRow );
@@ -2845,6 +2859,7 @@ void cbDockPane::InsertRow( cbRowInfo* pRow, cbRowInfo* pBeforeRow )
 void cbDockPane::SetPaneWidth(int width)
 {
 	if ( IsHorizontal() )
+	
 		mPaneWidth = width - mLeftMargin - mRightMargin;
 	else
 		mPaneWidth = width - mTopMargin - mBottomMargin;
@@ -2853,6 +2868,7 @@ void cbDockPane::SetPaneWidth(int width)

 void cbDockPane::SetBoundsInParent( const wxRect& rect )
 {
+
 	mBoundsInParent = rect;

 	// set pane dimensions in local coordinates
@@ -2956,14 +2972,14 @@ cbRowInfo* cbDockPane::GetRow( int row )

 int cbDockPane::GetRowIndex( cbRowInfo* pRow )
 {
-    size_t i;
-    for ( i = 0; i != mRows.Count(); ++i )
+	for( size_t i = 0; i != mRows.Count(); ++i )
 	{
 		if ( mRows[i] == pRow ) 
 			return i;
 	}

-    wxFAIL_MSG("Row must be present to call cbDockPane::GetRowIndex()");
+	int avoidCompilerWarning = 0;
+	wxASSERT(avoidCompilerWarning); // DBG:: row should be present

 	return 0;
 }
@@ -3011,7 +3027,8 @@ bool cbDockPane::MatchesMask( int paneMask )
 		case FL_ALIGN_RIGHT  : thisMask = FL_ALIGN_RIGHT_PANE; break;

 		default:
-            wxFAIL_MSG("Bad FL alignment type detected in cbDockPane::MatchesMask()");
+			int avoidCompilerWarning = 0;
+			wxASSERT(avoidCompilerWarning); // DBG:: bogus alignment type
 	}

 	return ( thisMask & paneMask ) != 0;
@@ -3026,8 +3043,8 @@ void cbDockPane::RecalcLayout()

 	// then horizontally in each row 

-    size_t i;
-    for ( i = 0; i != mRows.Count(); ++i )
+	for( size_t i = 0; i != mRows.Count(); ++i )
+
 		RecalcRowLayout( mRows[i] );
 }

@@ -3059,8 +3076,7 @@ int cbDockPane::HitTestPaneItems( const wxPoint& pos,
 	(*ppRow) = NULL;
 	(*ppBar) = NULL;

-    size_t i;
-    for ( i = 0; i != mRows.Count(); ++i )
+	for( size_t i = 0; i != mRows.Count(); ++i )
 	{
 		cbRowInfo& row = *mRows[i];

@@ -3086,8 +3102,7 @@ int cbDockPane::HitTestPaneItems( const wxPoint& pos,

 		// hit-test bar handles and bar content

-        size_t k;
-        for ( k = 0; k != row.mBars.Count(); ++k )
+		for( size_t k = 0; k != row.mBars.Count(); ++k )
 		{
 			cbBarInfo& bar    = *row.mBars[k];
 			wxRect&    bounds = bar.mBounds;
@@ -3111,6 +3126,7 @@ int cbDockPane::HitTestPaneItems( const wxPoint& pos,
 			}

 			if ( HasPoint( pos, bounds.x, bounds.y, bounds.width, bounds.height ) )
+			
 				return CB_BAR_CONTENT_HITTED;

 		} // hit-test next bar
@@ -3185,17 +3201,18 @@ int cbDockPane::GetMinimalRowHeight( cbRowInfo* pRow )
 {
 	int height = mProps.mMinCBarDim.y;

-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
+	for( size_t i = 0; i != pRow->mBars.Count(); ++i )
+		
 		if ( pRow->mBars[i]->IsFixed() )
+
 			height = wxMax( height, pRow->mBars[i]->mBounds.height );
-    }

 	if ( pRow->mHasUpperHandle )
+
 		height += mProps.mResizeHandleSize;

 	if ( pRow->mHasLowerHandle )
+
 		height += mProps.mResizeHandleSize;
 	
 	return height;
@@ -3211,13 +3228,12 @@ void cbDockPane::SetRowHeight( cbRowInfo* pRow, int newHeight )

 		newHeight -= mProps.mResizeHandleSize;

-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
+	for( size_t i = 0; i != pRow->mBars.Count(); ++i )
+
 		if ( !pRow->mBars[i]->IsFixed() )
+		
 			pRow->mBars[i]->mBounds.height = newHeight;
 }
-}

 void cbDockPane::GetRowResizeRange( cbRowInfo* pRow, int* from, int* till,
 								    bool forUpperHandle )
@@ -3363,8 +3379,7 @@ void cbDockPane::DrawVertHandle( wxDC& dc, int x, int y, int height )
 	dc.DrawLine( x,y, x, lower );

 	dc.SetPen( mpLayout->mGrayPen );
-    int i;
-    for ( i = 0; i != mProps.mResizeHandleSize-1; ++i )
+	for( int i = 0; i != mProps.mResizeHandleSize-1; ++i )
 	{
 		++x;
 		dc.DrawLine( x,y, x, lower );
@@ -3388,8 +3403,7 @@ void cbDockPane::DrawHorizHandle( wxDC& dc, int x, int y, int width  )

 	dc.SetPen( mpLayout->mGrayPen );

-    int i;
-    for ( i = 0; i != mProps.mResizeHandleSize-1; ++i )
+	for( int i = 0; i != mProps.mResizeHandleSize-1; ++i )
 	{
 		++y;
 		dc.DrawLine( x,y, right, y );
@@ -3420,8 +3434,7 @@ void cbDockPane::GetRowShapeData( cbRowInfo* pRow, wxList* pLst )
 	pLst->DeleteContents( TRUE );
 	pLst->Clear();

-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
+	for( size_t i = 0; i != pRow->mBars.Count(); ++i )
 	{
 		cbBarInfo& bar = *pRow->mBars[i];

@@ -3436,13 +3449,11 @@ void cbDockPane::GetRowShapeData( cbRowInfo* pRow, wxList* pLst )

 void cbDockPane::SetRowShapeData( cbRowInfo* pRow, wxList* pLst )
 {
-    if ( pLst->First() == NULL )
-        return;
+	if ( pLst->First() == NULL ) return;

 	wxNode* pData = pLst->First();

-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
+	for( size_t i = 0; i != pRow->mBars.Count(); ++i )
 	{
 		wxASSERT( pData ); // DBG::

--- a/contrib/src/fl/frmview.cpp
+++ b/contrib/src/fl/frmview.cpp
@@ -208,17 +208,16 @@ void wxFrameManager::EnableMenusForView( wxFrameView* pView, bool enable )
 	wxMenuBar* pMenuBar = GetParentFrame()->GetMenuBar();
 	int count = pMenuBar->GetMenuCount();

-    if ( !pMenuBar )
-        return;
+	if ( !pMenuBar ) return;

 	wxStringListNode* pNode = pView->mTopMenus.GetFirst();

-    int i;
 	while( pNode )
 	{
-        for ( i = 0; i != count; ++i )
+		for( int i = 0; i != count; ++i )
 		{
 			if ( pMenuBar->GetMenu(i)->GetTitle() == pNode->GetData() )
+
 				pMenuBar->EnableTop( i, enable );
 		}

@@ -294,6 +293,7 @@ void wxFrameManager::Init( wxWindow* pMainFrame, const wxString& settingsFile )
 	}

 	if ( mActiveViewNo >= mViews.Number() )
+	
 		mActiveViewNo = -1;

 	ActivateView( GetView( ( mActiveViewNo == -1 ) ? 0 : mActiveViewNo ) );
@@ -311,7 +311,8 @@ void wxFrameManager::AddView( wxFrameView* pFrmView )
 void wxFrameManager::RemoveView( wxFrameView* pFrmView )
 {
 	// TBD::
-    wxFAIL_MSG("wxFrameManager::RemoveView() has not been implemented yet.");
+	int avoidCompilerWarning = 0;
+	wxASSERT(avoidCompilerWarning);
 }

 int wxFrameManager::GetActiveViewNo()
@@ -392,8 +393,7 @@ wxWindow* wxFrameManager::GetClientWindow()

 void wxFrameManager::DeactivateCurrentView()
 {
-    if ( mActiveViewNo == -1 )
-        return;
+	if ( mActiveViewNo == -1 ) return;

 	wxFrameView* pView = GetActiveView();

@@ -403,6 +403,7 @@ void wxFrameManager::DeactivateCurrentView()
 	GetParentFrame()->PopEventHandler();

 	if ( pView->mpLayout )
+
 		pView->mpLayout->Deactivate();

 	EnableMenusForView( pView, FALSE );
@@ -428,6 +429,7 @@ bool wxFrameManager::ReloadViews()
 	// TBD: ????
 #if 0
 	if ( mSettingsFile == "" || !wxFileExists( mSettingsFile ) ) 
+		
 		return FALSE;

 	DestroyViews();
--- a/contrib/src/fl/gcupdatesmgr.cpp
+++ b/contrib/src/fl/gcupdatesmgr.cpp
@@ -141,8 +141,7 @@ void cbGCUpdatesMgr::UpdateNow()

 	wxList mBarsToResize;

-	int n;
-	for ( n = 0; n != MAX_PANES; ++n )
+	for( int n = 0; n != MAX_PANES; ++n )
 	{
 		cbDockPane& pane = *(panes[n]);

@@ -165,7 +164,7 @@ void cbGCUpdatesMgr::UpdateNow()
 			cbBarInfo* pBar = pRow->GetFirstBar();

 			bool rowChanged = FALSE;
-//			bool rowBkPainted  = FALSE;
+			bool rowBkPainted  = FALSE;

 			// FIXME:: the below should not be fixed
 			cbBarInfo* barsToRepaint[128];
--- a/contrib/src/fl/newbmpbtn.cpp
+++ b/contrib/src/fl/newbmpbtn.cpp
@@ -34,9 +34,7 @@ static int* create_array( int width, int height, int fill = 0 )
 	int* array = new int[width*height];

 	int len = width*height;
-    int i;
-    for ( i = 0; i != len; ++i )
-        array[i] = fill;
+	for( int i = 0; i != len; ++i ) array[i] = fill;

 	return array;
 }
@@ -112,28 +110,24 @@ static void gray_out_pixmap( int* src, int* dest, int width, int height )

 		if ( IS_IN_ARRAY(x+1,y-1) ) 
 		{
-            ++x;
-            --y;
+			++x;--y;
 		}
 		else
 		{
 			while( IS_IN_ARRAY(x-1,y+1) ) 
 			{
-                --x;
-                ++y;
+				--x;++y;
 			}

 			if ( IS_IN_ARRAY(x,y+1) )
 			{
-                ++y;
-                continue;
+					++y; continue;
 			}
 			else
 			{
 				if ( IS_IN_ARRAY(x+1,y) )
 				{
-                    ++x;
-                    continue;
+					++x; continue;
 				}
 				else break;
 			}
@@ -158,22 +152,23 @@ void gray_out_image_on_dc( wxDC& dc, int width, int height )
 	int* src  = create_array( width, height, MASK_BG );
 	int* dest = create_array( width, height, MASK_BG );

-    int x, y;
+	int y = 0;
 	for( y = 0; y != height; ++y )
-    {
-        for ( x = 0; x != width; ++x )
+
+		for( int x = 0; x != width; ++x )
 		{
 			wxColour col;
 			dc.GetPixel( x,y, &col );

+
 			GET_ELEM(src,x,y) = MAKE_INT_COLOR( col.Red(), col.Green(), col.Blue() );
 		}
-    }
+
 	gray_out_pixmap( src, dest, width, height );

 	for( y = 0; y != height; ++y )
-    {
-        for ( x = 0; x != width; ++x )
+
+		for( int x = 0; x != width; ++x )
 		{
 			int mask = GET_ELEM(dest,x,y);

@@ -191,7 +186,7 @@ void gray_out_image_on_dc( wxDC& dc, int width, int height )
 				default : break;
 			}
 		}
-    }
+
 	delete [] src;
 	delete [] dest;
 }
@@ -430,7 +425,8 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
 		}
 		else 
 		{
-            wxFAIL_MSG("Unsupported FL alignment type detected in wxNewBitmapButton::RenderLabelImage()");
+			int avoidCompilerWarning = 0;
+			wxASSERT(avoidCompilerWarning);// unsupported alignment type
 		}
 	}
 	else
--- a/contrib/src/fl/panedrawpl.cpp
+++ b/contrib/src/fl/panedrawpl.cpp
@@ -381,7 +381,14 @@ void cbPaneDrawPlugin::OnLDblClick( cbLeftDClickEvent& event )
 											 &pBarToFloat ) == CB_BAR_CONTENT_HITTED
 		   )
 			{
+				// TBD: ????
 				return;
+
+				mpLayout->SetBarState( pBarToFloat, wxCBAR_FLOATING, TRUE );
+
+				mpLayout->RepositionFloatedBar( pBarToFloat );
+
+				return; // event is "eaten" by this plugin
 			}

 		event.Skip();
@@ -432,7 +439,7 @@ void cbPaneDrawPlugin::OnLButtonDown( cbLeftDownEvent& event )
 		{
 			// otehrwise if bar handle dragged

-//			cbRowInfo& rowInfo     = *mpDraggedBar->mpRow;
+			cbRowInfo& rowInfo     = *mpDraggedBar->mpRow;
 			wxRect& bounds         = mpDraggedBar->mBounds;

 			mHandleIsVertical = ( event.mpPane->IsHorizontal() ) ? TRUE : FALSE;
@@ -728,12 +735,12 @@ void cbPaneDrawPlugin::OnDrawRowBackground ( cbDrawRowBkGroundEvent& event )
 	wxRect     rowBounds    = pRow->mBoundsInParent;
 	bool       isHorizontal	= event.mpPane->IsHorizontal();
 	
-//	int prevPos;
+	int prevPos;

 	if ( isHorizontal )
 	{
-//		prevPos = rowBounds.x;
-		// include one line above and below the row
+		prevPos = rowBounds.x;
+		// include one line obove and below the row
 		--rowBounds.y;
 		rowBounds.height +=2;

@@ -742,8 +749,8 @@ void cbPaneDrawPlugin::OnDrawRowBackground ( cbDrawRowBkGroundEvent& event )
 	}
 	else
 	{
-//		prevPos = rowBounds.y;
-		// include one line above and below the row
+		prevPos = rowBounds.y;
+		// include one line obove and below the row
 		--rowBounds.x;
 		rowBounds.width += 2;

@@ -1163,7 +1170,7 @@ void cbPaneDrawPlugin::OnDrawPaneDecorations( cbDrawPaneDecorEvent& event )

 void cbPaneDrawPlugin::OnDrawBarDecorations( cbDrawBarDecorEvent& event )
 {
-//	cbBarInfo* pBar = event.mpBar;
+	cbBarInfo* pBar = event.mpBar;
 	wxDC&   dc      = *event.mpDc;

 	// draw brick borders
--- a/contrib/src/fl/rowdragpl.cpp
+++ b/contrib/src/fl/rowdragpl.cpp
@@ -229,7 +229,7 @@ void cbRowDragPlugin::OnMouseMove( cbMotionEvent& event )
 			// DBG::
 			wxPoint p = event.mPos;
 			wxPoint d = mDragOrigin;
-//			int dif = event.mPos.x - mDragOrigin.x;
+			int dif = event.mPos.x - mDragOrigin.x;

 			// row is dragged up or down;
 			ShowDraggedRow( pos.y - mDragOrigin.y );
@@ -239,7 +239,7 @@ void cbRowDragPlugin::OnMouseMove( cbMotionEvent& event )
 			// DBG::
 			wxPoint p = event.mPos;
 			wxPoint d = mDragOrigin;
-//			int dif = event.mPos.x - mDragOrigin.x;
+			int dif = event.mPos.x - mDragOrigin.x;

 			// row is dragged left or right
 			ShowDraggedRow( pos.x - mDragOrigin.x );
--- a/contrib/src/fl/rowlayoutpl.cpp
+++ b/contrib/src/fl/rowlayoutpl.cpp
@@ -129,7 +129,8 @@ void cbRowLayoutPlugin::ExpandNotFixedBars( cbRowInfo* pRow )

 	double pcntSum = 0.0;

-    size_t i;
+	size_t i = 0;
+
 	for( i = 0; i != pRow->mBars.Count(); ++i )
 	{
 		if ( !pRow->mBars[i]->IsFixed() )
@@ -160,7 +161,7 @@ void cbRowLayoutPlugin::ExpandNotFixedBars( cbRowInfo* pRow )

 void cbRowLayoutPlugin::AdjustLengthOfInserted( cbRowInfo* pRow, cbBarInfo* pTheBar )
 {
-    return;  // TBD: Makes following code unreachable
+	return;

 	// pTheBar is not-fixed

@@ -183,6 +184,7 @@ void cbRowLayoutPlugin::AdjustLengthOfInserted( cbRowInfo* pRow, cbBarInfo* pThe
 	if ( pRow->mBars.Count() )

 		pTheBar->mBounds.width = int( mpPane->mPaneWidth * (curWidth / double(totalLen)) );
+
 #else

 	double freeSpc = (double)GetRowFreeSpace( pRow );
@@ -232,6 +234,7 @@ void cbRowLayoutPlugin::FitBarsToRange( int from, int till,
 	while( pBar != pTillBar )
 	{
 		if ( pBar->IsFixed() )
+
 			freeSpc -= pBar->mBounds.width;
 		else
 			pcntSum += pBar->mLenRatio;
@@ -246,12 +249,13 @@ void cbRowLayoutPlugin::FitBarsToRange( int from, int till,
 	while( pBar != pTillBar )
 	{
 		if ( !pBar->IsFixed() )
-      {
+		
 			pBar->mBounds.width = 
+
 				wxMax( mpPane->mProps.mMinCBarDim.x,
 				       int( double(freeSpc) * (pBar->mLenRatio/pcntSum) ) 
 					 );
-      }
+
 		pBar = pBar->mpNext;
 	}

@@ -457,6 +461,7 @@ void cbRowLayoutPlugin::ApplyLengthRatios( cbRowInfo* pRow )
    }  // for

 	if ( haveSquished )
+	
 		unit = freeSpc / pcntSum;

 	for( i = 0; i != pRow->mBars.Count(); ++i )
--- a/contrib/src/fl/toolwnd.cpp
+++ b/contrib/src/fl/toolwnd.cpp
@@ -496,7 +496,8 @@ void wxToolWindow::CalcResizedRect( wxRect& rect, wxPoint& delta, const wxSize&
 	}
 	else
 	{
-		wxFAIL( _T("what did the cursor hit?") );
+		int avoidCompilerWarning = 0;
+		wxASSERT(avoidCompilerWarning); // DBG::
 	}

 	rect.x = left;
--- a/contrib/src/fl/updatesmgr.cpp
+++ b/contrib/src/fl/updatesmgr.cpp
@@ -289,4 +289,3 @@ void cbSimpleUpdatesMgr::UpdateNow()
 	}
 }

-
--- a/contrib/src/gizmos/GizmosVC.dsp
+++ b/contrib/src/gizmos/GizmosVC.dsp
@@ -118,9 +118,5 @@ SOURCE=.\multicell.cpp

 SOURCE=.\splittree.cpp
 # End Source File
-# Begin Source File
-
-SOURCE=.\ledctrl.cpp
-# End Source File
 # End Target
 # End Project
--- a/contrib/src/gizmos/Makefile.in
+++ b/contrib/src/gizmos/Makefile.in
@@ -13,9 +13,9 @@ LIBVERSION_AGE=0
 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=gizmos

-HEADERS=multicell.h splittree.h editlbox.h dynamicsash.h ledctrl.h
+HEADERS=multicell.h splittree.h editlbox.h dynamicsash.h

-OBJECTS=multicell.o splittree.o editlbox.o dynamicsash.o ledctrl.o
+OBJECTS=multicell.o splittree.o editlbox.o dynamicsash.o
 DEPFILES=$(OBJECTS:.o=.d)

 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
--- a/contrib/src/gizmos/dynamicsash.cpp
+++ b/contrib/src/gizmos/dynamicsash.cpp
@@ -10,23 +10,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifdef __GNUG__
-    #pragma implementation "splittree.h"
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
 #include "wx/gizmos/dynamicsash.h"

 /*
@@ -100,9 +83,6 @@ class wxDynamicSashReparentEvent : public wxEvent {
 public:
    wxDynamicSashReparentEvent();
    wxDynamicSashReparentEvent(wxObject *object);
-    wxDynamicSashReparentEvent(const wxDynamicSashReparentEvent& evt);
-
-    virtual wxEvent* Clone() const { return new wxDynamicSashReparentEvent(*this); }

    DECLARE_DYNAMIC_CLASS(wxDynamicSashReparentEvent);
 };
@@ -348,8 +328,7 @@ void wxDynamicSashWindowImpl::DrawSash(int x, int y) const {
    dc.SetBrush(brush);
    dc.SetLogicalFunction(wxXOR);

-    if ((m_dragging == DSR_CORNER) &&
-        (m_window->GetWindowStyle() & wxDS_DRAG_CORNER) != 0) {
+    if (m_dragging == DSR_CORNER) {
        int cx = 0;
        int cy = 0;

@@ -551,6 +530,7 @@ void wxDynamicSashWindowImpl::Unify(int panel) {
 }

 void wxDynamicSashWindowImpl::Split(int px, int py) {
+    m_window->Hide();

    m_add_child_target = NULL;

@@ -597,8 +577,9 @@ void wxDynamicSashWindowImpl::Split(int px, int py) {
    m_leaf = NULL;

    m_container->Layout();
-}

+    m_window->Show();
+}

 /*  This code is called when you finish resizing a view by dragging the
    corner tab, but I think this implementation is lousy and will surprise
@@ -791,8 +772,7 @@ void wxDynamicSashWindowImpl::OnPress(wxMouseEvent &event) {
 }

 void wxDynamicSashWindowImpl::OnRelease(wxMouseEvent &event) {
-    if ((m_dragging == DSR_CORNER) &&
-        (m_window->GetWindowStyle() & wxDS_DRAG_CORNER) != 0) {
+    if (m_dragging == DSR_CORNER) {
        DrawSash(m_drag_x, m_drag_y);
        m_container->ReleaseMouse();

@@ -894,7 +874,7 @@ bool wxDynamicSashWindowLeaf::Create() {
    m_viewport->SetEventHandler(this);
    Connect(-1, wxEVT_DYNAMIC_SASH_REPARENT, (wxObjectEventFunction)&wxDynamicSashWindowLeaf::OnReparent);

-    if (m_impl->m_window->GetWindowStyle() & wxDS_MANAGE_SCROLLBARS) {
+    if (m_impl->m_window->GetWindowStyle() & wxMANAGE_SCROLLBARS) {
        m_hscroll->SetEventHandler(this);
        m_vscroll->SetEventHandler(this);

@@ -991,7 +971,7 @@ DynamicSashRegion wxDynamicSashWindowLeaf::GetRegion(int x, int y) {

 void wxDynamicSashWindowLeaf::ResizeChild(wxSize size) {
    if (m_child) {
-        if (m_impl->m_window->GetWindowStyle() & wxDS_MANAGE_SCROLLBARS) {
+        if (m_impl->m_window->GetWindowStyle() & wxMANAGE_SCROLLBARS) {
            m_child->SetSize(size);
            wxSize best_size = m_child->GetBestSize();
            if (best_size.GetWidth() < size.GetWidth()) {
@@ -1102,6 +1082,7 @@ void wxDynamicSashWindowLeaf::OnPaint(wxPaintEvent &event) {
    dc.DrawLine(9, h - sh - 3, 9, h - 4);
    dc.DrawLine(9, h - 4, 3, h - 4);

+
    int cy = (h - sh + h - 6) / 2 + 1;
    int cx = (w - sw + w - 6) / 2 + 1;
    int sy = cy;
@@ -1154,8 +1135,7 @@ void wxDynamicSashWindowLeaf::OnMouseMove(wxMouseEvent &event) {
        cursor = wxCursor(wxCURSOR_SIZENS);
    } else if (region == DSR_VERTICAL_TAB) {
        cursor = wxCursor(wxCURSOR_SIZEWE);
-    } else if ((region == DSR_CORNER) &&
-               (m_impl->m_window->GetWindowStyle() & wxDS_DRAG_CORNER) != 0) {
+    } else if (region == DSR_CORNER) {
        cursor = wxCursor(wxCURSOR_SIZENWSE);
    } else if (region == DSR_LEFT_EDGE || region == DSR_TOP_EDGE
                || region == DSR_RIGHT_EDGE || region == DSR_BOTTOM_EDGE) {
@@ -1180,9 +1160,6 @@ void wxDynamicSashWindowLeaf::OnLeave(wxMouseEvent &event) {
 void wxDynamicSashWindowLeaf::OnPress(wxMouseEvent &event) {
    DynamicSashRegion region = GetRegion(event.m_x, event.m_y);

-    if ((region == DSR_CORNER) && (m_impl->m_window->GetWindowStyle() & wxDS_DRAG_CORNER) == 0)
-        return;
-
    if (region == DSR_HORIZONTAL_TAB || region == DSR_VERTICAL_TAB || region == DSR_CORNER) {
        m_impl->m_dragging = region;
        m_impl->m_drag_x = event.m_x;
@@ -1260,11 +1237,6 @@ wxDynamicSashReparentEvent::wxDynamicSashReparentEvent(wxObject *object) {
    m_eventType = wxEVT_DYNAMIC_SASH_REPARENT;
 }

-wxDynamicSashReparentEvent::wxDynamicSashReparentEvent(const wxDynamicSashReparentEvent& evt)
-    : wxEvent(evt)
-{
-}
-
 IMPLEMENT_DYNAMIC_CLASS(wxDynamicSashReparentEvent, wxEvent)

 /////////////////////////////////////////////////////////////////////////////
--- a/contrib/src/gizmos/editlbox.cpp
+++ b/contrib/src/gizmos/editlbox.cpp
@@ -121,13 +121,6 @@ wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id,
    m_bDel = new wxBitmapButton(subp, wxID_ELB_DELETE, wxBitmap(eldel_xpm));
    m_bUp = new wxBitmapButton(subp, wxID_ELB_UP, wxBitmap(elup_xpm));
    m_bDown = new wxBitmapButton(subp, wxID_ELB_DOWN, wxBitmap(eldown_xpm));
-
-    m_bEdit->SetToolTip(wxT("Edit item"));
-    m_bNew->SetToolTip(wxT("New item"));
-    m_bDel->SetToolTip(wxT("Delete item"));
-    m_bUp->SetToolTip(wxT("Move up"));
-    m_bDown->SetToolTip(wxT("Move down"));
-
    subsizer->Add(m_bEdit, 0, wxALIGN_CENTRE_VERTICAL);
    subsizer->Add(m_bNew, 0, wxALIGN_CENTRE_VERTICAL);
    subsizer->Add(m_bDel, 0, wxALIGN_CENTRE_VERTICAL);
--- a/contrib/src/gizmos/ledctrl.cpp
+++ b/contrib/src/gizmos/ledctrl.cpp
@@ -1,358 +0,0 @@
-// ============================================================================
-// headers
-// ============================================================================
-
-#ifdef __GNUG__
-    #pragma  implementation "wxLEDNumberCtrl.h"
-#endif
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif  //__BORLANDC__
-
-#ifndef WX_PRECOMP
-    #include "wx/dcclient.h"
-    #include "wx/dcmemory.h"
-    #include "wx/intl.h"
-#endif
-
-#include "wx/gizmos/ledctrl.h"
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// A LED digit is build up like this, with maximum 7 Lines :
-//
-// 111
-// 6 2
-// 777
-// 5 3
-// 444
-//
-// Each number contains combinations of the lines, and they are set up below.
-
-const int LINE1 = 1;
-const int LINE2 = 2;
-const int LINE3 = 4;
-const int LINE4 = 8;
-const int LINE5 = 16;
-const int LINE6 = 32;
-const int LINE7 = 64;
-
-const int DIGIT0 = LINE1 | LINE2 | LINE3 | LINE4 | LINE5 | LINE6;
-const int DIGIT1 = LINE2 | LINE3;
-const int DIGIT2 = LINE1 | LINE2 | LINE4 | LINE5 | LINE7;
-const int DIGIT3 = LINE1 | LINE2 | LINE3 | LINE4 | LINE7;
-const int DIGIT4 = LINE2 | LINE3 | LINE6 | LINE7;
-const int DIGIT5 = LINE1 | LINE3 | LINE4 | LINE6 | LINE7;
-const int DIGIT6 = LINE1 | LINE3 | LINE4 | LINE5 | LINE6 | LINE7;
-const int DIGIT7 = LINE1 | LINE2 | LINE3;
-const int DIGIT8 = LINE1 | LINE2 | LINE3 | LINE4 | LINE5 | LINE6 | LINE7;
-const int DIGIT9 = LINE1 | LINE2 | LINE3 | LINE6 | LINE7;
-const int DASH   = LINE7;
-
-const int DIGITALL = -1;
-
-// ============================================================================
-// wxLEDNumberCtrl class implementation
-// ============================================================================
-
-wxLEDNumberCtrl::wxLEDNumberCtrl()
-:   m_Alignment(wxLED_ALIGN_LEFT),
-    m_LineMargin(-1),
-    m_DigitMargin(-1),
-    m_LineLength(-1),
-    m_LineWidth(-1),
-    m_DrawFaded(FALSE),
-    m_LeftStartPos(-1)
-{
-}
-
-
-wxLEDNumberCtrl::wxLEDNumberCtrl(wxWindow *parent, wxWindowID id,
-                                 const wxPoint& pos, const wxSize& size,
-                                 long style)
-:   m_Alignment(wxLED_ALIGN_LEFT),
-    m_LineMargin(-1),
-    m_DigitMargin(-1),
-    m_LineLength(-1),
-    m_LineWidth(-1),
-    m_DrawFaded(FALSE),
-    m_LeftStartPos(-1)
-{
-    Create(parent, id, pos, size, style);
-}
-
-
-bool wxLEDNumberCtrl::Create(wxWindow *parent, wxWindowID id,
-                                 const wxPoint& pos, const wxSize& size,
-                                 long style)
-{
-    bool RetVal = wxControl::Create(parent, id, pos, size, style);
-
-    if ((style & wxLED_DRAW_FADED) != 0)
-        SetDrawFaded(TRUE);
-    if ((style & wxLED_ALIGN_MASK) != 0)
-        SetAlignment((wxLEDValueAlign)(style & wxLED_ALIGN_MASK));
-
-    SetBackgroundColour(*wxBLACK);
-    SetForegroundColour(*wxGREEN);
-
-    return RetVal;
-}
-
-
-void wxLEDNumberCtrl::SetAlignment(wxLEDValueAlign Alignment, bool Redraw)
-{
-    if (Alignment != m_Alignment)
-    {
-        m_Alignment = Alignment;
-        RecalcInternals(GetClientSize());
-
-        if (Redraw)
-            Refresh(FALSE);
-    }
-}
-
-
-void wxLEDNumberCtrl::SetDrawFaded(bool DrawFaded, bool Redraw)
-{
-    if (DrawFaded != m_DrawFaded)
-    {
-        m_DrawFaded = DrawFaded;
-
-        if (Redraw)
-            Refresh(FALSE);
-    }
-}
-
-
-void wxLEDNumberCtrl::SetValue(wxString const &Value, bool Redraw)
-{
-    if (Value != m_Value)
-    {
-        if (!Value.IsEmpty())
-        {
-            for(size_t i=0; i<Value.Length(); i++) {
-                wxChar ch = Value[i];
-                wxASSERT_MSG((ch>='0' && ch<='9') || ch=='-' || ch==' ',
-                             wxT("wxLEDNumberCtrl can only display numeric string values."));
-            }
-        }
-
-        m_Value = Value;
-        RecalcInternals(GetClientSize());
-
-        if (Redraw)
-            Refresh(FALSE);
-    }
-}
-
-
-BEGIN_EVENT_TABLE(wxLEDNumberCtrl, wxControl)
-    EVT_ERASE_BACKGROUND(wxLEDNumberCtrl::OnEraseBackground)
-    EVT_PAINT(wxLEDNumberCtrl::OnPaint)
-    EVT_SIZE(wxLEDNumberCtrl::OnSize)
-END_EVENT_TABLE()
-
-
-void wxLEDNumberCtrl::OnEraseBackground(wxEraseEvent &Event)
-{
-}
-
-
-void wxLEDNumberCtrl::OnPaint(wxPaintEvent &Event)
-{
-    wxPaintDC Dc(this);
-
-    int Width, Height;
-    GetClientSize(&Width, &Height);
-
-    wxBitmap *pMemoryBitmap = new wxBitmap(Width, Height);
-    wxMemoryDC MemDc;
-
-    MemDc.SelectObject(*pMemoryBitmap);
-    MemDc.BeginDrawing();
-
-    // Draw background.
-    MemDc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID));
-    MemDc.DrawRectangle(wxRect(0, 0, Width, Height));
-    MemDc.SetBrush(wxNullBrush);
-
-    // Iterate each digit in the value, and draw.
-    const int DigitCount = m_Value.Len();
-    for (int i = 0; i < DigitCount; ++i)
-    {
-        // Draw faded lines if wanted.
-        if (m_DrawFaded)
-            DrawDigit(MemDc, DIGITALL, i);
-
-        // Draw the digits.
-        switch (m_Value[i])
-        {
-            case '0' :
-                DrawDigit(MemDc, DIGIT0, i);
-                break;
-            case '1' :
-                DrawDigit(MemDc, DIGIT1, i);
-                break;
-            case '2' :
-                DrawDigit(MemDc, DIGIT2, i);
-                break;
-            case '3' :
-                DrawDigit(MemDc, DIGIT3, i);
-                break;
-            case '4' :
-                DrawDigit(MemDc, DIGIT4, i);
-                break;
-            case '5' :
-                DrawDigit(MemDc, DIGIT5, i);
-                break;
-            case '6' :
-                DrawDigit(MemDc, DIGIT6, i);
-                break;
-            case '7' :
-                DrawDigit(MemDc, DIGIT7, i);
-                break;
-            case '8' :
-                DrawDigit(MemDc, DIGIT8, i);
-                break;
-            case '9' :
-                DrawDigit(MemDc, DIGIT9, i);
-                break;
-            case '-' :
-                DrawDigit(MemDc, DASH, i);
-                break;
-            case ' ' :
-                // just skip it
-                break;
-            default :
-                wxFAIL_MSG(_("Unknown digit value"));
-                break;
-        }
-    }
-
-    MemDc.EndDrawing();
-
-    // Blit the memory dc to screen.
-    Dc.Blit(0, 0, Width, Height, &MemDc, 0, 0, wxCOPY);
-    delete pMemoryBitmap;
-}
-
-
-void wxLEDNumberCtrl::DrawDigit(wxDC &Dc, int Digit, int Column)
-{
-    wxColour LineColor(GetForegroundColour());
-
-    if (Digit == DIGITALL)
-    {
-        const int R = LineColor.Red() / 3;
-        const int G = LineColor.Green() / 3;
-        const int B = LineColor.Blue() / 3;
-
-        LineColor.Set(R, G, B);
-    }
-
-    int XPos = m_LeftStartPos;
-
-    if (Column > 0)
-        XPos += (Column * m_LineLength) + (m_DigitMargin) * Column;
-
-    // Create a pen and draw the lines.
-    wxPen Pen(LineColor, m_LineWidth, wxSOLID);
-    Dc.SetPen(Pen);
-
-    if ((Digit & LINE1))
-    {
-        Dc.DrawLine(XPos + m_LineMargin*2, m_LineMargin,
-            XPos + m_LineLength, m_LineMargin);
-	}
-
-    if (Digit & LINE2)
-    {
-        Dc.DrawLine(XPos + m_LineLength + m_LineMargin, m_LineMargin*2,
-            XPos + m_LineLength + m_LineMargin, m_LineLength + (m_LineMargin*2));
-    }
-
-    if (Digit & LINE3)
-    {
-        Dc.DrawLine(XPos + m_LineLength + m_LineMargin, m_LineLength + (m_LineMargin*4),
-            XPos + m_LineLength + m_LineMargin, m_LineLength*2 + (m_LineMargin*3));
-    }
-
-    if (Digit & LINE4)
-    {
-        Dc.DrawLine(XPos + m_LineMargin*2, m_LineLength*2 + (m_LineMargin*4),
-            XPos + m_LineLength, m_LineLength*2 + (m_LineMargin*4));
-    }
-
-    if (Digit & LINE5)
-    {
-        Dc.DrawLine(XPos + m_LineMargin, m_LineLength + (m_LineMargin*4),
-            XPos + m_LineMargin, m_LineLength*2 + (m_LineMargin*3));
-    }
-
-    if (Digit & LINE6)
-    {
-        Dc.DrawLine(XPos + m_LineMargin, m_LineMargin*2,
-            XPos + m_LineMargin, m_LineLength + (m_LineMargin*2));
-    }
-
-    if (Digit & LINE7)
-    {
-        Dc.DrawLine(XPos + m_LineMargin*2, m_LineLength + (m_LineMargin*3),
-            XPos + m_LineMargin + m_LineLength - m_LineMargin, m_LineLength + (m_LineMargin*3));
-    }
-
-    Dc.SetPen(wxNullPen);
-}
-
-
-void wxLEDNumberCtrl::RecalcInternals(const wxSize &CurrentSize)
-{
-    const int Height = CurrentSize.GetHeight();
-
-    if ((Height * 0.07) < 1)
-        m_LineMargin = 1;
-    else
-        m_LineMargin = Height * 0.07;
-
-    if ((Height * 0.35) < 1)
-        m_LineLength = 1;
-    else
-        m_LineLength = Height * 0.35;
-
-    m_LineWidth = m_LineMargin;
-
-    m_DigitMargin = m_LineMargin * 4;
-
-    const int ValueWidth = (m_LineLength + m_DigitMargin) * m_Value.Len();
-    const int ClientWidth = CurrentSize.GetWidth();
-
-    switch (m_Alignment)
-    {
-        case wxLED_ALIGN_LEFT :
-            m_LeftStartPos = 0;
-            break;
-        case wxLED_ALIGN_RIGHT :
-            m_LeftStartPos = ClientWidth - ValueWidth;
-            break;
-        case wxLED_ALIGN_CENTER :
-            m_LeftStartPos = (ClientWidth - ValueWidth) / 2;
-            break;
-        default :
-            wxFAIL_MSG(_("Unknown alignent value for wxLEDNumberCtrl."));
-            break;
-    }
-}
-
-
-void wxLEDNumberCtrl::OnSize(wxSizeEvent &Event)
-{
-    RecalcInternals(Event.GetSize());
-
-    Event.Skip();
-}
--- a/contrib/src/gizmos/makefile.b32
+++ b/contrib/src/gizmos/makefile.b32
@@ -11,7 +11,7 @@ WXDIR = $(WXWIN)

 LIBTARGET=$(WXDIR)\lib\gizmos.lib

-OBJECTS = multicell.obj splittree.obj editlbox.obj dynamicsash.obj ledctrl.obj
+OBJECTS = multicell.obj splittree.obj editlbox.obj dynamicsash.obj

 !include $(WXDIR)\src\makelib.b32

--- a/contrib/src/gizmos/makefile.bcc
+++ b/contrib/src/gizmos/makefile.bcc
@@ -14,7 +14,7 @@ WXDIR = $(WXWIN)

 LIBTARGET=$(WXDIR)\lib\gizmos.lib

-OBJECTS = multicell.obj splittree.obj editlbox.obj dynamicsash.obj ledctrl.obj
+OBJECTS = multicell.obj splittree.obj editlbox.obj dynamicsash.obj

 !include $(WXDIR)\src\makelib.bcc

--- a/contrib/src/gizmos/makefile.g95
+++ b/contrib/src/gizmos/makefile.g95
@@ -10,7 +10,7 @@
 WXDIR = ../../..

 LIBTARGET=$(WXDIR)/lib/libgizmos.a
-OBJECTS = multicell.o splittree.o editlbox.o dynamicsash.o ledctrl.o
+OBJECTS = multicell.o splittree.o editlbox.o dynamicsash.o

 include $(WXDIR)/src/makelib.g95

--- a/contrib/src/gizmos/makefile.vc
+++ b/contrib/src/gizmos/makefile.vc
@@ -23,7 +23,7 @@ LOCALDOCDIR=$(WXDIR)\contrib\docs\latex\gizmos

 !include $(WXDIR)\src\makevc.env

-OBJECTS = $(D)\multicell.obj $(D)\splittree.obj $(D)\editlbox.obj $(D)\dynamicsash.obj $(D)\ledctrl.obj
+OBJECTS = $(D)\multicell.obj $(D)\splittree.obj $(D)\editlbox.obj $(D)\dynamicsash.obj

 LIBTARGET=$(WXDIR)\lib\gizmos$(LIBEXT).lib

--- a/contrib/src/gizmos/makefile.wat
+++ b/contrib/src/gizmos/makefile.wat
@@ -10,7 +10,7 @@ THISDIR = $(WXDIR)\contrib\src\gizmos
 NAME = gizmos
 LNK = $(name).lnk

-OBJECTS =  multicell.obj splittree.obj editlbox.obj dynamicsash.obj ledctrl.obj
+OBJECTS =  multicell.obj splittree.obj editlbox.obj dynamicsash.obj

 all: $(GIZMOSLIB)

--- a/contrib/src/gizmos/splittree.cpp
+++ b/contrib/src/gizmos/splittree.cpp
@@ -59,24 +59,16 @@ BEGIN_EVENT_TABLE(wxRemotelyScrolledTreeCtrl, wxGenericTreeCtrl)
 BEGIN_EVENT_TABLE(wxRemotelyScrolledTreeCtrl, wxTreeCtrl)
 #endif
 	EVT_SIZE(wxRemotelyScrolledTreeCtrl::OnSize)
-    EVT_PAINT(wxRemotelyScrolledTreeCtrl::OnPaint)
 	EVT_TREE_ITEM_EXPANDED(-1, wxRemotelyScrolledTreeCtrl::OnExpand)
 	EVT_TREE_ITEM_COLLAPSED(-1, wxRemotelyScrolledTreeCtrl::OnExpand)
 	EVT_SCROLLWIN(wxRemotelyScrolledTreeCtrl::OnScroll)
 END_EVENT_TABLE()

-wxRemotelyScrolledTreeCtrl::wxRemotelyScrolledTreeCtrl(
-    wxWindow* parent, wxWindowID id, const wxPoint& pt,
-    const wxSize& sz, long style)
-    : wxTreeCtrl(parent, id, pt, sz, style & ~wxTR_ROW_LINES)
+wxRemotelyScrolledTreeCtrl::wxRemotelyScrolledTreeCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pt,
+        const wxSize& sz, long style):
+        wxTreeCtrl(parent, id, pt, sz, style)
 {
 	m_companionWindow = NULL;
-
-    // We draw the row lines ourself so they match what's done
-    // by the companion window.  That is why the flag is turned
-    // off above, so wxGenericTreeCtrl doesn't draw them in a
-    // different colour.
-    m_drawRowLines = (style & wxTR_ROW_LINES) != 0;
 }

 wxRemotelyScrolledTreeCtrl::~wxRemotelyScrolledTreeCtrl()
@@ -85,20 +77,16 @@ wxRemotelyScrolledTreeCtrl::~wxRemotelyScrolledTreeCtrl()

 void wxRemotelyScrolledTreeCtrl::HideVScrollbar()
 {
-#if defined(__WXMSW__)
-#if USE_GENERIC_TREECTRL
+#if defined(__WXMSW__) && USE_GENERIC_TREECTRL
    if (!IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
-#endif
    {
        ::ShowScrollBar((HWND) GetHWND(), SB_VERT, FALSE);
    }
-#if USE_GENERIC_TREECTRL
    else
+#endif
    {
        // Implicit in overriding SetScrollbars
    }
-#endif
-#endif
 }

 // Number of pixels per user unit (0 or -1 for no scrollbar)
@@ -253,43 +241,6 @@ void wxRemotelyScrolledTreeCtrl::OnExpand(wxTreeEvent& event)
 		m_companionWindow->GetEventHandler()->ProcessEvent(event);
 }

-void wxRemotelyScrolledTreeCtrl::OnPaint(wxPaintEvent& event)
-{
-    wxPaintDC dc(this);
-
-    wxTreeCtrl::OnPaint(event);
-
-    if (! m_drawRowLines)
-        return;
-
-    // Reset the device origin since it may have been set
-    dc.SetDeviceOrigin(0, 0);
-
-    wxPen pen(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
-    dc.SetPen(pen);
-    dc.SetBrush(* wxTRANSPARENT_BRUSH);
-
-    wxSize clientSize = GetClientSize();
-    wxRect itemRect;
-    int cy=0;
-    wxTreeItemId h, lastH;
-    for(h=GetFirstVisibleItem();h;h=GetNextVisible(h))
-    {
-        if (GetBoundingRect(h, itemRect))
-        {
-            cy = itemRect.GetTop();
-            dc.DrawLine(0, cy, clientSize.x, cy);
-            lastH = h;
-        }
-    }
-    if (GetBoundingRect(lastH, itemRect))
-    {
-        cy = itemRect.GetBottom();
-        dc.DrawLine(0, cy, clientSize.x, cy);
-    }
-}
-
-
 // Adjust the containing wxScrolledWindow's scrollbars appropriately
 void wxRemotelyScrolledTreeCtrl::AdjustRemoteScrollbars()
 {
--- a/contrib/src/mmedia/MmediaVC.dsp
+++ b/contrib/src/mmedia/MmediaVC.dsp
@@ -134,10 +134,6 @@ SOURCE=.\sndg72x.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\sndmsad.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\sndpcm.cpp
 # End Source File
 # Begin Source File
--- a/contrib/src/mmedia/sndmsad.cpp
+++ b/contrib/src/mmedia/sndmsad.cpp
@@ -77,7 +77,7 @@ void wxSoundFormatMSAdpcm::SetCoefs(wxInt16 **coefs, wxUint16 ncoefs,
        delete[] m_coefs;
    }
    // TODO: Add some memory checking here
-    m_coefs = new wxInt16 *[ncoefs];
+    m_coefs = new (wxInt16 *)[ncoefs];

    for (i=0;i<ncoefs;i++)
       m_coefs[i] = new wxInt16[coefs_len];
--- a/contrib/src/ogl/basic.cpp
+++ b/contrib/src/ogl/basic.cpp
@@ -288,6 +288,7 @@ wxShape::wxShape(wxShapeCanvas *can)
  m_textColour = wxBLACK;
  m_textColourName = "BLACK";
  m_visible = FALSE;
+  m_clientData = NULL;
  m_selected = FALSE;
  m_attachmentMode = ATTACHMENT_MODE_NONE;
  m_spaceAttachments = TRUE;
@@ -337,6 +338,11 @@ wxShape::~wxShape()
  if (m_canvas)
    m_canvas->RemoveShape(this);

+  if (m_clientData) {
+      delete m_clientData;
+      m_clientData = NULL;
+  }
+
  GetEventHandler()->OnDelete();
 }

@@ -991,9 +997,8 @@ void wxShape::OnEraseContents(wxDC& dc)
    if (m_pen)
      penWidth = m_pen->GetWidth();

-    dc.SetPen(GetBackgroundPen());
-    dc.SetBrush(GetBackgroundBrush());
-
+    dc.SetPen(* g_oglWhiteBackgroundPen);
+    dc.SetBrush(* g_oglWhiteBackgroundBrush);
    dc.DrawRectangle(WXROUND(topLeftX - penWidth), WXROUND(topLeftY - penWidth),
                      WXROUND(maxX + penWidth*2.0 + 4.0), WXROUND(maxY + penWidth*2.0 + 4.0));
 }
@@ -3276,25 +3281,3 @@ void wxShape::Rotate(double WXUNUSED(x), double WXUNUSED(y), double theta)
    }
 }

-
-wxPen wxShape::GetBackgroundPen()
-{
-    if (GetCanvas())
-    {
-        wxColour c = GetCanvas()->GetBackgroundColour();
-        return wxPen(c, 1, wxSOLID);
-    }
-    return * g_oglWhiteBackgroundPen;
-}
-
-
-wxBrush wxShape::GetBackgroundBrush()
-{
-    if (GetCanvas())
-    {
-        wxColour c = GetCanvas()->GetBackgroundColour();
-        return wxBrush(c, wxSOLID);
-    }
-    return * g_oglWhiteBackgroundBrush;
-}
-
--- a/contrib/src/ogl/canvas.cpp
+++ b/contrib/src/ogl/canvas.cpp
@@ -61,6 +61,8 @@
 #define CONTROL_POINT_ENDPOINT_FROM 5
 #define CONTROL_POINT_LINE       6

+extern wxCursor *g_oglBullseyeCursor;
+
 IMPLEMENT_DYNAMIC_CLASS(wxShapeCanvas, wxScrolledWindow)

 BEGIN_EVENT_TABLE(wxShapeCanvas, wxScrolledWindow)
@@ -92,7 +94,6 @@ void wxShapeCanvas::OnPaint(wxPaintEvent& event)

    PrepareDC(dc);

-    dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
    dc.Clear();

 	if (GetDiagram())
--- a/contrib/src/ogl/lines.cpp
+++ b/contrib/src/ogl/lines.cpp
@@ -288,8 +288,8 @@ void wxLineShape::DrawRegion(wxDC& dc, wxShapeRegion *region, double x, double y
  // First, clear a rectangle for the text IF there is any
  if (region->GetFormattedText().Number() > 0)
  {
-      dc.SetPen(GetBackgroundPen());
-      dc.SetBrush(GetBackgroundBrush());
+      dc.SetPen(* g_oglWhiteBackgroundPen);
+      dc.SetBrush(* g_oglWhiteBackgroundBrush);

      // Now draw the text
      if (region->GetFont()) dc.SetFont(* region->GetFont());
@@ -300,7 +300,7 @@ void wxLineShape::DrawRegion(wxDC& dc, wxShapeRegion *region, double x, double y
      dc.SetTextForeground(* region->GetActualColourObject());

 #ifdef __WXMSW__
-      dc.SetTextBackground(GetBackgroundBrush().GetColour());
+      dc.SetTextBackground(g_oglWhiteBackgroundBrush->GetColour());
 #endif

      oglDrawFormattedText(dc, &(region->GetFormattedText()), xp, yp, w, h, region->GetFormatMode());
@@ -324,8 +324,8 @@ void wxLineShape::EraseRegion(wxDC& dc, wxShapeRegion *region, double x, double

  if (region->GetFormattedText().Number() > 0)
  {
-      dc.SetPen(GetBackgroundPen());
-      dc.SetBrush(GetBackgroundBrush());
+      dc.SetPen(* g_oglWhiteBackgroundPen);
+      dc.SetBrush(* g_oglWhiteBackgroundBrush);

      dc.DrawRectangle((long)(xp - w/2.0), (long)(yp - h/2.0), (long)w, (long)h);
  }
@@ -853,10 +853,8 @@ void wxLineShape::OnErase(wxDC& dc)
 {
    wxPen *old_pen = m_pen;
    wxBrush *old_brush = m_brush;
-    wxPen bg_pen = GetBackgroundPen();
-    wxBrush bg_brush = GetBackgroundBrush();
-    SetPen(&bg_pen);
-    SetBrush(&bg_brush);
+    SetPen(g_oglWhiteBackgroundPen);
+    SetBrush(g_oglWhiteBackgroundBrush);

    double bound_x, bound_y;
    GetBoundingBoxMax(&bound_x, &bound_y);
@@ -876,8 +874,8 @@ void wxLineShape::OnErase(wxDC& dc)
    }

    // Undraw line
-    dc.SetPen(GetBackgroundPen());
-    dc.SetBrush(GetBackgroundBrush());
+    dc.SetPen(* g_oglWhiteBackgroundPen);
+    dc.SetBrush(* g_oglWhiteBackgroundBrush);

    // Drawing over the line only seems to work if the line has a thickness
    // of 1.
@@ -1819,7 +1817,7 @@ void wxLineShape::OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y,

  if (lpt->m_type == CONTROL_POINT_ENDPOINT_FROM || lpt->m_type == CONTROL_POINT_ENDPOINT_TO)
  {
-    m_canvas->SetCursor(wxCursor(wxCURSOR_BULLSEYE));
+    m_canvas->SetCursor(* g_oglBullseyeCursor);
    lpt->m_oldCursor = wxSTANDARD_CURSOR;
  }
 }
@@ -1935,7 +1933,7 @@ void wxLineControlPoint::OnBeginDragRight(double x, double y, int keys, int atta
      lineShape->GetTo()->GetEventHandler()->OnDraw(dc);
      lineShape->GetTo()->GetEventHandler()->OnDrawContents(dc);
    }
-    m_canvas->SetCursor(wxCursor(wxCURSOR_BULLSEYE));
+    m_canvas->SetCursor(g_oglBullseyeCursor);
    m_oldCursor = wxSTANDARD_CURSOR;
  }
 }
--- a/contrib/src/ogl/misc.cpp
+++ b/contrib/src/ogl/misc.cpp
@@ -49,10 +49,11 @@

 wxFont*         g_oglNormalFont;
 wxPen*          g_oglBlackPen;
-wxPen*          g_oglTransparentPen;
-wxPen*          g_oglBlackForegroundPen;
 wxPen*          g_oglWhiteBackgroundPen;
+wxPen*          g_oglTransparentPen;
 wxBrush*        g_oglWhiteBackgroundBrush;
+wxPen*          g_oglBlackForegroundPen;
+wxCursor*       g_oglBullseyeCursor = NULL;

 char*           oglBuffer = NULL;

@@ -62,12 +63,16 @@ wxList          oglObjectCopyMapping(wxKEY_INTEGER);

 void wxOGLInitialize()
 {
-  g_oglNormalFont = wxTheFontList->FindOrCreateFont(10, wxSWISS, wxNORMAL, wxNORMAL);
-  g_oglBlackPen = wxThePenList->FindOrCreatePen("BLACK", 1, wxSOLID);
-  g_oglTransparentPen = wxThePenList->FindOrCreatePen("WHITE", 1, wxTRANSPARENT);
-  g_oglBlackForegroundPen = wxThePenList->FindOrCreatePen("BLACK", 1, wxSOLID);
-  g_oglWhiteBackgroundPen = wxThePenList->FindOrCreatePen("WHITE", 1, wxSOLID);
-  g_oglWhiteBackgroundBrush = wxTheBrushList->FindOrCreateBrush("WHITE", wxSOLID);
+  g_oglBullseyeCursor = new wxCursor(wxCURSOR_BULLSEYE);
+
+  g_oglNormalFont = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL);
+
+  g_oglBlackPen = new wxPen("BLACK", 1, wxSOLID);
+
+  g_oglWhiteBackgroundPen = new wxPen("WHITE", 1, wxSOLID);
+  g_oglTransparentPen = new wxPen("WHITE", 1, wxTRANSPARENT);
+  g_oglWhiteBackgroundBrush = new wxBrush("WHITE", wxSOLID);
+  g_oglBlackForegroundPen = new wxPen("BLACK", 1, wxSOLID);

  OGLInitializeConstraintTypes();

@@ -84,13 +89,42 @@ void wxOGLCleanUp()
        oglBuffer = NULL;
    }
    oglBuffer = NULL;
+    if (g_oglBullseyeCursor)
+    {
+        delete g_oglBullseyeCursor;
+        g_oglBullseyeCursor = NULL;
+    }

-    g_oglNormalFont = NULL;             // These will be cleaned up by their GDI list
+    if (g_oglNormalFont)
+    {
+        delete g_oglNormalFont;
+        g_oglNormalFont = NULL;
+    }
+    if (g_oglBlackPen)
+    {
+        delete g_oglBlackPen;
        g_oglBlackPen = NULL;
-    g_oglTransparentPen = NULL;
-    g_oglBlackForegroundPen = NULL;
+    }
+    if (g_oglWhiteBackgroundPen)
+    {
+        delete g_oglWhiteBackgroundPen;
        g_oglWhiteBackgroundPen = NULL;
+    }
+    if (g_oglTransparentPen)
+    {
+        delete g_oglTransparentPen;
+        g_oglTransparentPen = NULL;
+    }
+    if (g_oglWhiteBackgroundBrush)
+    {
+        delete g_oglWhiteBackgroundBrush;
        g_oglWhiteBackgroundBrush = NULL;
+    }
+    if (g_oglBlackForegroundPen)
+    {
+        delete g_oglBlackForegroundPen;
+        g_oglBlackForegroundPen = NULL;
+    }

    OGLCleanUpConstraintTypes();
 }
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -22,7 +22,7 @@

 //----------------------------------------------------------------------

-const int H_SCROLL_MAX  = 4000;
+const int H_SCROLL_MAX  = 2000;
 const int H_SCROLL_STEP = 20;
 const int H_SCROLL_PAGE = 200;

@@ -138,7 +138,7 @@ void ScintillaWX::StartDrag() {
    dragText = evt.GetDragText();

    if (dragText.Length()) {
-        wxDropSource        source(stc);
+        wxDropSource        source(wMain.GetID());
        wxTextDataObject    data(dragText);
        wxDragResult        result;

@@ -175,9 +175,9 @@ void ScintillaWX::SetTicking(bool on) {

 void ScintillaWX::SetMouseCapture(bool on) {
    if (on && !capturedMouse)
-        stc->CaptureMouse();
+        wMain.GetID()->CaptureMouse();
    else if (!on && capturedMouse)
-        stc->ReleaseMouse();
+        wMain.GetID()->ReleaseMouse();
    capturedMouse = on;
 }

@@ -189,70 +189,37 @@ bool ScintillaWX::HaveMouseCapture() {

 void ScintillaWX::ScrollText(int linesToMove) {
    int dy = vs.lineHeight * (linesToMove);
-    stc->ScrollWindow(0, dy);
-    stc->Update();
+    wMain.GetID()->ScrollWindow(0, dy);
+    wMain.GetID()->Update();
 }

 void ScintillaWX::SetVerticalScrollPos() {
-    if (stc->m_vScrollBar == NULL) {  // Use built-in scrollbar
-        stc->SetScrollPos(wxVERTICAL, topLine);
-    }
-    else { // otherwise use the one that's been given to us
-        stc->m_vScrollBar->SetThumbPosition(topLine);
-    }
+    wMain.GetID()->SetScrollPos(wxVERTICAL, topLine);
 }

 void ScintillaWX::SetHorizontalScrollPos() {
-    if (stc->m_hScrollBar == NULL) {  // Use built-in scrollbar
-        stc->SetScrollPos(wxHORIZONTAL, xOffset);
-    }
-    else { // otherwise use the one that's been given to us
-        stc->m_hScrollBar->SetThumbPosition(xOffset);
-    }
+    wMain.GetID()->SetScrollPos(wxHORIZONTAL, xOffset);
 }


 bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
    bool modified = false;
+    int  sbMax    = wMain.GetID()->GetScrollRange(wxVERTICAL);
+    int  sbThumb  = wMain.GetID()->GetScrollThumb(wxVERTICAL);
+    int  sbPos    = wMain.GetID()->GetScrollPos(wxVERTICAL);
+

-    if (stc->m_vScrollBar == NULL) {  // Use built-in scrollbar
-        int  sbMax    = stc->GetScrollRange(wxVERTICAL);
-        int  sbThumb  = stc->GetScrollThumb(wxVERTICAL);
-        int  sbPos    = stc->GetScrollPos(wxVERTICAL);
    if (sbMax != nMax || sbThumb != nPage) {
-            stc->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax);
+        wMain.GetID()->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax);
        modified = true;
    }
-    }
-    else { // otherwise use the one that's been given to us
-        int  sbMax    = stc->m_vScrollBar->GetRange();
-        int  sbPage   = stc->m_vScrollBar->GetPageSize();
-        int  sbPos    = stc->m_vScrollBar->GetThumbPosition();
-        if (sbMax != nMax || sbPage != nPage) {
-            stc->m_vScrollBar->SetScrollbar(sbPos, nPage, nMax, nPage);
-            modified = true;
-        }
-    }

-
-    if (horizontalScrollBarVisible) {
-        if (stc->m_hScrollBar == NULL) {  // Use built-in scrollbar
-            int sbMax    = stc->GetScrollRange(wxHORIZONTAL);
-            int sbThumb  = stc->GetScrollThumb(wxHORIZONTAL);
+    sbMax    = wMain.GetID()->GetScrollRange(wxHORIZONTAL);
+    sbThumb  = wMain.GetID()->GetScrollThumb(wxHORIZONTAL);
    if ((sbMax != H_SCROLL_MAX) || (sbThumb != H_SCROLL_STEP)) {
-                stc->SetScrollbar(wxHORIZONTAL, 0, H_SCROLL_STEP, H_SCROLL_MAX);
+        wMain.GetID()->SetScrollbar(wxHORIZONTAL, 0, H_SCROLL_STEP, H_SCROLL_MAX);
        modified = true;
    }
-        }
-        else { // otherwise use the one that's been given to us
-            int  sbMax    = stc->m_hScrollBar->GetRange();
-            int  sbPage   = stc->m_hScrollBar->GetPageSize();
-            if ((sbMax != H_SCROLL_MAX) || (sbPage != H_SCROLL_STEP)) {
-                stc->m_hScrollBar->SetScrollbar(0, H_SCROLL_STEP, H_SCROLL_MAX, H_SCROLL_STEP);
-                modified = true;
-            }
-        }
-    }
    return modified;
 }

@@ -313,7 +280,7 @@ bool ScintillaWX::CanPaste() {
 }

 void ScintillaWX::CreateCallTipWindow(PRectangle) {
-    ct.wCallTip = new wxSTCCallTip(stc, -1, &ct);
+    ct.wCallTip = new wxSTCCallTip(wMain.GetID(), -1, &ct);
    ct.wDraw = ct.wCallTip;
 }

@@ -378,19 +345,19 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {

 void ScintillaWX::DoHScroll(int type, int pos) {
    int xPos = xOffset;
-    if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP)
+    if (type == wxEVT_SCROLLWIN_LINEUP)
        xPos -= H_SCROLL_STEP;
-    else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN)
+    else if (type == wxEVT_SCROLLWIN_LINEDOWN)
        xPos += H_SCROLL_STEP;
-    else if (type == wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP)
+    else if (type == wxEVT_SCROLLWIN_PAGEUP)
        xPos -= H_SCROLL_PAGE;
-    else if (type == wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN)
+    else if (type == wxEVT_SCROLLWIN_PAGEDOWN)
        xPos += H_SCROLL_PAGE;
-    else if (type == wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP)
+    else if (type == wxEVT_SCROLLWIN_TOP)
        xPos = 0;
-    else if (type == wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM)
+    else if (type == wxEVT_SCROLLWIN_BOTTOM)
        xPos = H_SCROLL_MAX;
-    else if (type == wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK)
+    else if (type == wxEVT_SCROLLWIN_THUMBTRACK)
        xPos = pos;

    HorizontalScrollTo(xPos);
@@ -398,19 +365,19 @@ void ScintillaWX::DoHScroll(int type, int pos) {

 void ScintillaWX::DoVScroll(int type, int pos) {
    int topLineNew = topLine;
-    if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP)
+    if (type == wxEVT_SCROLLWIN_LINEUP)
        topLineNew -= 1;
-    else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN)
+    else if (type == wxEVT_SCROLLWIN_LINEDOWN)
        topLineNew += 1;
-    else if (type ==  wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP)
+    else if (type ==  wxEVT_SCROLLWIN_PAGEUP)
        topLineNew -= LinesToScroll();
-    else if (type ==  wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN)
+    else if (type ==  wxEVT_SCROLLWIN_PAGEDOWN)
        topLineNew += LinesToScroll();
-    else if (type ==  wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP)
+    else if (type ==  wxEVT_SCROLLWIN_TOP)
        topLineNew = 0;
-    else if (type ==  wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM)
+    else if (type ==  wxEVT_SCROLLWIN_BOTTOM)
        topLineNew = MaxScrollPos();
-    else if (type ==   wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK)
+    else if (type ==   wxEVT_SCROLLWIN_THUMBTRACK)
        topLineNew = pos;

    ScrollTo(topLineNew);
@@ -598,13 +565,13 @@ void ScintillaWX::FullPaint() {
    paintState = painting;
    rcPaint = GetTextRectangle();
    paintingAllText = true;
-    wxClientDC dc(stc);
+    wxClientDC dc(wMain.GetID());
    Surface surfaceWindow;
    surfaceWindow.Init(&dc);
    Paint(&surfaceWindow, rcPaint);
    surfaceWindow.Release();

-//     stc->Refresh(FALSE);
+//     wMain.GetID()->Refresh(FALSE);

    paintState = notPainting;
 }
--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
@@ -103,7 +103,6 @@ DEFINE_EVENT_TYPE( wxEVT_STC_DO_DROP )
 BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
    EVT_PAINT                   (wxStyledTextCtrl::OnPaint)
    EVT_SCROLLWIN               (wxStyledTextCtrl::OnScrollWin)
-    EVT_SCROLL                  (wxStyledTextCtrl::OnScroll)
    EVT_SIZE                    (wxStyledTextCtrl::OnSize)
    EVT_LEFT_DOWN               (wxStyledTextCtrl::OnMouseLeftDown)
 #ifdef __WXMSW__
@@ -112,11 +111,7 @@ BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
 #endif
    EVT_MOTION                  (wxStyledTextCtrl::OnMouseMove)
    EVT_LEFT_UP                 (wxStyledTextCtrl::OnMouseLeftUp)
-#ifdef __WXGTK__
-    EVT_RIGHT_UP                (wxStyledTextCtrl::OnMouseRightUp)
-#else
    EVT_CONTEXT_MENU            (wxStyledTextCtrl::OnContextMenu)
-#endif
    EVT_MOUSEWHEEL              (wxStyledTextCtrl::OnMouseWheel)
    EVT_CHAR                    (wxStyledTextCtrl::OnChar)
    EVT_KEY_DOWN                (wxStyledTextCtrl::OnKeyDown)
@@ -148,8 +143,6 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
    m_swx = new ScintillaWX(this);
    m_stopWatch.Start();
    m_lastKeyDownConsumed = FALSE;
-    m_vScrollBar = NULL;
-    m_hScrollBar = NULL;
 }


@@ -1808,16 +1801,6 @@ void wxStyledTextCtrl::OnScrollWin(wxScrollWinEvent& evt) {
        m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition());
 }

-void wxStyledTextCtrl::OnScroll(wxScrollEvent& evt) {
-    wxScrollBar* sb = wxDynamicCast(evt.GetEventObject(), wxScrollBar);
-    if (sb) {
-        if (sb->IsVertical())
-            m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition());
-        else
-            m_swx->DoHScroll(evt.GetEventType(), evt.GetPosition());
-    }
-}
-
 void wxStyledTextCtrl::OnSize(wxSizeEvent& evt) {
    wxSize sz = GetClientSize();
    m_swx->DoSize(sz.x, sz.y);
@@ -1841,12 +1824,6 @@ void wxStyledTextCtrl::OnMouseLeftUp(wxMouseEvent& evt) {
 }


-void wxStyledTextCtrl::OnMouseRightUp(wxMouseEvent& evt) {
-    wxPoint pt = evt.GetPosition();
-    m_swx->DoContextMenu(Point(pt.x, pt.y));
-}
-
-
 void wxStyledTextCtrl::OnContextMenu(wxContextMenuEvent& evt) {
    wxPoint pt = evt.GetPosition();
    ScreenToClient(&pt.x, &pt.y);
@@ -1879,7 +1856,7 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
    bool alt  = evt.AltDown();
    bool skip = ((ctrl || alt) && ! (ctrl && alt));

-    if (key <= 0xff && key >= 32 && !m_lastKeyDownConsumed && !skip) {
+    if (key <= 0xff && !iscntrl(key) && !m_lastKeyDownConsumed && !skip) {
        m_swx->DoAddChar(key);
        return;
    }
@@ -2087,35 +2064,35 @@ bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0
 bool wxStyledTextEvent::GetControl() const { return (m_modifiers & SCI_CTRL) != 0; }
 bool wxStyledTextEvent::GetAlt() const { return (m_modifiers & SCI_ALT) != 0; }

+void wxStyledTextEvent::CopyObject(wxObject& obj) const {
+    wxCommandEvent::CopyObject(obj);

-wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
-  wxCommandEvent(event)
-{
-    m_position =      event.m_position;
-    m_key =           event.m_key;
-    m_modifiers =     event.m_modifiers;
-    m_modificationType = event.m_modificationType;
-    m_text =          event.m_text;
-    m_length =        event.m_length;
-    m_linesAdded =    event.m_linesAdded;
-    m_line =          event.m_line;
-    m_foldLevelNow =  event.m_foldLevelNow;
-    m_foldLevelPrev = event.m_foldLevelPrev;
+    wxStyledTextEvent* o = (wxStyledTextEvent*)&obj;
+    o->m_position =      m_position;
+    o->m_key =           m_key;
+    o->m_modifiers =     m_modifiers;
+    o->m_modificationType = m_modificationType;
+    o->m_text =          m_text;
+    o->m_length =        m_length;
+    o->m_linesAdded =    m_linesAdded;
+    o->m_line =          m_line;
+    o->m_foldLevelNow =  m_foldLevelNow;
+    o->m_foldLevelPrev = m_foldLevelPrev;

-    m_margin =        event.m_margin;
+    o->m_margin =        m_margin;

-    m_message =       event.m_message;
-    m_wParam =        event.m_wParam;
-    m_lParam =        event.m_lParam;
+    o->m_message =       m_message;
+    o->m_wParam =        m_wParam;
+    o->m_lParam =        m_lParam;

-    m_listType =     event.m_listType;
-    m_x =            event.m_x;
-    m_y =            event.m_y;
+    o->m_listType =     m_listType;
+    o->m_x =            m_x;
+    o->m_y =            m_y;

 #if wxUSE_DRAG_AND_DROP
-    m_dragText =     event.m_dragText;
-    m_dragAllowMove =event.m_dragAllowMove;
-    m_dragResult =   event.m_dragResult;
+    o->m_dragText =     m_dragText;
+    o->m_dragAllowMove =m_dragAllowMove;
+    o->m_dragResult =   m_dragResult;
 #endif
 }

@@ -2125,8 +2102,3 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):



-
-
-
-
-
--- a/contrib/src/stc/stc.cpp.in
+++ b/contrib/src/stc/stc.cpp.in
@@ -103,7 +103,6 @@ DEFINE_EVENT_TYPE( wxEVT_STC_DO_DROP )
 BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
    EVT_PAINT                   (wxStyledTextCtrl::OnPaint)
    EVT_SCROLLWIN               (wxStyledTextCtrl::OnScrollWin)
-    EVT_SCROLL                  (wxStyledTextCtrl::OnScroll)
    EVT_SIZE                    (wxStyledTextCtrl::OnSize)
    EVT_LEFT_DOWN               (wxStyledTextCtrl::OnMouseLeftDown)
 #ifdef __WXMSW__
@@ -112,11 +111,7 @@ BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
 #endif
    EVT_MOTION                  (wxStyledTextCtrl::OnMouseMove)
    EVT_LEFT_UP                 (wxStyledTextCtrl::OnMouseLeftUp)
-#ifdef __WXGTK__
-    EVT_RIGHT_UP                (wxStyledTextCtrl::OnMouseRightUp)
-#else
    EVT_CONTEXT_MENU            (wxStyledTextCtrl::OnContextMenu)
-#endif
    EVT_MOUSEWHEEL              (wxStyledTextCtrl::OnMouseWheel)
    EVT_CHAR                    (wxStyledTextCtrl::OnChar)
    EVT_KEY_DOWN                (wxStyledTextCtrl::OnKeyDown)
@@ -148,8 +143,6 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
    m_swx = new ScintillaWX(this);
    m_stopWatch.Start();
    m_lastKeyDownConsumed = FALSE;
-    m_vScrollBar = NULL;
-    m_hScrollBar = NULL;
 }


@@ -352,16 +345,6 @@ void wxStyledTextCtrl::OnScrollWin(wxScrollWinEvent& evt) {
        m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition());
 }

-void wxStyledTextCtrl::OnScroll(wxScrollEvent& evt) {
-    wxScrollBar* sb = wxDynamicCast(evt.GetEventObject(), wxScrollBar);
-    if (sb) {
-        if (sb->IsVertical())
-            m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition());
-        else
-            m_swx->DoHScroll(evt.GetEventType(), evt.GetPosition());
-    }
-}
-
 void wxStyledTextCtrl::OnSize(wxSizeEvent& evt) {
    wxSize sz = GetClientSize();
    m_swx->DoSize(sz.x, sz.y);
@@ -385,12 +368,6 @@ void wxStyledTextCtrl::OnMouseLeftUp(wxMouseEvent& evt) {
 }


-void wxStyledTextCtrl::OnMouseRightUp(wxMouseEvent& evt) {
-    wxPoint pt = evt.GetPosition();
-    m_swx->DoContextMenu(Point(pt.x, pt.y));
-}
-
-
 void wxStyledTextCtrl::OnContextMenu(wxContextMenuEvent& evt) {
    wxPoint pt = evt.GetPosition();
    ScreenToClient(&pt.x, &pt.y);
@@ -423,7 +400,7 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
    bool alt  = evt.AltDown();
    bool skip = ((ctrl || alt) && ! (ctrl && alt));

-    if (key <= 0xff && key >= 32 && !m_lastKeyDownConsumed && !skip) {
+    if (key <= 0xff && !iscntrl(key) && !m_lastKeyDownConsumed && !skip) {
        m_swx->DoAddChar(key);
        return;
    }
@@ -631,35 +608,35 @@ bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0
 bool wxStyledTextEvent::GetControl() const { return (m_modifiers & SCI_CTRL) != 0; }
 bool wxStyledTextEvent::GetAlt() const { return (m_modifiers & SCI_ALT) != 0; }

+void wxStyledTextEvent::CopyObject(wxObject& obj) const {
+    wxCommandEvent::CopyObject(obj);

-wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
-  wxCommandEvent(event)
-{
-    m_position =      event.m_position;
-    m_key =           event.m_key;
-    m_modifiers =     event.m_modifiers;
-    m_modificationType = event.m_modificationType;
-    m_text =          event.m_text;
-    m_length =        event.m_length;
-    m_linesAdded =    event.m_linesAdded;
-    m_line =          event.m_line;
-    m_foldLevelNow =  event.m_foldLevelNow;
-    m_foldLevelPrev = event.m_foldLevelPrev;
+    wxStyledTextEvent* o = (wxStyledTextEvent*)&obj;
+    o->m_position =      m_position;
+    o->m_key =           m_key;
+    o->m_modifiers =     m_modifiers;
+    o->m_modificationType = m_modificationType;
+    o->m_text =          m_text;
+    o->m_length =        m_length;
+    o->m_linesAdded =    m_linesAdded;
+    o->m_line =          m_line;
+    o->m_foldLevelNow =  m_foldLevelNow;
+    o->m_foldLevelPrev = m_foldLevelPrev;

-    m_margin =        event.m_margin;
+    o->m_margin =        m_margin;

-    m_message =       event.m_message;
-    m_wParam =        event.m_wParam;
-    m_lParam =        event.m_lParam;
+    o->m_message =       m_message;
+    o->m_wParam =        m_wParam;
+    o->m_lParam =        m_lParam;

-    m_listType =     event.m_listType;
-    m_x =            event.m_x;
-    m_y =            event.m_y;
+    o->m_listType =     m_listType;
+    o->m_x =            m_x;
+    o->m_y =            m_y;

 #if wxUSE_DRAG_AND_DROP
-    m_dragText =     event.m_dragText;
-    m_dragAllowMove =event.m_dragAllowMove;
-    m_dragResult =   event.m_dragResult;
+    o->m_dragText =     m_dragText;
+    o->m_dragAllowMove =m_dragAllowMove;
+    o->m_dragResult =   m_dragResult;
 #endif
 }

@@ -669,8 +646,3 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):



-
-
-
-
-
--- a/contrib/src/stc/stc.h.in
+++ b/contrib/src/stc/stc.h.in
@@ -148,14 +148,6 @@ public:
    // Send a message to Scintilla
    long SendMsg(int msg, long wp=0, long lp=0);

-
-    // Set the vertical scrollbar to use instead of the ont that's built-in.
-    void SetVScrollBar(wxScrollBar* bar) { m_vScrollBar = bar; }
-
-
-    // Set the horizontal scrollbar to use instead of the ont that's built-in.
-    void SetHScrollBar(wxScrollBar* bar) { m_hScrollBar = bar; }
-
 //----------------------------------------------------------------------


@@ -164,12 +156,10 @@ private:
    // Event handlers
    void OnPaint(wxPaintEvent& evt);
    void OnScrollWin(wxScrollWinEvent& evt);
-    void OnScroll(wxScrollEvent& evt);
    void OnSize(wxSizeEvent& evt);
    void OnMouseLeftDown(wxMouseEvent& evt);
    void OnMouseMove(wxMouseEvent& evt);
    void OnMouseLeftUp(wxMouseEvent& evt);
-    void OnMouseRightUp(wxMouseEvent& evt);
    void OnContextMenu(wxContextMenuEvent& evt);
    void OnMouseWheel(wxMouseEvent& evt);
    void OnChar(wxKeyEvent& evt);
@@ -193,8 +183,6 @@ private:

    ScintillaWX*        m_swx;
    wxStopWatch         m_stopWatch;
-    wxScrollBar*        m_vScrollBar;
-    wxScrollBar*        m_hScrollBar;

    bool                m_lastKeyDownConsumed;

@@ -208,9 +196,6 @@ private:
 class wxStyledTextEvent : public wxCommandEvent {
 public:
    wxStyledTextEvent(wxEventType commandType=0, int id=0);
-#ifndef SWIG
-    wxStyledTextEvent(const wxStyledTextEvent& event);
-#endif
    ~wxStyledTextEvent() {}

    void SetPosition(int pos)             { m_position = pos; }
@@ -263,7 +248,7 @@ public:
    bool GetControl() const;
    bool GetAlt() const;

-    virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); }
+    void CopyObject(wxObject& obj) const;

 #ifndef SWIG
 private:
--- a/contrib/src/xrc/xh_bmp.cpp
+++ b/contrib/src/xrc/xh_bmp.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_bmp.cpp
-// Purpose:     XRC resource for wxBitmap and wxIcon
+// Purpose:     XML resource for wxBitmap and wxIcon
 // Author:      Vaclav Slavik
 // Created:     2000/09/09
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_bmpbt.cpp
+++ b/contrib/src/xrc/xh_bmpbt.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_bmpbt.cpp
-// Purpose:     XRC resource for bitmap buttons
+// Purpose:     XML resource for bitmap buttons
 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_bttn.cpp
+++ b/contrib/src/xrc/xh_bttn.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_bttn.cpp
-// Purpose:     XRC resource for buttons
+// Purpose:     XML resource for buttons
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_cald.cpp
+++ b/contrib/src/xrc/xh_cald.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_cald.cpp
-// Purpose:     XRC resource for wxCalendarCtrl
+// Purpose:     XML resource for wxCalendarCtrl
 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_chckb.cpp
+++ b/contrib/src/xrc/xh_chckb.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_chckb.cpp
-// Purpose:     XRC resource for wxCheckBox
+// Purpose:     XML resource for wxCheckBox
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_chckl.cpp
+++ b/contrib/src/xrc/xh_chckl.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_chckl.cpp
-// Purpose:     XRC resource for wxCheckList
+// Purpose:     XML resource for wxCheckList
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_choic.cpp
+++ b/contrib/src/xrc/xh_choic.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_choic.cpp
-// Purpose:     XRC resource for wxChoice
+// Purpose:     XML resource for wxChoice
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_combo.cpp
+++ b/contrib/src/xrc/xh_combo.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_combo.cpp
-// Purpose:     XRC resource for wxRadioBox
+// Purpose:     XML resource for wxRadioBox
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_dlg.cpp
+++ b/contrib/src/xrc/xh_dlg.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_dlg.cpp
-// Purpose:     XRC resource for dialogs
+// Purpose:     XML resource for dialogs
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$
@@ -50,7 +50,7 @@ wxObject *wxDialogXmlHandler::DoCreateResource()
 { 
    wxDialog *dlg = wxDynamicCast(m_instance, wxDialog);
    
-    wxASSERT_MSG(dlg, _("XRC resource: Cannot create dialog without instance."));
+    wxASSERT_MSG(dlg, _("XML resource: Cannot create dialog without instance."));
    
    dlg->Create(m_parentAsWindow,
                GetID(),
@@ -64,7 +64,7 @@ wxObject *wxDialogXmlHandler::DoCreateResource()

    CreateChildren(dlg);
    
-    if (GetBool(wxT("centered"), FALSE))
+    if (GetBool(_("centered"), FALSE))
        dlg->Centre();
    
    return dlg;
--- a/contrib/src/xrc/xh_frame.cpp
+++ b/contrib/src/xrc/xh_frame.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_frame.cpp
-// Purpose:     XRC resource for dialogs
+// Purpose:     XML resource for dialogs
 // Author:      Vaclav Slavik & Aleks.
 // Created:     2000/03/05
 // RCS-ID:      $Id$
@@ -55,7 +55,7 @@ wxObject *wxFrameXmlHandler::DoCreateResource()
 { 
    wxFrame *frame = wxDynamicCast(m_instance, wxFrame);
    
-    wxASSERT_MSG(frame, _("XRC resource: Cannot create dialog without instance."));
+    wxASSERT_MSG(frame, _("XML resource: Cannot create dialog without instance."));
    
    frame->Create(m_parentAsWindow,
                GetID(),
--- a/contrib/src/xrc/xh_gauge.cpp
+++ b/contrib/src/xrc/xh_gauge.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_gauge.cpp
-// Purpose:     XRC resource for wxGauge
+// Purpose:     XML resource for wxGauge
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_html.cpp
+++ b/contrib/src/xrc/xh_html.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_html.cpp
-// Purpose:     XRC resource for wxHtmlWindow
+// Purpose:     XML resource for wxHtmlWindow
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_listb.cpp
+++ b/contrib/src/xrc/xh_listb.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_listb.cpp
-// Purpose:     XRC resource for wxListBox
+// Purpose:     XML resource for wxListBox
 // Author:      Bob Mitchell & Vaclav Slavik
 // Created:     2000/07/29
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_listc.cpp
+++ b/contrib/src/xrc/xh_listc.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_listc.cpp
-// Purpose:     XRC resource for wxListCtrl
+// Purpose:     XML resource for wxListCtrl
 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_menu.cpp
+++ b/contrib/src/xrc/xh_menu.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_menu.cpp
-// Purpose:     XRC resource for menus and menubars
+// Purpose:     XML resource for menus and menubars
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_notbk.cpp
+++ b/contrib/src/xrc/xh_notbk.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_notbk.cpp
-// Purpose:     XRC resource for wxNotebook
+// Purpose:     XML resource for wxNotebook
 // Author:      Vaclav Slavik
 // Created:     2000/03/21
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_panel.cpp
+++ b/contrib/src/xrc/xh_panel.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_panel.cpp
-// Purpose:     XRC resource for panels
+// Purpose:     XML resource for panels
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_radbt.cpp
+++ b/contrib/src/xrc/xh_radbt.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_radbt.cpp
-// Purpose:     XRC resource for wxRadioButton
+// Purpose:     XML resource for wxRadioButton
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_radbx.cpp
+++ b/contrib/src/xrc/xh_radbx.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_radbx.cpp
-// Purpose:     XRC resource for wxRadioBox
+// Purpose:     XML resource for wxRadioBox
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_scrol.cpp
+++ b/contrib/src/xrc/xh_scrol.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_scrol.cpp
-// Purpose:     XRC resource for wxScrollBar
+// Purpose:     XML resource for wxScrollBar
 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_sizer.cpp
+++ b/contrib/src/xrc/xh_sizer.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_sizer.cpp
-// Purpose:     XRC resource for wxBoxSizer
+// Purpose:     XML resource for wxBoxSizer
 // Author:      Vaclav Slavik
 // Created:     2000/03/21
 // RCS-ID:      $Id$
@@ -119,7 +119,7 @@ wxObject *wxSizerXmlHandler::DoCreateResource()
    
    else if (m_class == wxT("spacer"))
    {
-        wxCHECK_MSG(m_parentSizer, NULL, wxT("Incorrect syntax of XRC resource: spacer not within sizer!"));
+        wxCHECK_MSG(m_parentSizer, NULL, wxT("Incorrect syntax of XML resource: spacer not within sizer!"));
        wxSize sz = GetSize();
        m_parentSizer->Add(sz.x, sz.y,
            GetLong(wxT("option")), GetStyle(wxT("flag")), GetDimension(wxT("border")));
--- a/contrib/src/xrc/xh_slidr.cpp
+++ b/contrib/src/xrc/xh_slidr.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_slidr.cpp
-// Purpose:     XRC resource for wxSlider
+// Purpose:     XML resource for wxSlider
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_spin.cpp
+++ b/contrib/src/xrc/xh_spin.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_spin.cpp
-// Purpose:     XRC resource for wxSpinButton
+// Purpose:     XML resource for wxSpinButton
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_stbmp.cpp
+++ b/contrib/src/xrc/xh_stbmp.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_stbmp.cpp
-// Purpose:     XRC resource for wxStaticBitmap
+// Purpose:     XML resource for wxStaticBitmap
 // Author:      Vaclav Slavik
 // Created:     2000/04/22
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_stbox.cpp
+++ b/contrib/src/xrc/xh_stbox.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_stbox.cpp
-// Purpose:     XRC resource for wxStaticBox
+// Purpose:     XML resource for wxStaticBox
 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_stlin.cpp
+++ b/contrib/src/xrc/xh_stlin.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_stbox.cpp
-// Purpose:     XRC resource for wxStaticLine
+// Purpose:     XML resource for wxStaticLine
 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_sttxt.cpp
+++ b/contrib/src/xrc/xh_sttxt.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_sttxt.cpp
-// Purpose:     XRC resource for wxStaticText
+// Purpose:     XML resource for wxStaticText
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_text.cpp
+++ b/contrib/src/xrc/xh_text.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_text.cpp
-// Purpose:     XRC resource for wxTextCtrl
+// Purpose:     XML resource for wxTextCtrl
 // Author:      Aleksandras Gluchovas
 // Created:     2000/03/21
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_toolb.cpp
+++ b/contrib/src/xrc/xh_toolb.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_toolb.cpp
-// Purpose:     XRC resource for wxBoxSizer
+// Purpose:     XML resource for wxBoxSizer
 // Author:      Vaclav Slavik
 // Created:     2000/08/11
 // RCS-ID:      $Id$
@@ -40,7 +40,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
 { 
    if (m_class == wxT("tool"))
    {
-        wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XRC resource: tool not within a toolbar!"));
+        wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XML resource: tool not within a toolbar!"));
        m_toolbar->AddTool(GetID(),
                           GetBitmap(wxT("bitmap")),
                           GetBitmap(wxT("bitmap2")),
@@ -55,7 +55,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
    
    else if (m_class == wxT("separator"))
    {
-        wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XRC resource: separator not within a toolbar!"));
+        wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XML resource: separator not within a toolbar!"));
        m_toolbar->AddSeparator();
        return m_toolbar; // must return non-NULL
    }
--- a/contrib/src/xrc/xh_tree.cpp
+++ b/contrib/src/xrc/xh_tree.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_tree.cpp
-// Purpose:     XRC resource for wxTreeCtrl
+// Purpose:     XML resource for wxTreeCtrl
 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xh_unkwn.cpp
+++ b/contrib/src/xrc/xh_unkwn.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_unkwn.cpp
-// Purpose:     XRC resource for unknown widget
+// Purpose:     XML resource for unknown widget
 // Author:      Vaclav Slavik
 // Created:     2000/09/09
 // RCS-ID:      $Id$
--- a/contrib/src/xrc/xmlexpat.cpp
+++ b/contrib/src/xrc/xmlexpat.cpp
@@ -33,7 +33,7 @@

     - handle unknown encodings
     - process all elements, including CDATA
-     - XRC resources should automatically select desired encoding based on
+     - XML resources should automatically select desired encoding based on
       runtime environment (?) (would need BIN and BINZ formats modification,
       too)

--- a/contrib/src/xrc/xmlres.cpp
+++ b/contrib/src/xrc/xmlres.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xmlres.cpp
-// Purpose:     XRC resources
+// Purpose:     XML resources
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$
@@ -310,7 +310,7 @@ void wxXmlResource::UpdateResources()
            }
            else if (m_data[i].Doc->GetRoot()->GetName() != wxT("resource"))
            {
-                wxLogError(_("Invalid XRC resource '%s': doesn't have root node 'resource'."), m_data[i].File.c_str());
+                wxLogError(_("Invalid XML resource '%s': doesn't have root node 'resource'."), m_data[i].File.c_str());
                wxDELETE(m_data[i].Doc);
            }
            else
@@ -368,7 +368,7 @@ wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& cla
            }
    }

-    wxLogError(_("XRC resource '%s' (class '%s') not found!"),
+    wxLogError(_("XML resource '%s' (class '%s') not found!"),
               name.c_str(), classname.c_str());
    return NULL;
 }
@@ -499,7 +499,7 @@ wxString wxXmlResourceHandler::GetText(const wxString& param)
    const wxChar *dt;
    wxChar amp_char;

-    // VS: First version of XRC resources used $ instead of & (which is illegal in XML),
+    // VS: First version of XML resources used $ instead of & (which is illegal in XML),
    //     but later I realized that '_' fits this purpose much better (because
    //     &File means "File with F underlined").
    if (m_resource->CompareVersion(2,3,0,1) < 0)
@@ -601,7 +601,7 @@ wxColour wxXmlResourceHandler::GetColour(const wxString& param)
    if (v.Length() != 7 || v[0u] != wxT('#') ||
        wxSscanf(v.c_str(), wxT("#%lX"), &tmp) != 1)
    {
-        wxLogError(_("XRC resource: Incorrect colour specification '%s' for property '%s'."),
+        wxLogError(_("XML resource: Incorrect colour specification '%s' for property '%s'."),
                   v.c_str(), param.c_str());
        return wxNullColour;
    }
@@ -621,7 +621,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size)
    wxFSFile *fsfile = GetCurFileSystem().OpenFile(name);
    if (fsfile == NULL)
    {
-        wxLogError(_("XRC resource: Cannot create bitmap from '%s'."), param.c_str());
+        wxLogError(_("XML resource: Cannot create bitmap from '%s'."), param.c_str());
        return wxNullBitmap;
    }
    wxImage img(*(fsfile->GetStream()));
@@ -631,7 +631,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size)
 #endif
    if (!img.Ok())
    {
-        wxLogError(_("XRC resource: Cannot create bitmap from '%s'."), param.c_str());
+        wxLogError(_("XML resource: Cannot create bitmap from '%s'."), param.c_str());
        return wxNullBitmap;
    }
    if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,25 +22,6 @@ wxwindows2.3 (2.3.0) unstable; urgency=low

 -- Ron Lee <ron@debian.org>  Sat, 27 Jan 2001 01:51:24 -0800

-wxwindows2.2 (2.2.8.4) unstable; urgency=low
-
-  * Put the (modified) size_t == ulong kludge back into sndwav.cpp
-    it's still needed until wxDataOutputStream is made 64 bit
-    friendly, which may not happen for 2.2 since it will probably
-    not be binary compatible.
-  * caps a memory leak in the jpeg handler.
-
- -- Ron Lee <ron@debian.org>  Sun, 25 Nov 2001 11:53:59 -0800
-
-wxwindows2.2 (2.2.8.3) unstable; urgency=low
-
-  * Backported size_t test from 2.3 tree, removes the need for
-    specific tests for various 64 bit platforms including now
-    S/390 (thanks to Gerhard Tonn for the report).
-    Closes: #120768
-
- -- Ron Lee <ron@debian.org>  Fri, 23 Nov 2001 20:53:49 -0800
-
 wxwindows2.2 (2.2.8.2) unstable; urgency=low

  * python-dev doesn't get me python?  More bytes in Build-Dep then
--- a/demos/bombs/.cvsignore
+++ b/demos/bombs/.cvsignore
@@ -1,5 +1,4 @@
-bombsM5.mcp
-bombsM*Data
+BombsM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*
--- a/demos/bombs/BombsM5.mcp
+++ b/demos/bombs/BombsM5.mcp
--- a/demos/bombs/bombsM5.xml
+++ b/demos/bombs/bombsM5.xml
--- a/demos/bombs/makefile.unx
+++ b/demos/bombs/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CXX = $(shell wx-config --cxx)
+CC = gcc

 PROGRAM = bombs

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o game.o bombs1.o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CXX) -c `wx-config --cxxflags` -o $@ $<
+	$(CC) -c `wx-config --cflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/demos/dbbrowse/.cvsignore
+++ b/demos/dbbrowse/.cvsignore
@@ -1,5 +1,4 @@
-dbbrowseM5.mcp
-dbbrowseM*Data
+DbbrowseM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*
--- a/demos/dbbrowse/DbbrowseM5.mcp
+++ b/demos/dbbrowse/DbbrowseM5.mcp
--- a/demos/dbbrowse/dbbrowse.dsw
+++ b/demos/dbbrowse/dbbrowse.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GEL<45>SCHT WERDEN!
+
+###############################################################################
+
+Project: "dbbrowse"=".\dbbrowse.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
--- a/demos/dbbrowse/dbbrowseM5.xml
+++ b/demos/dbbrowse/dbbrowseM5.xml
--- a/demos/dbbrowse/makefile.gtk
+++ b/demos/dbbrowse/makefile.gtk
@@ -1,15 +0,0 @@
-
-# Top dir of wxWindows
-top_builddir = /gtm/bart/wxGTK
-
-PROGRAM=dbbrowser_gtk
-
-
-OBJECTS= dbbrowse.o doc.o pgmctrl.o tabpgwin.o\
-         browsedb.o dbtree.o dbgrid.o  dlguser.o
-	
-
-
-
-include $(top_builddir)/src/makeprog.env
-
--- a/demos/forty/.cvsignore
+++ b/demos/forty/.cvsignore
@@ -1,5 +1,4 @@
-fortyM5.mcp
-fortyM*Data
+FortyM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*
--- a/demos/forty/FortyM5.mcp
+++ b/demos/forty/FortyM5.mcp
--- a/demos/forty/fortyM5.xml
+++ b/demos/forty/fortyM5.xml
--- a/Show More
+++ b/Show More