This commit was manufactured by cvs2svn to create tag

'DEBIAN_2_3_3_2'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/DEBIAN_2_3_3_2@17391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

Makefile.in

@@ -1499,6 +1499,7 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
 
 debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
+	cp $(SRCDIR)/files.lst $(DISTDIR)/src
 
 debian-msw-dirs:
 	mkdir $(DISTDIR)/include/wx/msw

acinclude.m4

@@ -19,7 +19,7 @@ dnl ---------------------------------------------------------------------------
 AC_DEFUN([WX_PATH_FIND_INCLUDES],
 [
 ac_find_includes=
-for ac_dir in $1;
+for ac_dir in $1 /usr/include;
   do
     if test -f "$ac_dir/$2"; then
       ac_find_includes=$ac_dir
@@ -35,7 +35,7 @@ dnl ---------------------------------------------------------------------------
 AC_DEFUN([WX_PATH_FIND_LIBRARIES],
 [
 ac_find_libraries=
-for ac_dir in $1;
+for ac_dir in $1 /usr/lib;
   do
     for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/lib$2.$ac_extension"; then
@@ -51,13 +51,17 @@ dnl Path to include, already defined
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([WX_INCLUDE_PATH_EXIST],
 [
-  ac_path_to_include=$1
+  dnl never add -I/usr/include to the CPPFLAGS
-  echo "$2" | grep "\-I$1" > /dev/null
+  if test "x$1" = "x/usr/include"; then
-  result=$?
-  if test $result = 0; then
     ac_path_to_include=""
   else
-    ac_path_to_include=" -I$1"
+    echo "$2" | grep "\-I$1" > /dev/null
+    result=$?
+    if test $result = 0; then
+      ac_path_to_include=""
+    else
+      ac_path_to_include=" -I$1"
+    fi
   fi
 ])
 

aclocal.m4

@@ -31,7 +31,7 @@ dnl ---------------------------------------------------------------------------
 AC_DEFUN([WX_PATH_FIND_INCLUDES],
 [
 ac_find_includes=
-for ac_dir in $1;
+for ac_dir in $1 /usr/include;
   do
     if test -f "$ac_dir/$2"; then
       ac_find_includes=$ac_dir
@@ -47,7 +47,7 @@ dnl ---------------------------------------------------------------------------
 AC_DEFUN([WX_PATH_FIND_LIBRARIES],
 [
 ac_find_libraries=
-for ac_dir in $1;
+for ac_dir in $1 /usr/lib;
   do
     for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/lib$2.$ac_extension"; then
@@ -63,13 +63,17 @@ dnl Path to include, already defined
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([WX_INCLUDE_PATH_EXIST],
 [
-  ac_path_to_include=$1
+  dnl never add -I/usr/include to the CPPFLAGS
-  echo "$2" | grep "\-I$1" > /dev/null
+  if test "x$1" = "x/usr/include"; then
-  result=$?
-  if test $result = 0; then
     ac_path_to_include=""
   else
-    ac_path_to_include=" -I$1"
+    echo "$2" | grep "\-I$1" > /dev/null
+    result=$?
+    if test $result = 0; then
+      ac_path_to_include=""
+    else
+      ac_path_to_include=" -I$1"
+    fi
   fi
 ])
 

configure.in

@@ -187,15 +187,15 @@ case "${host}" in
   *-*-openbsd*)
     USE_BSD=1
     USE_OPENBSD=1
-    AC_DEFINE(__FREEBSD__)
     AC_DEFINE(__OPENBSD__)
+    AC_DEFINE(__BSD__)
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
   *-*-netbsd*)
     USE_BSD=1
     USE_NETBSD=1
-    AC_DEFINE(__FREEBSD__)
     AC_DEFINE(__NETBSD__)
+    AC_DEFINE(__BSD__)
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
   *-*-osf* )
@@ -224,8 +224,11 @@ case "${host}" in
     USE_AIX=1
     USE_SYSV=1
     USE_SVR4=1
-    dnl Irvin Probst <irvin.probst@fr.thalesgroup.com> reports that the shared
+    dnl quoting from http://www-1.ibm.com/servers/esdd/articles/gnu.html:
-    dnl libraries under AIX have the same suffix as the normal ones
+    dnl
+    dnl     Both archive libraries and shared libraries on AIX have an .a
+    dnl     extension. This will explain why you can't link with an .so and
+    dnl     why it works with the name changed to .a. 
     SO_SUFFIX=a
     AC_DEFINE(__AIX__)
     AC_DEFINE(__SYSV__)
@@ -1223,7 +1226,7 @@ dnl   defines GCC empty if not using gcc
 dnl   defines CFLAGS
 dnl
 dnl this magic incantation is needed to prevent AC_PROG_CC from setting the
-dnl default CFLAGS (something like "-g -O2") - we don't need this as add
+dnl default CFLAGS (something like "-g -O2") -- we don't need this as we add
 dnl -g and -O flags ourselves below
 CFLAGS=${CFLAGS:=}
 AC_PROG_CC
@@ -1441,6 +1444,10 @@ AC_CACHE_CHECK([size of wchar_t], wx_cv_sizeof_wchar_t,
 [
     AC_TRY_RUN(
         [
+            /* DJGPP only has fake wchar_t: */
+            #ifdef __DJGPP__
+            #  error "fake wchar_t"
+            #endif
             #ifdef HAVE_WCHAR_H
             #  ifdef __CYGWIN__
             #    include <stddef.h>
@@ -1461,7 +1468,16 @@ AC_CACHE_CHECK([size of wchar_t], wx_cv_sizeof_wchar_t,
         ],
         wx_cv_sizeof_wchar_t=`cat conftestval`,
         wx_cv_sizeof_wchar_t=0,
-        wx_cv_sizeof_wchar_t=4
+        [
+            case "${host}" in
+              *-pc-msdosdjgpp )
+                wx_cv_sizeof_wchar_t=0
+                ;;
+              * )
+                wx_cv_sizeof_wchar_t=4
+                ;;
+            esac
+        ]
     )
 ])
 
@@ -1501,13 +1517,9 @@ dnl Define search path for includes and libraries: all headers and libs will be
 dnl looked for in all directories of this path
 dnl ---------------------------------------------------------------------------
 
-dnl notice that /usr/include should not be in this list, otherwise it breaks
+dnl Notice that /usr/include should *not* be in this list, otherwise it breaks
-dnl compilation on Solaris/gcc because standard headers are included instead
+dnl compilation on Solaris/AIX/... with gcc because standard (non ANSI C)
-dnl of the gcc ones.  (recorrection.. sadly much depends on this since it was
+dnl headers are included instead of the "fixed" (ANSI-fied) gcc ones.
-dnl first created and then 'corrected'..  removing /usr/include means system
-dnl GL and Xpm libs will dnl not be found on linux and probably other platforms
-dnl now.  We need to correct that first before removing /usr/include again.
-dnl see the various (ab)uses of WX_PATH_FIND_LIBRARIES below )
 dnl
 dnl Also try to put all directories which may contain X11R6 before those which
 dnl may contain X11R5/4 - we want to use R6 on machines which have both!
@@ -1574,8 +1586,7 @@ SEARCH_INCLUDE="\
     /usr/local/x11r5/include  \
     /usr/lpp/Xamples/include  \
                               \
-    /usr/openwin/share/include \
+    /usr/openwin/share/include"
-    /usr/include"
 
 SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
 
@@ -2233,8 +2244,10 @@ equivalent variable and GTK+ is version 1.2.3 or above.
           AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options)
         fi
 
-        GUI_TK_LIBRARY="$X_LIBS"
+        dnl for some reason AC_PATH_XTRA seems to add -INONE and -LNONE to
-        TOOLKIT_INCLUDE="$X_CFLAGS"
+        dnl X_LIBS and X_CFLAGS respectively -- what for??
+        GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//'`
+        TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
         AFMINSTALL=afminstall
         COMPILED_X_PROGRAM=0
 
@@ -2588,6 +2601,7 @@ fi
 dnl library link name
 WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
 WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
+WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
 
 dnl the name of the shared library
 WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
@@ -2757,16 +2771,18 @@ if test "$wxUSE_SHARED" = "yes"; then
       ;;
 
       *-*-aix* )
-        dnl the abs path below used to be hardcoded here so I guess it must
+        dnl default settings are ok for gcc
-        dnl be some sort of standard location under AIX?
+        if test "$GCC" != "yes"; then
-        AC_CHECK_PROG(AIX_CXX_LD, makeC++SharedLib,
+            dnl the abs path below used to be hardcoded here so I guess it must
-                      makeC++SharedLib, /usr/lpp/xlC/bin/makeC++SharedLib)
+            dnl be some sort of standard location under AIX?
+            AC_CHECK_PROG(AIX_CXX_LD, makeC++SharedLib,
+                          makeC++SharedLib, /usr/lpp/xlC/bin/makeC++SharedLib)
 
-        SHARED_LD="$(AIX_CXX_LD) -p 0 -o"
+            SHARED_LD="$(AIX_CXX_LD) -p 0 -o"
+        fi
       ;;
 
       *-*-cygwin* | *-*-mingw32* )
-
         WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
 
         SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
@@ -2789,9 +2805,15 @@ if test "$wxUSE_SHARED" = "yes"; then
         SHARED_LD="${LD} -shared -o"
       ;;
 
+      *-*-irix* )
+        dnl default settings are ok for gcc
+        if test "$GCC" != "yes"; then
+            PIC_FLAG="-KPIC"
+        fi
+      ;;
+
       *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
       *-*-sunos4* | \
-      *-*-irix5* | *-*-irix6* | \
       *-*-osf* | \
       *-*-dgux5* | \
       *-*-sysv5* )
@@ -3364,7 +3386,17 @@ if test "$TOOLKIT" != "MSW"; then
           AC_MSG_CHECKING([if more special flags are required for pthreads])
           flag=no
           case "${host}" in
-            *-aix* | *-freebsd*)
+            *-aix*)
+                dnl again quoting from
+                dnl http://www-1.ibm.com/servers/esdd/articles/gnu.html:
+                dnl
+                dnl     When compiling and linking with -pthread, the library
+                dnl     search path should include -L/usr/lib/threads at the
+                dnl     beginning of the path.
+                LDFLAGS="-L/usr/lib/threads $LDFLAGS"
+                flag="-D_THREAD_SAFE"
+                ;;
+            *-freebsd*)
                 flag="-D_THREAD_SAFE"
                 ;;
             *-hp-hpux* )
@@ -5144,7 +5176,8 @@ AC_SUBST(LIBWXMACRES)
 AC_SUBST(LIBWXMACRESCOMP)
 AC_SUBST(LIBWXMACRESWXCONFIG)
 
-dnl These seem to be missing
+dnl other tools
+AC_SUBST(GCC)
 AC_SUBST(DLLTOOL)
 AC_SUBST(AS)
 AC_SUBST(NM)
@@ -5175,9 +5208,16 @@ wx_cv_program_ext=$PROGRAM_EXT
 wx_cv_target_library=$WX_TARGET_LIBRARY
 wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL
 wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
+wx_cv_library_basename=${WX_LIBRARY_BASENAME}
+wx_cv_release=${WX_RELEASE}
+wx_cv_current=${WX_CURRENT}
+wx_cv_revision=${WX_REVISION}
+wx_cv_age=${WX_AGE}
 export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
        wx_cv_path_ifs wx_cv_program_ext \
-       wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype
+       wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \
+       wx_cv_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age
+
 
 AC_CONFIG_SUBDIRS(demos samples utils contrib)
 

contrib/configure

@@ -691,6 +691,16 @@ fi
 PATH_IFS=$wx_cv_path_ifs
 WX_TARGET_LIBRARY=$wx_cv_target_library
 WX_TARGET_LIBRARY_TYPE=$wx_cv_target_libtype
+WX_LIBRARY_BASENAME=$wx_cv_library_basename
+WX_RELEASE=$wx_cv_release
+WX_CURRENT=$wx_cv_current
+WX_REVISION=$wx_cv_revision
+WX_AGE=$wx_cv_age
+
+
+
+
+
 
 
 
@@ -830,7 +840,7 @@ trap 'rm -fr `echo "
             samples/ogl/ogledit/Makefile
             samples/ogl/studio/Makefile
             samples/stc/Makefile
-            samples/svg/Makefile	    
+            samples/svg/Makefile
             samples/canvas/Makefile
             samples/canvas/test/Makefile
             samples/canvas/simple/Makefile
@@ -890,6 +900,11 @@ s%@PATH_IFS@%$PATH_IFS%g
 s%@ESD_LINK@%$ESD_LINK%g
 s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
 s%@WX_TARGET_LIBRARY_TYPE@%$WX_TARGET_LIBRARY_TYPE%g
+s%@WX_LIBRARY_BASENAME@%$WX_LIBRARY_BASENAME%g
+s%@WX_RELEASE@%$WX_RELEASE%g
+s%@WX_CURRENT@%$WX_CURRENT%g
+s%@WX_REVISION@%$WX_REVISION%g
+s%@WX_AGE@%$WX_AGE%g
 
 CEOF
 EOF
@@ -949,7 +964,7 @@ CONFIG_FILES=\${CONFIG_FILES-"src/Makefile
             samples/ogl/ogledit/Makefile
             samples/ogl/studio/Makefile
             samples/stc/Makefile
-            samples/svg/Makefile	    
+            samples/svg/Makefile
             samples/canvas/Makefile
             samples/canvas/test/Makefile
             samples/canvas/simple/Makefile

contrib/configure.in

@@ -26,11 +26,21 @@ dnl Final subst
 PATH_IFS=$wx_cv_path_ifs
 WX_TARGET_LIBRARY=$wx_cv_target_library
 WX_TARGET_LIBRARY_TYPE=$wx_cv_target_libtype
+WX_LIBRARY_BASENAME=$wx_cv_library_basename
+WX_RELEASE=$wx_cv_release
+WX_CURRENT=$wx_cv_current
+WX_REVISION=$wx_cv_revision
+WX_AGE=$wx_cv_age
 
 AC_SUBST(PATH_IFS)
 AC_SUBST(ESD_LINK)
 AC_SUBST(WX_TARGET_LIBRARY)
 AC_SUBST(WX_TARGET_LIBRARY_TYPE)
+AC_SUBST(WX_LIBRARY_BASENAME)
+AC_SUBST(WX_RELEASE)
+AC_SUBST(WX_CURRENT)
+AC_SUBST(WX_REVISION)
+AC_SUBST(WX_AGE)
 
 dnl -----------
 dnl File output
@@ -55,6 +65,7 @@ AC_OUTPUT([
             samples/ogl/ogledit/Makefile
             samples/ogl/studio/Makefile
             samples/stc/Makefile
+            samples/svg/Makefile
             samples/canvas/Makefile
             samples/canvas/test/Makefile
             samples/canvas/simple/Makefile

contrib/include/wx/xrc/xmlres.h

@@ -37,6 +37,9 @@ class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxToolBar;
 
 class WXXMLDLLEXPORT wxXmlResourceHandler;
+class WXXMLDLLEXPORT wxXmlSubclassFactory;
+class WXXMLDLLEXPORT wxXmlSubclassFactoriesList;
+class wxXmlResourceModule;
 
 
 // These macros indicate current version of XML resources (this information is
@@ -133,6 +136,11 @@ public:
 
     // Removes all handlers
     void ClearHandlers();
+    
+    // Registers subclasses factory for use in XRC. This function is not meant
+    // for public use, please see the comment above wxXmlSubclassFactory
+    // definition.
+    static void AddSubclassFactory(wxXmlSubclassFactory *factory);
 
     // Loads menu from resource. Returns NULL on failure.
     wxMenu *LoadMenu(const wxString& name);
@@ -244,6 +252,9 @@ private:
 #endif
 
     friend class wxXmlResourceHandler;
+    friend class wxXmlResourceModule;
+
+    static wxXmlSubclassFactoriesList *ms_subclassFactories;
 
     // singleton instance:
     static wxXmlResource *ms_instance;
@@ -438,6 +449,20 @@ protected:
 void wxXmlInitResourceModule();
 
 
+// This class is used to create instances of XRC "object" nodes with "subclass"
+// property. It is _not_ supposed to be used by XRC users, you should instead
+// register your subclasses via wxWindows' RTTI mechanism. This class is useful
+// only for language bindings developer who need a way to implement subclassing
+// in wxWindows ports that don't support wxRTTI (e.g. wxPython).
+class WXXMLDLLEXPORT wxXmlSubclassFactory
+{
+public:
+    // Try to create instance of given class and return it, return NULL on failure:
+    virtual wxObject *Create(const wxString& className) = 0;
+    virtual ~wxXmlSubclassFactory() {}
+};
+
+
 /* -------------------------------------------------------------------------
    Backward compatibility macros. Do *NOT* use, they may disappear in future
    versions of the XRC library!

contrib/samples/animate/Makefile.in

@@ -17,7 +17,7 @@ PROGRAM=anitest
 
 OBJECTS=$(PROGRAM).o
 
-APPEXTRALIBS=$(top_builddir)/lib/libwx_anim.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_anim-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makeprog.env

contrib/samples/applet/Makefile.in

@@ -19,7 +19,7 @@ DATAFILES=about.html index.html
 
 OBJECTS=applet.o dialogs_wdr.o monitorapplet.o combobox.o
 
-APPEXTRALIBS=$(top_builddir)/lib/libapplet.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_applet-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makeprog.env

contrib/samples/canvas/simple/Makefile.in

@@ -17,7 +17,7 @@ PROGRAM=simple
 
 OBJECTS=simple.o
 
-APPEXTRALIBS=$(top_builddir)/lib/libcanvas.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_canvas-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makeprog.env

contrib/samples/canvas/test/Makefile.in

@@ -19,7 +19,7 @@ OBJECTS=test.o
 
 DATAFILES = pat4.bmp pat36.bmp
 
-APPEXTRALIBS=$(top_builddir)/lib/libcanvas.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_canvas-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makeprog.env

contrib/samples/fl/fl_demo1/Makefile.in

@@ -17,7 +17,7 @@ TARGET = fl_demo1
 program_dir = contrib/samples/fl/$(TARGET)
 
 APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\"
-APPEXTRALIBS = $(top_builddir)/lib/libfl.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS = $(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_fl-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 
 PROGRAM = $(TARGET)
 OBJECTS = $(TARGET).o

contrib/samples/fl/fl_demo2/Makefile.in

@@ -17,7 +17,7 @@ TARGET = fl_demo2
 program_dir = contrib/samples/fl/$(TARGET)
 
 APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\"
-APPEXTRALIBS = $(top_builddir)/lib/libfl.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS = $(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_fl-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 
 PROGRAM = $(TARGET)
 OBJECTS = $(TARGET).o

contrib/samples/fl/fl_sample1/Makefile.in

@@ -17,7 +17,7 @@ TARGET = fl_sample1
 program_dir = contrib/samples/fl/$(TARGET)
 
 APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\"
-APPEXTRALIBS = $(top_builddir)/lib/libfl.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS = $(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_fl-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 
 PROGRAM = $(TARGET)
 OBJECTS = $(TARGET).o

contrib/samples/fl/fl_sample2/Makefile.in

@@ -17,7 +17,7 @@ TARGET = fl_sample2
 program_dir = contrib/samples/fl/$(TARGET)
 
 APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\"
-APPEXTRALIBS = $(top_builddir)/lib/libfl.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS = $(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_fl-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 
 PROGRAM = $(TARGET)
 OBJECTS = $(TARGET).o

contrib/samples/fl/fl_sample3/Makefile.in

@@ -17,7 +17,7 @@ TARGET = fl_sample3
 program_dir = contrib/samples/fl/$(TARGET)
 
 APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\"
-APPEXTRALIBS = $(top_builddir)/lib/libfl.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS = $(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_fl-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 
 PROGRAM = $(TARGET)
 OBJECTS = $(TARGET).o

contrib/samples/gizmos/dynsash/Makefile.in

@@ -16,7 +16,7 @@ program_dir = contrib/samples/gizmos/dynsash
 PROGRAM=dynsash
 OBJECTS=dynsash.o
 
-APPEXTRALIBS=$(top_builddir)/lib/libgizmos.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_gizmos-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makeprog.env

contrib/samples/gizmos/dynsash_switch/Makefile.in

@@ -16,7 +16,7 @@ program_dir = contrib/samples/gizmos/dynsash_switch
 PROGRAM=dynsash_switch
 OBJECTS=dynsash_switch.o
 
-APPEXTRALIBS=$(top_builddir)/lib/libgizmos.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_gizmos-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makeprog.env

contrib/samples/gizmos/editlbox/Makefile.in

@@ -16,7 +16,7 @@ program_dir = contrib/samples/gizmos/editlbox
 PROGRAM=test
 OBJECTS=test.o
 
-APPEXTRALIBS=$(top_builddir)/lib/libgizmos.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_gizmos-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makeprog.env

contrib/samples/gizmos/multicell/Makefile.in

@@ -17,7 +17,7 @@ PROGRAM=multicell
 
 OBJECTS=mtest.o
 
-APPEXTRALIBS=$(top_builddir)/lib/libgizmos.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_gizmos-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makeprog.env

contrib/samples/gizmos/splittree/Makefile.in

@@ -16,7 +16,7 @@ program_dir = contrib/samples/gizmos/splittree
 PROGRAM=splittree
 OBJECTS=tree.o
 
-APPEXTRALIBS=$(top_builddir)/lib/libgizmos.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_gizmos-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makeprog.env

contrib/samples/mmedia/Makefile.in

@@ -9,7 +9,7 @@ PROGRAM=mmboard
 
 OBJECTS=mmboard.o mmbman.o
 
-APPEXTRALIBS=$(top_builddir)/lib/libmmedia.@WX_TARGET_LIBRARY_TYPE@ @ESD_LINK@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_mmedia-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@ @ESD_LINK@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makeprog.env

contrib/samples/ogl/ogledit/Makefile.in

@@ -9,7 +9,7 @@ PROGRAM=ogledit
 
 OBJECTS=$(PROGRAM).o doc.o view.o palette.o
 
-APPEXTRALIBS=$(top_builddir)/lib/libogl.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_ogl-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makeprog.env

contrib/samples/ogl/studio/Makefile.in

@@ -12,7 +12,7 @@ DATAFILES=studio_resources.wxr
 OBJECTS=$(PROGRAM).o doc.o shapes.o symbols.o view.o cspalette.o\
   mainfrm.o project.o dialogs.o csprint.o
 
-APPEXTRALIBS=$(top_builddir)/lib/libogl.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_ogl-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include -I$(top_srcdir)/$(program_dir)/bitmaps
 
 include $(top_builddir)/src/makeprog.env

contrib/samples/plot/Makefile.in

@@ -9,7 +9,7 @@ PROGRAM=plot
 
 OBJECTS=plot.o
 
-APPEXTRALIBS=$(top_builddir)/lib/libwx_plot.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_plot-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makeprog.env

contrib/samples/stc/Makefile.in

@@ -13,7 +13,7 @@ PROGRAM=stctest
 
 OBJECTS=$(PROGRAM).o
 
-APPEXTRALIBS=$(top_builddir)/lib/libstc.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_stc-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 DATAFILES=stctest.cpp

contrib/samples/svg/Makefile.in

@@ -9,7 +9,7 @@ PROGRAM=svgtest
 
 OBJECTS=svgtest.o
 
-APPEXTRALIBS=$(top_builddir)/lib/libwx_dcsvg.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_dcsvg-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makeprog.env

contrib/samples/xrc/Makefile.in

@@ -16,7 +16,7 @@ OBJECTS=$(PROGRAM).o \
         derivdlg.o \
 	custclas.o
 
-APPEXTRALIBS=$(top_builddir)/lib/libwxxrc.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_xrc-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 DATADIRS = rc

contrib/src/animate/Makefile.in

@@ -4,11 +4,12 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/animate
 
-TARGET_LIBNAME=libwx_anim
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_animate-@WX_RELEASE@
+
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@
 
-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0
 
 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=plot

contrib/src/applet/Makefile.in

@@ -4,11 +4,12 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/applet
 
-TARGET_LIBNAME=libapplet
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_applet-@WX_RELEASE@
+
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@
 
-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0
 
 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=applet

contrib/src/canvas/Makefile.in

@@ -4,11 +4,12 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/canvas
 
-TARGET_LIBNAME=libcanvas
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_canvas-@WX_RELEASE@
+
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@
 
-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0
 
 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=canvas

contrib/src/fl/Makefile.in

@@ -4,11 +4,12 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/fl
 
-TARGET_LIBNAME = libfl
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_fl-@WX_RELEASE@
+
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@
 
-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0
 
 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=fl

contrib/src/gizmos/Makefile.in

@@ -4,11 +4,12 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/gizmos
 
-TARGET_LIBNAME=libgizmos
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_gizmos-@WX_RELEASE@
+
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@
 
-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0
 
 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=gizmos

contrib/src/mmedia/Makefile.in

@@ -4,11 +4,12 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/mmedia
 
-TARGET_LIBNAME=libmmedia
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_mmedia-@WX_RELEASE@
+
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@
 
-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0
 
 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=mmedia

contrib/src/net/Makefile.in

@@ -4,14 +4,15 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/net
 
-TARGET_LIBNAME=libwx_net
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_net-@WX_RELEASE@
+
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@
 
-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0
 
 HEADER_PATH=$(top_srcdir)/contrib/include/wx
-HEADER_SUBDIR=plot
+HEADER_SUBDIR=net
 
 HEADERS=msg.h email.h web.h
 

contrib/src/ogl/Makefile.in

@@ -4,11 +4,12 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/ogl
 
-TARGET_LIBNAME=libogl
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_ogl-@WX_RELEASE@
+
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@
 
-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0
 
 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=ogl

contrib/src/plot/Makefile.in

@@ -4,11 +4,11 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/plot
 
-TARGET_LIBNAME=libwx_plot
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_plot-@WX_RELEASE@
 
-LIBVERSION_CURRENT=1
+LIBVERSION_CURRENT=@WX_CURRENT@
-LIBVERSION_REVISION=0
+LIBVERSION_REVISION=@WX_REVISION@
-LIBVERSION_AGE=0
+LIBVERSION_AGE=@WX_AGE@
 
 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=plot

contrib/src/stc/Makefile.in

@@ -11,11 +11,11 @@ top_builddir = ../../..
 scintilla_dir = $(top_srcdir)/contrib/src/stc/scintilla
 libsrc_dir = contrib/src/stc@PATH_IFS@$(scintilla_dir)/src
 
-TARGET_LIBNAME=libstc
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_stc-@WX_RELEASE@
 
-LIBVERSION_CURRENT=1
+LIBVERSION_CURRENT=@WX_CURRENT@
-LIBVERSION_REVISION=0
+LIBVERSION_REVISION=@WX_REVISION@
-LIBVERSION_AGE=0
+LIBVERSION_AGE=@WX_AGE@
 
 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=stc

contrib/src/svg/Makefile.in

@@ -4,14 +4,14 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/svg
 
-TARGET_LIBNAME=libwx_dcsvg
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_dcsvg-@WX_RELEASE@
 
-LIBVERSION_CURRENT=1
+LIBVERSION_CURRENT=@WX_CURRENT@
-LIBVERSION_REVISION=0
+LIBVERSION_REVISION=@WX_REVISION@
-LIBVERSION_AGE=0
+LIBVERSION_AGE=@WX_AGE@
 
 HEADER_PATH=$(top_srcdir)/contrib/include/wx
-HEADER_SUBDIR=dcsvg
+HEADER_SUBDIR=svg
 
 HEADERS=dcsvg.h
 

contrib/src/xrc/Makefile.in

@@ -7,11 +7,11 @@ expat_dir = $(top_srcdir)/contrib/src/xrc/expat
 libsrc_dir = contrib/src/xrc@PATH_IFS@$(expat_dir)/xmlparse@PATH_IFS@$(expat_dir)/xmltok
 
 
-TARGET_LIBNAME=libwxxrc
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_xrc-@WX_RELEASE@
 
-LIBVERSION_CURRENT=0
+LIBVERSION_CURRENT=@WX_CURRENT@
-LIBVERSION_REVISION=1
+LIBVERSION_REVISION=@WX_REVISION@
-LIBVERSION_AGE=0
+LIBVERSION_AGE=@WX_AGE@
 
 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=xrc
@@ -22,7 +22,7 @@ EXPAT_OBJECTS=xmltok.o xmlrole.o xmlparse.o
 HEADERS=xh_all.h xh_bttn.h xh_chckb.h xh_chckl.h xh_choic.h xh_combo.h \
         xh_dlg.h xh_gauge.h xh_html.h xh_menu.h xh_notbk.h xh_panel.h \
         xh_radbt.h xh_radbx.h xh_sizer.h xh_slidr.h xh_spin.h xh_stbmp.h \
-        xh_sttxt.h xh_text.h xh_listb.h xml.h xmlio.h xmlres.h xh_toolb.h \
+        xh_sttxt.h xh_text.h xh_listb.h xml.h xmlres.h xh_toolb.h \
         xh_bmpbt.h xh_cald.h xh_listc.h xh_scrol.h xh_stbox.h xh_tree.h \
         xh_stlin.h xh_bmp.h xh_unkwn.h xh_frame.h xh_gdctl.h
 

contrib/src/xrc/xh_dlg.cpp

@@ -41,6 +41,8 @@ wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
     XRC_ADD_STYLE(wxCLIP_CHILDREN);
+    XRC_ADD_STYLE(wxMAXIMIZE_BOX);
+    XRC_ADD_STYLE(wxMINIMIZE_BOX);
 
     AddWindowStyles();
 }

contrib/src/xrc/xmlres.cpp

@@ -547,6 +547,40 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wx
 }
 
 
+#include "wx/listimpl.cpp"
+WX_DECLARE_LIST(wxXmlSubclassFactory, wxXmlSubclassFactoriesList);
+WX_DEFINE_LIST(wxXmlSubclassFactoriesList);
+
+wxXmlSubclassFactoriesList *wxXmlResource::ms_subclassFactories = NULL;
+
+/*static*/ void wxXmlResource::AddSubclassFactory(wxXmlSubclassFactory *factory)
+{
+    if (!ms_subclassFactories)
+    {
+        ms_subclassFactories = new wxXmlSubclassFactoriesList;
+        ms_subclassFactories->DeleteContents(TRUE);
+    }
+    ms_subclassFactories->Append(factory);
+}
+
+class wxXmlSubclassFactoryCXX : public wxXmlSubclassFactory
+{
+public:
+    ~wxXmlSubclassFactoryCXX() {}
+
+    wxObject *Create(const wxString& className)
+    {
+        wxClassInfo* classInfo = wxClassInfo::FindClass(className);
+
+        if (classInfo)
+            return classInfo->CreateObject();
+        else
+            return NULL;
+    }
+};
+
+
+
 
 
 wxXmlResourceHandler::wxXmlResourceHandler()
@@ -568,18 +602,23 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent
         !(m_resource->GetFlags() & wxXRC_NO_SUBCLASSING))
     {
         wxString subclass = node->GetPropVal(wxT("subclass"), wxEmptyString);
-        wxClassInfo* classInfo = wxClassInfo::FindClass(subclass);
+        if (!subclass.empty())
-
-        if (classInfo)
-            m_instance = classInfo->CreateObject();
-
-        if (!m_instance)
         {
-            wxLogError(_("Subclass '%s' not found for resource '%s', not subclassing!"),
+            for (wxXmlSubclassFactoriesList::Node *i = wxXmlResource::ms_subclassFactories->GetFirst();
-                       subclass.c_str(), node->GetPropVal(wxT("name"), wxEmptyString).c_str());
+                 i; i = i->GetNext())
-        }
+            {
+                m_instance = i->GetData()->Create(subclass);
+                if (m_instance)
+                    break;
+            }
 
-        m_instance = classInfo->CreateObject();
+            if (!m_instance)
+            {
+                wxString name = node->GetPropVal(wxT("name"), wxEmptyString);
+                wxLogError(_("Subclass '%s' not found for resource '%s', not subclassing!"),
+                           subclass.c_str(), name.c_str());
+            }
+        }
     }
 
     m_node = node;
@@ -733,6 +772,7 @@ int wxXmlResourceHandler::GetID()
     stdID(wxID_STATIC); stdID(wxID_FORWARD); stdID(wxID_BACKWARD);
     stdID(wxID_DEFAULT); stdID(wxID_MORE); stdID(wxID_SETUP);
     stdID(wxID_RESET); stdID(wxID_HELP_CONTEXT);
+    stdID(wxID_CLOSE_ALL);
 #undef stdID
     else return wxXmlResource::GetXRCID(sid);
 }
@@ -1166,11 +1206,13 @@ public:
     wxXmlResourceModule() {}
     bool OnInit()
     {
+        wxXmlResource::AddSubclassFactory(new wxXmlSubclassFactoryCXX);
         return TRUE;
     }
     void OnExit()
     {
         delete wxXmlResource::Set(NULL);
+        wxDELETE(wxXmlResource::ms_subclassFactories);
         CleanXRCID_Records();
     }
 };

contrib/utils/wxrc/Makefile.in

@@ -9,7 +9,7 @@ PROGRAM=wxrc
 OBJECTS=wxrc.o
 
 
-APPEXTRALIBS=$(top_builddir)/lib/libwxxrc.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_xrc-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makeprog.env

contrib/utils/wxrc/wxrc.cpp

@@ -251,28 +251,40 @@ wxArrayString XmlResApp::PrepareTempFiles()
 // find all files mentioned in structure, e.g. <bitmap>filename</bitmap>
 void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxString& inputPath)
 {
-    wxXmlNode *n = node;
+    // Is 'node' XML node element?
-    if (n == NULL) return;
+    if (node == NULL) return;
-    n = n->GetChildren();
+    if (node->GetType() != wxXML_ELEMENT_NODE) return;
-    
+
+    // Does 'node' contain filename information at all?
+    bool containsFilename = (
+        // Any bitmaps:
+        (node->GetName() == _T("bitmap")) ||
+        // URLs in wxHtmlWindow:
+        (node->GetName() == _T("url")) ||
+        // wxBitmapButton:
+        (node->GetParent() != NULL && 
+         node->GetParent()->GetPropVal(_T("class"), _T("")) == _T("wxBitmapButton") &&
+           (node->GetName() == _T("focus") || 
+            node->GetName() == _T("disabled") ||
+            node->GetName() == _T("selected")))
+        );
+
+    wxXmlNode *n = node->GetChildren();
     while (n)
     {
-        if ((node->GetType() == wxXML_ELEMENT_NODE) &&
+        if (containsFilename &&
-            // parent is an element, i.e. has subnodes...
             (n->GetType() == wxXML_TEXT_NODE || 
-            n->GetType() == wxXML_CDATA_SECTION_NODE) &&
+             n->GetType() == wxXML_CDATA_SECTION_NODE))
-            // ...it is textnode...
-            ((node/*not n!*/->GetName() == "bitmap") ||
-             (node/*not n!*/->GetName() == "url")))
-            // ...and known to contain filename
         {
             wxString fullname;
-            if (wxIsAbsolutePath(n->GetContent()) || inputPath == "") fullname = n->GetContent();
+            if (wxIsAbsolutePath(n->GetContent()) || inputPath == "")
-            else fullname = inputPath + "/" + n->GetContent();
+                fullname = n->GetContent();
+            else
+                fullname = inputPath + "/" + n->GetContent();
 
             if (flagVerbose) 
                 wxPrintf("adding     " + fullname +  "...\n");
-            
+
             wxString filename = GetInternalFileName(n->GetContent(), flist);
             n->SetContent(filename);
 
@@ -282,11 +294,11 @@ void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxSt
             wxFileOutputStream sout(parOutputPath + "/" + filename);
             sin.Read(sout); // copy the stream
         }
-        
+
         // subnodes:
         if (n->GetType() == wxXML_ELEMENT_NODE)
             FindFilesInXML(n, flist, inputPath);
-        
+
         n = n->GetNext();
     }
 }

contrib/utils/wxrcedit/Makefile.in

@@ -25,7 +25,7 @@ DATAFILES = df/break.df df/control.df df/menu_item.df df/notebookpage.df \
             df/wxStaticLine.df df/wxStaticText.df df/wxTextCtrl.df \
             df/wxToolBar.df df/wxTreeCtrl.df 
             
-APPEXTRALIBS=$(top_builddir)/lib/libwxxrc.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_xrc-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makeprog.env

contrib/utils/wxrcedit/editor.cpp

@@ -494,8 +494,7 @@ void EditorFrame::OnTreeSel(wxTreeEvent& event)
         }
         RecursivelyExpand(m_TreeCtrl, event.GetItem());
 
-        PreviewFrame::Get()->Preview(node,m_Resource->GetRoot()->GetPropVal(
+        PreviewFrame::Get()->Preview(node,m_Resource);
-                                      wxT("version"), wxT("0.0.0.0")));
     }
 }
 
@@ -509,8 +508,7 @@ void EditorFrame::OnToolbar(wxCommandEvent& event)
             {
             XmlTreeData* dt = (XmlTreeData*)m_TreeCtrl->GetItemData(m_TreeCtrl->GetSelection());;
             if (dt != NULL && dt->Node != NULL)
-                PreviewFrame::Get()->Preview(dt->Node,m_Resource->GetRoot()->GetPropVal(
+                PreviewFrame::Get()->Preview(dt->Node, m_Resource);
-                                      wxT("version"), wxT("0.0.0.0")));
             break;
             }
 

contrib/utils/wxrcedit/preview.cpp

@@ -140,8 +140,10 @@ void PreviewFrame::MakeDirty()
 
 
 
-void PreviewFrame::Preview(wxXmlNode *node,const wxString &version)
+void PreviewFrame::Preview(wxXmlNode *node, wxXmlDocument *orig_doc)
 {
+   wxString version = orig_doc->GetRoot()->GetPropVal(wxT("version"), wxT("0.0.0.0"));
+
    while (node->GetParent()->GetParent() != NULL) node = node->GetParent();
 
    {
@@ -150,6 +152,7 @@ void PreviewFrame::Preview(wxXmlNode *node,const wxString &version)
        root->AddProperty(new wxXmlProperty(wxT("version"),version,NULL));
        doc.SetRoot(root);
        doc.GetRoot()->AddChild(new wxXmlNode(*node));
+       doc.SetFileEncoding(orig_doc->GetFileEncoding());
 
        if (XmlGetClass(doc.GetRoot()->GetChildren()) == _T("wxDialog")) 
            XmlSetClass(doc.GetRoot()->GetChildren(), _T("wxPanel"));   
@@ -168,7 +171,7 @@ void PreviewFrame::Preview(wxXmlNode *node,const wxString &version)
    }
 
    m_Node = node;
-   m_Version = version;
+   m_Doc = orig_doc;
 
    m_LogCtrl->Clear();
    wxLogTextCtrl mylog(m_LogCtrl);
@@ -237,5 +240,5 @@ END_EVENT_TABLE()
 
 void PreviewFrame::OnMouseEnter(wxMouseEvent& event)
 {
-    if (m_Dirty) Preview(m_Node,m_Version);
+    if (m_Dirty) Preview(m_Node,m_Doc);
 }

contrib/utils/wxrcedit/preview.h

@@ -31,7 +31,7 @@ class PreviewFrame : public wxFrame
         PreviewFrame();
         ~PreviewFrame();
         
-        void Preview(wxXmlNode *node,const wxString &version);
+        void Preview(wxXmlNode *node,wxXmlDocument *doc);
         void MakeDirty();
                 // current node updated, needs preview refresh
                 // (will be done once mouse enters preview win)
@@ -47,7 +47,7 @@ class PreviewFrame : public wxFrame
     private:
         static PreviewFrame *ms_Instance;
         wxXmlNode *m_Node;
-        wxString m_Version;
+        wxXmlDocument *m_Doc;
         wxScrolledWindow *m_ScrollWin;
         wxTextCtrl *m_LogCtrl;
         wxSplitterWindow *m_Splitter;

debian/changelog

@@ -1,3 +1,34 @@
+wxwindows2.3 (2.3.3.2) unstable; urgency=low
+
+  * The one more for luck release.
+  * Debian-wise, it fixes the problem with contrib lib name clashes;
+    code-wise, lots of little issues (and a couple of big 'uns) from
+    2.3.3 -- see the more regular change or cvs logs for details...
+  * Yes, it's still the unstable branch, yes the request for testing
+    to see if we can reasonably obsolete 2.2 in post-woody debian
+    is still current, and yes we're still working toward a stable
+    2.4 release as fast as we can.   Big thanks to everyone who's
+    been patient and/or active fixing things.
+
+ -- Ron Lee <ron@debian.org>  Thu, 26 Sep 2002 17:43:05 -0700
+
+wxwindows2.3 (2.3.3.1) unstable; urgency=low
+
+  * Ok, Robin says wxPython is good to go.
+  * Since wx2.2 has crashed and burned with the new releases of
+    python and png, Could package maintainers with packages that
+    depend on wx please recompile with this package and let me
+    know if they still need 2.2 in woody?   If not I'll have them
+    removed.  There should be a 2.4 release following very soon.
+    (hah, let's see how the date on that comment testifies!)
+  * Yes, I know wxpython is missing man pages for some of its
+    scripts.  File a bug if you must, but preferably, if you know
+    what they do, attach a patch containing one.  I don't use them
+    myself or could even do more than guess what they do today.
+    Sorry, C++.
+
+ -- Ron Lee <ron@debian.org>  Thu, 19 Sep 2002 16:25:12 -0700
+
 wxwindows2.3 (2.3.3) unstable; urgency=low
 
   * The "If it sucks, You whined for it!" release.

debian/control.in

@@ -116,7 +116,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
 Package: libwxgtk=V-python
 Architecture: any
 Section: interpreters
-Depends: python (>=2.1), python (<<2.2), ${shlibs:Depends}
+Depends: python (>=2.2), python (<<2.3), ${shlibs:Depends}
 Suggests: wxwin=V-doc, wxwin=V-examples
 Conflicts: libwxgtk=V-python-contrib, python-wxwin
 Replaces: libwxgtk=V-python-contrib, python-wxwin

debian/libwxgtk-contrib-dev.files

@@ -1,12 +1,12 @@
 usr/include/wx/
-usr/lib/libcanvas.so
+usr/lib/libwx_gtk_canvas-*.so
-usr/lib/libfl.so
+usr/lib/libwx_gtk_dcsvg-*.so
-usr/lib/libgizmos.so
+usr/lib/libwx_gtk_fl-*.so
-usr/lib/libmmedia.so
+usr/lib/libwx_gtk_gizmos-*.so
-usr/lib/libogl.so
+usr/lib/libwx_gtk_mmedia-*.so
-usr/lib/libstc.so
+usr/lib/libwx_gtk_net-*.so
-usr/lib/libwx_dcsvg.so
+usr/lib/libwx_gtk_ogl-*.so
-usr/lib/libwx_net.so
+usr/lib/libwx_gtk_plot-*.so
-usr/lib/libwx_plot.so
+usr/lib/libwx_gtk_stc-*.so
-usr/lib/libwxxrc.so
+usr/lib/libwx_gtk_xrc-*.so
 

debian/rules

@@ -562,7 +562,8 @@ install-gtk-dev: build-gtk-static-stamp install-gtk-lib
 	dh_clean -k
 	dh_installdirs
 	dh_movefiles --sourcedir=debian/$(package_gtk_lib)
-	cp $(objdir_gtk_static)/lib/libwx_gtk*.a debian/$(package_gtk_dev)/usr/lib
+	cp $(objdir_gtk_static)/lib/libwx_gtk-*.a debian/$(package_gtk_dev)/usr/lib
+	cp $(objdir_gtk_static)/lib/libwx_gtk_gl-*.a debian/$(package_gtk_dev)/usr/lib
 
 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp
@@ -601,7 +602,8 @@ install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-dev
 	dh_installdirs
 	dh_movefiles --sourcedir=debian/$(package_gtk_contrib)
 	cp $(objdir_gtk_static)/lib/*.a debian/$(package_gtk_contrib_dev)/usr/lib
-	rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk*.a
+	rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk-*.a
+	rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk_gl-*.a
 
 install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
 install-gtk-py: build-gtk-py-stamp

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
-

distrib/msw/copybase.bat

@@ -3,7 +3,7 @@
 rem VZ: this is quick and _very_ dirty
 
 set VER=2.3.3
-set DEST=s:\upload\wxBase-%VER%
+set DEST=q:\wxBase-%VER%
 
 mkdir %DEST%
 mkdir %DEST%\include
@@ -20,6 +20,7 @@ mkdir %DEST%\src\msw
 mkdir %DEST%\src\regex
 mkdir %DEST%\src\unix
 mkdir %DEST%\src\zlib
+mkdir %DEST%\lib
 
 chdir %WXWIN%
 
@@ -27,19 +28,23 @@ rem Copy the files to the root directory
 
 copy /q docs\changes.txt %DEST%\CHANGES.txt
 copy /q docs\licence.txt %DEST%\LICENCE.txt
-copy /q docs\install.txt %DEST%\README.txt
+copy /q docs\base\readme.txt %DEST%\README.txt
-copy /q docs\symbols.txt %DEST%\SYMBOLS.txt
 
-rem Copy the project files
+rem Copy the project/make files
 
 copy /q src\wxBase.dsp %DEST%\src\wxBase.dsp
 copy /q src\wxBase.dsw %DEST%\src\wxBase.dsw
-copy /q include\wx\msw\setup.h %DEST%\include\wx\msw\setup.h
+copy /q include\wx\msw\setup0.h %DEST%\include\wx\msw\setup.h
+copy /q src\makeb32.env %DEST%\src\makeb32.env
+copy /q src\makelib.b32 %DEST%\src\makelib.b32
+copy /q src\makeprog.b32 %DEST%\src\makeprog.b32
+copy /q src\msw\makebase.b32 %DEST%\src\msw\makebase.b32
 
 rem Copy the sample
 
 copy /q samples\console\console.cpp %DEST%\samples\console\console.cpp
 copy /q samples\console\console.dsp %DEST%\samples\console\console.dsp
+copy /q samples\console\makefile.b32 %DEST%\samples\console\makefile.b32
 copy /q samples\console\testdata.fc %DEST%\samples\console\testdata.fc
 
 rem Copy regex and zlib files
@@ -51,101 +56,27 @@ rem The files not in src/files.lst
 copy /q src\msw\dummy.cpp %DEST%\src\msw\dummy.cpp
 copy /q src\msw\dummydll.cpp %DEST%\src\msw\dummydll.cpp
 
+copy /q src\common\execcmn.cpp %DEST%\src\common\execcmn.cpp
 copy /q src\common\unictabl.inc %DEST%\src\common\unictabl.inc
+copy /q src\common\unzip.h %DEST%\src\common\unzip.h
 
-rem The rest is generated from src/files.lst
+copy /q include\wx\msw\gsockmsw.h %DEST%\include\wx\msw\gsockmsw.h
-
+copy /q include\wx\msw\missing.h %DEST%\include\wx\msw\missing.h
-copy /q include\wx\app.h %DEST%\include\wx\app.h
+copy /q include\wx\msw\mslu.h %DEST%\include\wx\msw\mslu.h
-copy /q include\wx\arrimpl.cpp %DEST%\include\wx\arrimpl.cpp
+copy /q include\wx\msw\msvcrt.h %DEST%\include\wx\msw\msvcrt.h
-copy /q include\wx\buffer.h %DEST%\include\wx\buffer.h
+copy /q include\wx\msw\private.h %DEST%\include\wx\msw\private.h
-copy /q include\wx\chkconf.h %DEST%\include\wx\chkconf.h
+copy /q include\wx\msw\regconf.h %DEST%\include\wx\msw\regconf.h
-copy /q include\wx\clntdata.h %DEST%\include\wx\clntdata.h
+copy /q include\wx\msw\registry.h %DEST%\include\wx\msw\registry.h
-copy /q include\wx\cmdline.h %DEST%\include\wx\cmdline.h
-copy /q include\wx\confbase.h %DEST%\include\wx\confbase.h
-copy /q include\wx\config.h %DEST%\include\wx\config.h
-copy /q include\wx\date.h %DEST%\include\wx\date.h
-copy /q include\wx\datetime.h %DEST%\include\wx\datetime.h
-copy /q include\wx\datetime.inl %DEST%\include\wx\datetime.inl
-copy /q include\wx\datstrm.h %DEST%\include\wx\datstrm.h
-copy /q include\wx\db.h %DEST%\include\wx\db.h
-copy /q include\wx\dbtable.h %DEST%\include\wx\dbtable.h
-copy /q include\wx\dde.h %DEST%\include\wx\dde.h
-copy /q include\wx\debug.h %DEST%\include\wx\debug.h
-copy /q include\wx\defs.h %DEST%\include\wx\defs.h
-copy /q include\wx\dir.h %DEST%\include\wx\dir.h
-copy /q include\wx\dynarray.h %DEST%\include\wx\dynarray.h
-copy /q include\wx\dynlib.h %DEST%\include\wx\dynlib.h
-copy /q include\wx\encconv.h %DEST%\include\wx\encconv.h
-copy /q include\wx\event.h %DEST%\include\wx\event.h
-copy /q include\wx\ffile.h %DEST%\include\wx\ffile.h
-copy /q include\wx\file.h %DEST%\include\wx\file.h
-copy /q include\wx\fileconf.h %DEST%\include\wx\fileconf.h
-copy /q include\wx\filefn.h %DEST%\include\wx\filefn.h
-copy /q include\wx\filename.h %DEST%\include\wx\filename.h
-copy /q include\wx\filesys.h %DEST%\include\wx\filesys.h
-copy /q include\wx\fontenc.h %DEST%\include\wx\fontenc.h
-copy /q include\wx\fontmap.h %DEST%\include\wx\fontmap.h
-copy /q include\wx\fs_inet.h %DEST%\include\wx\fs_inet.h
-copy /q include\wx\fs_mem.h %DEST%\include\wx\fs_mem.h
-copy /q include\wx\fs_zip.h %DEST%\include\wx\fs_zip.h
-copy /q include\wx\gsocket.h %DEST%\include\wx\gsocket.h
-copy /q include\wx\hash.h %DEST%\include\wx\hash.h
-copy /q include\wx\intl.h %DEST%\include\wx\intl.h
-copy /q include\wx\ioswrap.h %DEST%\include\wx\ioswrap.h
-copy /q include\wx\ipcbase.h %DEST%\include\wx\ipcbase.h
-copy /q include\wx\list.h %DEST%\include\wx\list.h
-copy /q include\wx\listimpl.cpp %DEST%\include\wx\listimpl.cpp
-copy /q include\wx\log.h %DEST%\include\wx\log.h
-copy /q include\wx\longlong.h %DEST%\include\wx\longlong.h
-copy /q include\wx\memconf.h %DEST%\include\wx\memconf.h
-copy /q include\wx\memory.h %DEST%\include\wx\memory.h
-copy /q include\wx\memtext.h %DEST%\include\wx\memtext.h
-copy /q include\wx\mimetype.h %DEST%\include\wx\mimetype.h
-copy /q include\wx\module.h %DEST%\include\wx\module.h
-copy /q include\wx\mstream.h %DEST%\include\wx\mstream.h
-copy /q include\wx\object.h %DEST%\include\wx\object.h
-copy /q include\wx\objstrm.h %DEST%\include\wx\objstrm.h
-copy /q include\wx\platform.h %DEST%\include\wx\platform.h
-copy /q include\wx\process.h %DEST%\include\wx\process.h
-copy /q include\wx\regex.h %DEST%\include\wx\regex.h
-copy /q include\wx\sckaddr.h %DEST%\include\wx\sckaddr.h
-copy /q include\wx\sckipc.h %DEST%\include\wx\sckipc.h
-copy /q include\wx\sckstrm.h %DEST%\include\wx\sckstrm.h
-copy /q include\wx\serbase.h %DEST%\include\wx\serbase.h
-copy /q include\wx\snglinst.h %DEST%\include\wx\snglinst.h
-copy /q include\wx\socket.h %DEST%\include\wx\socket.h
-copy /q include\wx\strconv.h %DEST%\include\wx\strconv.h
-copy /q include\wx\stream.h %DEST%\include\wx\stream.h
-copy /q include\wx\string.h %DEST%\include\wx\string.h
-copy /q include\wx\sysopt.h %DEST%\include\wx\sysopt.h
-copy /q include\wx\textbuf.h %DEST%\include\wx\textbuf.h
-copy /q include\wx\textfile.h %DEST%\include\wx\textfile.h
-copy /q include\wx\thread.h %DEST%\include\wx\thread.h
-copy /q include\wx\time.h %DEST%\include\wx\time.h
-copy /q include\wx\timer.h %DEST%\include\wx\timer.h
-copy /q include\wx\tokenzr.h %DEST%\include\wx\tokenzr.h
-copy /q include\wx\txtstrm.h %DEST%\include\wx\txtstrm.h
-copy /q include\wx\unzip.h %DEST%\include\wx\unzip.h
-copy /q include\wx\url.h %DEST%\include\wx\url.h
-copy /q include\wx\utils.h %DEST%\include\wx\utils.h
-copy /q include\wx\variant.h %DEST%\include\wx\variant.h
-copy /q include\wx\vector.h %DEST%\include\wx\vector.h
-copy /q include\wx\version.h %DEST%\include\wx\version.h
-copy /q include\wx\wfstream.h %DEST%\include\wx\wfstream.h
-copy /q include\wx\wx.h %DEST%\include\wx\wx.h
-copy /q include\wx\wxchar.h %DEST%\include\wx\wxchar.h
-copy /q include\wx\wxprec.h %DEST%\include\wx\wxprec.h
-copy /q include\wx\zipstrm.h %DEST%\include\wx\zipstrm.h
-copy /q include\wx\zstream.h %DEST%\include\wx\zstream.h
-copy /q include\wx\unix\gsockunx.h %DEST%\include\wx\unix\gsockunx.h
-copy /q include\wx\unix\mimetype.h %DEST%\include\wx\unix\mimetype.h
-copy /q include\wx\msw\dde.h %DEST%\include\wx\msw\dde.h
-copy /q include\wx\msw\mimetype.h %DEST%\include\wx\msw\mimetype.h
-copy /q include\wx\protocol\file.h %DEST%\include\wx\protocol\file.h
-copy /q include\wx\protocol\ftp.h %DEST%\include\wx\protocol\ftp.h
-copy /q include\wx\protocol\http.h %DEST%\include\wx\protocol\http.h
-copy /q include\wx\protocol\protocol.h %DEST%\include\wx\protocol\protocol.h
 
+rem The rest is generated from src/files.lst by pasting the ALL_SOURCES and
+rem ALL_HEADERS here and doing
+rem
+rem .,$s@^\s*\(.*\)/\([^ ]*\)\( \\\)\?$@copy /q src\\\1\\\2 %DEST%\\src\\\1\\\2
+rem
+rem and
+rem
+rem .,$s@/@\\@|exe "normal "|.,$s@^\s*\([^ ]*\)\( \\\)\?$@copy /q include\\wx\\\1 %DEST%\\include\\wx\\\1
+rem 
 copy /q src\common\init.cpp %DEST%\src\common\init.cpp
 copy /q src\common\appcmn.cpp %DEST%\src\common\appcmn.cpp
 copy /q src\common\clntdata.cpp %DEST%\src\common\clntdata.cpp
@@ -158,6 +89,7 @@ copy /q src\common\dbtable.cpp %DEST%\src\common\dbtable.cpp
 copy /q src\common\dircmn.cpp %DEST%\src\common\dircmn.cpp
 copy /q src\common\dynarray.cpp %DEST%\src\common\dynarray.cpp
 copy /q src\common\dynlib.cpp %DEST%\src\common\dynlib.cpp
+copy /q src\common\dynload.cpp %DEST%\src\common\dynload.cpp
 copy /q src\common\encconv.cpp %DEST%\src\common\encconv.cpp
 copy /q src\common\event.cpp %DEST%\src\common\event.cpp
 copy /q src\common\extended.c %DEST%\src\common\extended.c
@@ -173,6 +105,7 @@ copy /q src\common\fs_mem.cpp %DEST%\src\common\fs_mem.cpp
 copy /q src\common\fs_zip.cpp %DEST%\src\common\fs_zip.cpp
 copy /q src\common\ftp.cpp %DEST%\src\common\ftp.cpp
 copy /q src\common\hash.cpp %DEST%\src\common\hash.cpp
+copy /q src\common\hashmap.cpp %DEST%\src\common\hashmap.cpp
 copy /q src\common\http.cpp %DEST%\src\common\http.cpp
 copy /q src\common\intl.cpp %DEST%\src\common\intl.cpp
 copy /q src\common\ipcbase.cpp %DEST%\src\common\ipcbase.cpp
@@ -182,9 +115,9 @@ copy /q src\common\longlong.cpp %DEST%\src\common\longlong.cpp
 copy /q src\common\memory.cpp %DEST%\src\common\memory.cpp
 copy /q src\common\mimecmn.cpp %DEST%\src\common\mimecmn.cpp
 copy /q src\common\module.cpp %DEST%\src\common\module.cpp
+copy /q src\common\msgout.cpp %DEST%\src\common\msgout.cpp
 copy /q src\common\mstream.cpp %DEST%\src\common\mstream.cpp
 copy /q src\common\object.cpp %DEST%\src\common\object.cpp
-copy /q src\common\objstrm.cpp %DEST%\src\common\objstrm.cpp
 copy /q src\common\process.cpp %DEST%\src\common\process.cpp
 copy /q src\common\protocol.cpp %DEST%\src\common\protocol.cpp
 copy /q src\common\regex.cpp %DEST%\src\common\regex.cpp
@@ -192,7 +125,6 @@ copy /q src\common\sckaddr.cpp %DEST%\src\common\sckaddr.cpp
 copy /q src\common\sckfile.cpp %DEST%\src\common\sckfile.cpp
 copy /q src\common\sckipc.cpp %DEST%\src\common\sckipc.cpp
 copy /q src\common\sckstrm.cpp %DEST%\src\common\sckstrm.cpp
-copy /q src\common\serbase.cpp %DEST%\src\common\serbase.cpp
 copy /q src\common\socket.cpp %DEST%\src\common\socket.cpp
 copy /q src\common\strconv.cpp %DEST%\src\common\strconv.cpp
 copy /q src\common\stream.cpp %DEST%\src\common\stream.cpp
@@ -229,3 +161,103 @@ copy /q src\msw\snglinst.cpp %DEST%\src\msw\snglinst.cpp
 copy /q src\msw\thread.cpp %DEST%\src\msw\thread.cpp
 copy /q src\msw\utils.cpp %DEST%\src\msw\utils.cpp
 copy /q src\msw\utilsexc.cpp %DEST%\src\msw\utilsexc.cpp
+copy /q src\msw\volume.cpp %DEST%\src\msw\volume.cpp
+
+copy /q include\wx\app.h %DEST%\include\wx\app.h
+copy /q include\wx\arrimpl.cpp %DEST%\include\wx\arrimpl.cpp
+copy /q include\wx\buffer.h %DEST%\include\wx\buffer.h
+copy /q include\wx\build.h %DEST%\include\wx\build.h
+copy /q include\wx\chkconf.h %DEST%\include\wx\chkconf.h
+copy /q include\wx\clntdata.h %DEST%\include\wx\clntdata.h
+copy /q include\wx\cmdline.h %DEST%\include\wx\cmdline.h
+copy /q include\wx\confbase.h %DEST%\include\wx\confbase.h
+copy /q include\wx\config.h %DEST%\include\wx\config.h
+copy /q include\wx\date.h %DEST%\include\wx\date.h
+copy /q include\wx\datetime.h %DEST%\include\wx\datetime.h
+copy /q include\wx\datetime.inl %DEST%\include\wx\datetime.inl
+copy /q include\wx\datstrm.h %DEST%\include\wx\datstrm.h
+copy /q include\wx\db.h %DEST%\include\wx\db.h
+copy /q include\wx\dbtable.h %DEST%\include\wx\dbtable.h
+copy /q include\wx\dde.h %DEST%\include\wx\dde.h
+copy /q include\wx\debug.h %DEST%\include\wx\debug.h
+copy /q include\wx\defs.h %DEST%\include\wx\defs.h
+copy /q include\wx\dir.h %DEST%\include\wx\dir.h
+copy /q include\wx\dynarray.h %DEST%\include\wx\dynarray.h
+copy /q include\wx\dynlib.h %DEST%\include\wx\dynlib.h
+copy /q include\wx\dynload.h %DEST%\include\wx\dynload.h
+copy /q include\wx\encconv.h %DEST%\include\wx\encconv.h
+copy /q include\wx\event.h %DEST%\include\wx\event.h
+copy /q include\wx\features.h %DEST%\include\wx\features.h
+copy /q include\wx\ffile.h %DEST%\include\wx\ffile.h
+copy /q include\wx\file.h %DEST%\include\wx\file.h
+copy /q include\wx\fileconf.h %DEST%\include\wx\fileconf.h
+copy /q include\wx\filefn.h %DEST%\include\wx\filefn.h
+copy /q include\wx\filename.h %DEST%\include\wx\filename.h
+copy /q include\wx\filesys.h %DEST%\include\wx\filesys.h
+copy /q include\wx\fontenc.h %DEST%\include\wx\fontenc.h
+copy /q include\wx\fontmap.h %DEST%\include\wx\fontmap.h
+copy /q include\wx\fs_inet.h %DEST%\include\wx\fs_inet.h
+copy /q include\wx\fs_mem.h %DEST%\include\wx\fs_mem.h
+copy /q include\wx\fs_zip.h %DEST%\include\wx\fs_zip.h
+copy /q include\wx\gsocket.h %DEST%\include\wx\gsocket.h
+copy /q include\wx\hash.h %DEST%\include\wx\hash.h
+copy /q include\wx\hashmap.h %DEST%\include\wx\hashmap.h
+copy /q include\wx\intl.h %DEST%\include\wx\intl.h
+copy /q include\wx\ioswrap.h %DEST%\include\wx\ioswrap.h
+copy /q include\wx\ipc.h %DEST%\include\wx\ipc.h
+copy /q include\wx\ipcbase.h %DEST%\include\wx\ipcbase.h
+copy /q include\wx\isql.h %DEST%\include\wx\isql.h
+copy /q include\wx\isqlext.h %DEST%\include\wx\isqlext.h
+copy /q include\wx\list.h %DEST%\include\wx\list.h
+copy /q include\wx\listimpl.cpp %DEST%\include\wx\listimpl.cpp
+copy /q include\wx\log.h %DEST%\include\wx\log.h
+copy /q include\wx\longlong.h %DEST%\include\wx\longlong.h
+copy /q include\wx\memconf.h %DEST%\include\wx\memconf.h
+copy /q include\wx\memory.h %DEST%\include\wx\memory.h
+copy /q include\wx\memtext.h %DEST%\include\wx\memtext.h
+copy /q include\wx\mimetype.h %DEST%\include\wx\mimetype.h
+copy /q include\wx\module.h %DEST%\include\wx\module.h
+copy /q include\wx\msgout.h %DEST%\include\wx\msgout.h
+copy /q include\wx\mstream.h %DEST%\include\wx\mstream.h
+copy /q include\wx\object.h %DEST%\include\wx\object.h
+copy /q include\wx\platform.h %DEST%\include\wx\platform.h
+copy /q include\wx\process.h %DEST%\include\wx\process.h
+copy /q include\wx\regex.h %DEST%\include\wx\regex.h
+copy /q include\wx\sckaddr.h %DEST%\include\wx\sckaddr.h
+copy /q include\wx\sckipc.h %DEST%\include\wx\sckipc.h
+copy /q include\wx\sckstrm.h %DEST%\include\wx\sckstrm.h
+copy /q include\wx\snglinst.h %DEST%\include\wx\snglinst.h
+copy /q include\wx\socket.h %DEST%\include\wx\socket.h
+copy /q include\wx\strconv.h %DEST%\include\wx\strconv.h
+copy /q include\wx\stream.h %DEST%\include\wx\stream.h
+copy /q include\wx\string.h %DEST%\include\wx\string.h
+copy /q include\wx\sysopt.h %DEST%\include\wx\sysopt.h
+copy /q include\wx\textbuf.h %DEST%\include\wx\textbuf.h
+copy /q include\wx\textfile.h %DEST%\include\wx\textfile.h
+copy /q include\wx\thread.h %DEST%\include\wx\thread.h
+copy /q include\wx\thrimpl.cpp %DEST%\include\wx\thrimpl.cpp
+copy /q include\wx\time.h %DEST%\include\wx\time.h
+copy /q include\wx\timer.h %DEST%\include\wx\timer.h
+copy /q include\wx\tokenzr.h %DEST%\include\wx\tokenzr.h
+copy /q include\wx\txtstrm.h %DEST%\include\wx\txtstrm.h
+copy /q include\wx\url.h %DEST%\include\wx\url.h
+copy /q include\wx\utils.h %DEST%\include\wx\utils.h
+copy /q include\wx\variant.h %DEST%\include\wx\variant.h
+copy /q include\wx\vector.h %DEST%\include\wx\vector.h
+copy /q include\wx\version.h %DEST%\include\wx\version.h
+copy /q include\wx\volume.h %DEST%\include\wx\volume.h
+copy /q include\wx\wfstream.h %DEST%\include\wx\wfstream.h
+copy /q include\wx\wx.h %DEST%\include\wx\wx.h
+copy /q include\wx\wxchar.h %DEST%\include\wx\wxchar.h
+copy /q include\wx\wxprec.h %DEST%\include\wx\wxprec.h
+copy /q include\wx\zipstrm.h %DEST%\include\wx\zipstrm.h
+copy /q include\wx\zstream.h %DEST%\include\wx\zstream.h
+copy /q include\wx\unix\gsockunx.h %DEST%\include\wx\unix\gsockunx.h
+copy /q include\wx\unix\mimetype.h %DEST%\include\wx\unix\mimetype.h
+copy /q include\wx\msw\dde.h %DEST%\include\wx\msw\dde.h
+copy /q include\wx\msw\mimetype.h %DEST%\include\wx\msw\mimetype.h
+copy /q include\wx\msw\winundef.h %DEST%\include\wx\msw\winundef.h
+copy /q include\wx\protocol\file.h %DEST%\include\wx\protocol\file.h
+copy /q include\wx\protocol\ftp.h %DEST%\include\wx\protocol\ftp.h
+copy /q include\wx\protocol\http.h %DEST%\include\wx\protocol\http.h
+copy /q include\wx\protocol\protocol.h %DEST%\include\wx\protocol\protocol.h

distrib/msw/tarwxx11

@@ -0,0 +1,85 @@
+#!/bin/sh
+# tarwxall: make up a tar.gz distribution of wxX11
+# Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
+
+# We can't use e.g. this:
+# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
+# because there's not enough space on the command line, plus we need to ignore the
+# blank lines.
+
+TAR=tar
+ARCH=`arch`
+if [ "$ARCH" = "ppc" ]; then
+  TAR=gnutar
+fi
+
+expandlines()
+{
+    toexpand=$1
+    outputfile=$2
+
+    rm -f $outputfile
+    touch $outputfile
+    for line in `cat $toexpand` ; do
+      if [ "$line" != "" ]; then
+        ls $line >> $outputfile
+      fi
+    uniq < $outputfile > /tmp/uniqtemp.txt
+    mv /tmp/uniqtemp.txt $outputfile
+    done
+}
+
+
+init=""
+if [ "$1" = "" ]
+then
+  echo Usage: tarwxx11 wx-dir output-dir version
+  exit
+fi
+
+if [ "$2" = "" ]
+then
+  echo Usage: tarwxx11 wx-dir output-dir version
+  exit
+fi
+
+if [ "$3" = "" ]
+then
+  echo Usage: tarwxx11 wx-dir output-dir version
+  exit
+fi
+
+WXVER=$3
+
+echo About to archive wxAll:
+echo   From   $1
+echo   To     $2
+echo CTRL-C if this is not correct.
+read dummy
+
+cd $1
+
+echo Removing backup files...
+rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
+
+rm -f $2/wxX11-${WXVER}*.tar.gz
+rm -f $2/wxWindows-${WXVER}
+
+### wxX11: combined wxMotif and wxX11 distributions
+cd $1
+cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/univ.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxx11_in.txt
+expandlines /tmp/wxx11_in.txt /tmp/wxx11.txt
+$TAR cf $2/wxX11-${WXVER}.tar -T /tmp/wxx11.txt
+
+echo Re-tarring wxX11 in a subdirectory...
+cd $2
+mkdir wxWindows-${WXVER}
+cd wxWindows-${WXVER}
+$TAR xf ../wxX11-${WXVER}.tar
+cd ..
+rm -f wxX11-${WXVER}.tar
+$TAR cf $2/wxX11-${WXVER}.tar wxWindows-${WXVER}/*
+rm -f -r wxWindows-${WXVER}
+gzip $2/wxX11-${WXVER}.tar
+
+

distrib/msw/tmake/b32base.t

@@ -85,8 +85,8 @@ wxUSE_GUI=0
 !include $(WXDIR)\src\makeb32.env
 
 PERIPH_LIBS=
-PERIPH_TARGET=zlib png jpeg tiff regex $(PERIPH_TARGET)
+PERIPH_TARGET=zlib regex $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PERIPH_CLEAN_TARGET)
+PERIPH_CLEAN_TARGET=clean_zlib clean_regex $(PERIPH_CLEAN_TARGET)
 
 !if "$(DLL)" == "0"
 DUMMY=dummy
@@ -106,7 +106,6 @@ MSWDIR=.
 DOCDIR = $(WXDIR)\docs
 
 COMMONOBJS = \
-    $(MSWDIR)\y_tab.obj \
     #$ ExpandList("WXCOMMONOBJS");
 
 MSWOBJS = #$ ExpandList("WXMSWOBJS");
@@ -164,19 +163,6 @@ dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\includ
 version.res:
     brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc
 
-$(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
-
-#        cl @<<
-# $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
-# <<
-
-$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
-        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
-
-$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
-    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
-
-
 #${
     $_ = $project{"WXMSWOBJS"};
     my @objs = split;
@@ -305,8 +291,6 @@ clean: $(PERIPH_CLEAN_TARGET)
     -erase *.pch
     -erase *.csm
     -erase "wx32.#??"
-    -erase ..\common\y_tab.c
-    -erase ..\common\lex_yy.c
 
 cleanall: clean
 

distrib/msw/tmake/g95.t

@@ -343,9 +343,12 @@ $(ARCHINCDIR)/wx:
 	mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR))
 	mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
 
-$(SETUP_H): $(ARCHINCDIR)/wx
+# Copy ALWAYS uses forward slashes now.
-	$(COPY) $(WXDIR)/include/wx/msw/setup.h $@
 
+$(SETUP_H): $(ARCHINCDIR)/wx
+	$(COPY) $(WXDIR)/include/wx/msw/setup.h $(subst $(BACKSLASH),/,$@)
+
+#	$(COPY) $(WXDIR)/include/wx/msw/setup.h $@
 #	$(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
 
 ifndef WXMAKINGDLL

distrib/msw/tmake/vc6app.t

@@ -49,7 +49,7 @@
     } else {
 	$project{"VC_PROJ_TYPE"} = 'Win32 (x86) Console Application';
 	$project{"VC_PROJ_CODE"} = '0x0103';
-	$vc_base_libs = 'kernel32.lib user32.lib advapi32.lib ';
+	$vc_base_libs = 'kernel32.lib user32.lib advapi32.lib shell32.lib ';
 	if ( Config("wx") ) {
 	    $vc_base_libs .= 'wsock32.lib ';
 	}

docs/changes.txt

@@ -170,6 +170,14 @@ wxThread and related classes:
 OTHER CHANGES
 =============
 
+2.4.0
+-----
+
+Unix (Base/GUI):
+
+- minor OpenBSD compilation/linking fixes, now builds OOB under OpenBSD 3.1
+- don't include -I/usr/include nor -I/usr/local/include in wx-config output
+
 2.3.3
 -----
 

docs/latex/wx/dragimag.tex

@@ -28,6 +28,14 @@ override \helpref{wxDragImage::DoDrawImage}{wxdragimagedodrawimage} and
 
 Please see {\tt samples/dragimag} for an example.
 
+%\wxheading{Notes}
+%
+%Using the native Windows implementation, you must supply an image with a mask, or
+%the image will not show when dragged. It is not clear if this is a bug
+%in Windows or in the wxDragImage implementation. You can add a mask
+%with a call to wxImage::SetMaskColour, passing RGB values not likely
+%to be in the image. [CURED by creating the ImageList with ILC_MASK]
+
 \wxheading{Derived from}
 
 \helpref{wxObject}{wxobject}

docs/latex/wx/filedlg.tex

@@ -164,7 +164,7 @@ Sets the default filename.
 
 \func{void}{SetFilterIndex}{\param{int }{filterIndex}}
 
-Sets the default filter index, starting from zero. Windows only.
+Sets the default filter index, starting from zero.
 
 \membersection{wxFileDialog::SetMessage}\label{wxfiledialogsetmessage}
 

docs/latex/wx/listctrl.tex

@@ -14,7 +14,12 @@ without consuming much memory. To use virtual list control you must use
 \helpref{OnGetItemText}{wxlistctrlongetitemtext} (and optionally 
 \helpref{OnGetItemImage}{wxlistctrlongetitemimage} and 
 \helpref{OnGetItemAttr}{wxlistctrlongetitemattr}) to return the information
-about the items when the control requests it.
+about the items when the control requests it. Virtual list control can be used
+as a normal one except that no operations which can take time proportional to
+the number of items in the control happen -- this is required to allow having a
+practically infinite number of items. For example, in a multiple selection
+virtual list control, the selections won't be sent when many items are selected
+at once because this could mean iterating over all the items.
 
 Using many of wxListCtrl features is shown in the
 \helpref{corresponding sample}{samplelistctrl}.

docs/latex/wx/tstring.tex

@@ -9,8 +9,8 @@ wxString is a class which represents a character string of arbitrary length (lim
 arbitrary characters. The ASCII NUL character is allowed, although care should be
 taken when passing strings containing it to other functions.
 
-wxString works with both ASCII (8 bit characters) as well as UNICODE (16 but
+wxString works with both ASCII (traditional, 7 or 8 bit, characters) as well as
-characters) strings.
+Unicode (wide characters) strings.
 
 This class has all the standard operations you can expect to find in a string class:
 dynamic memory management (string extends to accommodate new characters),
@@ -48,9 +48,10 @@ very useful but don't exist in most of other string classes: for example,
 \helpref{BeforeLast}{wxstringbeforelast}, \helpref{operator<<}{wxstringoperatorout} 
 or \helpref{Printf}{wxstringprintf}. Of course, all the standard string
 operations are supported as well.
-\item {\bf UNICODE} In this release, wxString only supports {\it construction} from
+\item {\bf Unicode} wxString is Unicode friendly: it allows to easily convert
-a UNICODE string, but in the next one it will be capable of also storing its
+to and from ANSI and Unicode strings in any build mode (see the 
-internal data in either ASCII or UNICODE format.
+\helpref{Unicode overview}{unicode} for more details) and maps to either
+{\tt string} or {\tt wstring} transparently depending on the current mode.
 \item {\bf Used by wxWindows} And, of course, this class is used everywhere
 inside wxWindows so there is no performance loss which would result from
 conversions of objects of any other string class (including std::string) to

docs/latex/wx/wizard.tex

@@ -134,9 +134,9 @@ also \helpref{GetBitmap}{wxwizardpagegetbitmap}.}
 \docparam{pos}{The position of the dialog, it will be centered on the screen
 by default.}
 
-\membersection{wxWizard::Fit}\label{wxwizardfit}
+\membersection{wxWizard::FitToPage}\label{wxwizardfittopage}
 
-\func{void}{Fit}{\param{const wxWizardPage* }{firstPage}}
+\func{void}{FittoPage}{\param{const wxWizardPage* }{firstPage}}
 
 Sets the page size to be big enough for all the pages accessible via the
 given {\it firstPage}, i.e. this page, its next page and so on.

docs/publicity/publicity.txt

@@ -32,7 +32,7 @@ comp.windows.x.motif
 News and links sites:
 -----------------------
 
-slashdot.org, freshmeat.net
+slashdot.org, freshmeat.net, http://lwn.net/
 
 Many of these links will be out of date now:
 

docs/tech/tn0010.htm

@@ -24,7 +24,7 @@ Compiling wxWindows applications in the VC++ IDE
 <P>
 
 <CENTER>
-<a href="#wxwin2">Settings for wxWindows 2</a> / <a href="#wxwin1">Settings for wxWindows 1.68</a>
+<a href="#wxwin2">Settings for wxWindows 2.2</a> / <a href="#wxwin1">Settings for wxWindows 1.68</a>
 </CENTER>
 
 <P>
@@ -44,9 +44,10 @@ installation path.
 
 <P>
 
-<H2><a name="wxwin2">Settings for wxWindows 2</a></H2>
+<H2><a name="wxwin2">Settings for wxWindows 2.2</a></H2>
 
-These settings apply to wxWindows 2.1.14 and above.<P>
+These settings apply to wxWindows 2.1.14 and above but most of them are not
+necessary any longer for wxWindows 2.3+.<P>
 
 <DL>
 <DT><B>General</B><DD>
@@ -206,77 +207,6 @@ Select your .rc file. The <B>Additional resource include directories</B> field s
 
 </DL>
 
-<P>
-
-<!--
-<PRE>
-From: "Chris Breeze" <chris@hel.co.uk>
-To: <wxwin-users@wx.dent.med.uni-muenchen.de>
-Subject: Re: Compiling 2.0 wxWin Apps in the VC IDE
-Date: Wed, 20 May 1998 14:18:02 +0100
-
-First the apology: the description below is for wx1.68
-not for wx2.0 - sorry if I confused everybody.
-
-Anyway, third time lucky I hope! The settings for
-VC++ 5.0, wx2.0 beta 8, NT Workstation 4.0 sp3
-are:
-
-In project / settings / C/C++:
-Add "__WINDOWS__" to the pre-processor definitions
-Add "{wx}\include" to the additional include directories
-where {wx} is the directory in which wx is installed
-
-In project / settings / Resources:
-add "{wx}\include" to the additional resource include directories
-
-In project / settings / Link:
-Add "wx.lib comctl32.lib dummy.obj" to the Object/Library modules
-
-Add "libcd.lib,libcid.lib" to ignore libraries (under the "input" category)
-
-Add "{wx}\lib,{wx}\src\msw" to the additional library path
-
-I have tested these settings on samples/minimal and can
-build exes which can be debugged using Developer Studio.
-
-I hope I've finally answered the original question. (Next time
-I'll read the question more carefully!).
-
-Regards,
-Chris
-
-Original message (settings for wx1.68c):
-) Try the following (tested with VC++ 5 on NT4):
-) 
-) Create a new Win32 Application project and insert the source files
-) (including .rc files).
-) 
-) In project / settings / C/C++:
-) Add wx_msw to the pre-processor definitions
-) add {wx}\include\base,{wx}\include\msw to the additional include
-directories
-) where {wx} is the directory in which wx is installed
-) 
-) In project / settings / Resources:
-) add {wx}\include\msw;{wx}\contrib\fafa to the additional resource include
-) directories
-) 
-) In project / settings / Link:
-) Add comctl32.lib wx.lib dummy.obj ctl3d32.lib to the Object/Library modules
-) 
-) Add libc to ignore libraries (under the "input" category)
-) 
-) Add {wx}\lib,{wx}\src\msw to the additional library path
-) 
-) These settings are for a debug build. You can use the same settings for
-) a release build apart from ignoring libc.
-
-</PRE>
--->
-
-</font>
-
 </BODY>
 
 </HTML>

include/wx/arrimpl.cpp

@@ -75,6 +75,8 @@ void name::RemoveAt(size_t uiIndex, size_t nRemove)                           \
                                                                               \
 void name::Add(const T& item, size_t nInsert)                                 \
 {                                                                             \
+  if (nInsert == 0)                                                           \
+    return;                                                                   \
   T* pItem = new T(item);                                                     \
   size_t nOldSize = GetCount();                                               \
   if ( pItem != NULL )                                                        \
@@ -85,6 +87,8 @@ void name::Add(const T& item, size_t nInsert)                                 \
                                                                               \
 void name::Insert(const T& item, size_t uiIndex, size_t nInsert)              \
 {                                                                             \
+  if (nInsert == 0)                                                           \
+    return;                                                                   \
   T* pItem = new T(item);                                                     \
   if ( pItem != NULL )                                                        \
     wxBaseArrayPtrVoid::Insert(pItem, uiIndex, nInsert);                      \

include/wx/db.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        db.h
+// Name:        wx/db.h
 // Purpose:     Header file wxDb class.  The wxDb class represents a connection
 //              to an ODBC data source.  The wxDb class allows operations on the data
 //              source such as opening and closing the data source.
@@ -32,13 +32,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-/*
+#ifndef _WX_DB_H_
-// SYNOPSIS START
+#define _WX_DB_H_
-// SYNOPSIS STOP
-*/
-
-#ifndef DB_DOT_H
-#define DB_DOT_H
 
 
 // BJO 20000503: introduce new GetColumns members which are more database independant and 
@@ -58,36 +53,40 @@
 #include "wx/string.h"
 
 #ifdef __VISUALC__
-// include standard Windows headers
+    // we need to include standard Windows headers but we can't include
-#if defined(__WXMSW__) && !wxUSE_MFC
+    // <windows.h> directly when using MFC because it includes it itself in a
-    #ifndef STRICT
+    // different manner
-        #define STRICT 1
+    #if wxUSE_MFC
-    #endif
+        #include <afxwin.h>
+    #else // !wxUSE_MFC
+        #ifndef STRICT
+            #define STRICT 1
+        #endif
 
-    #include <windows.h>
+        #include <windows.h>
-    #include "wx/msw/winundef.h"
+        #include "wx/msw/winundef.h"
-#endif
+    #endif // wxUSE_MFC/!wxUSE_MFC
 
-// If you use the wxDbCreateDataSource() function with MSW/VC6,
+    // If you use the wxDbCreateDataSource() function with MSW/VC6,
-// you cannot use the iODBC headers, you must use the VC headers,
+    // you cannot use the iODBC headers, you must use the VC headers,
-// plus the odbcinst.h header - gt Nov 2 2000
+    // plus the odbcinst.h header - gt Nov 2 2000
-//
+    //
-//  Must add "odbccp32.lib" in \wx2\wxWindows\src\makevc.env to the WINLIBS= line
+    // Must add "odbccp32.lib" in \wx2\wxWindows\src\makevc.env to the WINLIBS= line
-//
+    //
     #include "sql.h"
     #include "sqlext.h"
     #include "odbcinst.h"
 #elif defined( __VMS )
-// For OpenVMS use the ones from the library
+    // For OpenVMS use the ones from the library
-extern "C" {
+    extern "C" {
-    #include <isql.h>
+        #include <isql.h>
-    #include <isqlext.h>
+        #include <isqlext.h>
-}
+    }
-#else
+#else // !__VISUALC__, !__VMS
-extern "C" {
+    extern "C" {
-    #include "wx/isql.h"
+        #include "wx/isql.h"
-    #include "wx/isqlext.h"
+        #include "wx/isqlext.h"
-}
+    }
 #endif
 
 
@@ -772,10 +771,11 @@ bool  WXDLLEXPORT  FreeDbConnection(wxDB *pDb);
 void  WXDLLEXPORT  CloseDbConnections(void);
 int   WXDLLEXPORT  NumberDbConnectionsInUse(void);
 
-bool SqlLog(sqlLog state, const char *filename = SQL_LOG_FILENAME);
+bool SqlLog(sqlLog state, const wxChar *filename = SQL_LOG_FILENAME);
 
 bool WXDLLEXPORT GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax,
                                UWORD direction = SQL_FETCH_NEXT);
 #endif  // Deprecated structures/classes/functions
 
-#endif
+#endif // _WX_DB_H_
+

include/wx/generic/filedlgg.h

@@ -89,13 +89,16 @@ public:
     void OnHome( wxCommandEvent &event );
     void OnListOk( wxCommandEvent &event );
     void OnNew( wxCommandEvent &event );
-    void OnChoice( wxCommandEvent &event );
+    void OnChoiceFilter( wxCommandEvent &event );
     void OnTextEnter( wxCommandEvent &event );
     void OnCheck( wxCommandEvent &event );
 
     void HandleAction( const wxString &fn );
 
 protected:
+    // use the filter with the given index
+    void DoSetFilterIndex(int filterindex);
+
     wxString       m_message;
     long           m_dialogStyle;
     wxString       m_dir;

include/wx/generic/mdig.h

@@ -63,7 +63,7 @@ public:
 
 #if wxUSE_MENUS
     wxMenu* GetWindowMenu() const { return m_pWindowMenu; };
-    void SetWindowMenu(wxMenu* pMenu);    
+    void SetWindowMenu(wxMenu* pMenu);
 
     virtual void SetMenuBar(wxMenuBar *pMenuBar);
 #endif // wxUSE_MENUS
@@ -134,13 +134,13 @@ public:
                  long style = wxDEFAULT_FRAME_STYLE,
                  const wxString& name = wxFrameNameStr );
 
-#if wxUSE_MENUS      
+#if wxUSE_MENUS
     virtual void SetMenuBar( wxMenuBar *menu_bar );
     virtual wxMenuBar *GetMenuBar() const;
-#endif // wxUSE_MENUS  
+#endif // wxUSE_MENUS
 
     virtual void SetTitle(const wxString& title);
-    virtual wxString GetTitle();
+    virtual wxString GetTitle() const;
 
     virtual void Activate();
 
@@ -187,8 +187,8 @@ public:
     virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return FALSE; }
     virtual bool IsFullScreen() const { return FALSE; }
 
-    virtual bool IsTopLevel() const { return FALSE; }    
+    virtual bool IsTopLevel() const { return FALSE; }
-    
+
     void OnMenuHighlight(wxMenuEvent& event);
     void OnActivate(wxActivateEvent& event);
 
@@ -206,7 +206,7 @@ protected:
 
 #if wxUSE_MENUS
     wxMenuBar        *m_pMenuBar;
-#endif // wxUSE_MENUS  
+#endif // wxUSE_MENUS
 
 protected:
     void Init();
@@ -214,7 +214,7 @@ protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     // This function needs to be called when a size change is confirmed,
-    // we needed this function to prevent any body from the outside 
+    // we needed this function to prevent any body from the outside
     // changing the panel... it messes the UI layout when we would allow it.
     void ApplyMDIChildFrameRect();
 
@@ -256,7 +256,7 @@ private:
  */
 
 #ifndef wxUSE_GENERIC_MDI_AS_NATIVE
-#if defined(__WXUNIVERSAL__)
+#if defined(__WXUNIVERSAL__) || defined(__WXPM__)
 #define wxUSE_GENERIC_MDI_AS_NATIVE   1
 #else
 #define wxUSE_GENERIC_MDI_AS_NATIVE   0

include/wx/generic/panelg.h

@@ -82,8 +82,8 @@ public:
     virtual void InitDialog();
 
 #ifdef __WXUNIVERSAL__
-    virtual bool IsCanvasWindow() { return TRUE; }
+    virtual bool IsCanvasWindow() const { return TRUE; }
-    virtual bool ProvidesBackground() { return TRUE; }
+    virtual bool ProvidesBackground() const { return TRUE; }
 #endif
 
     WX_DECLARE_CONTROL_CONTAINER();

include/wx/generic/sashwin.h

@@ -144,6 +144,11 @@ public:
     // Adjusts the panes
     void OnSize(wxSizeEvent& event);
 
+#ifdef __WXMSW__
+    // Handle cursor correctly
+    void OnSetCursor(wxSetCursorEvent& event);
+#endif // wxMSW
+
     // Draws borders
     void DrawBorders(wxDC& dc);
 
@@ -189,6 +194,7 @@ private:
     wxColour    m_hilightColour;
     wxColour    m_faceColour;
     bool        m_mouseCaptured;
+    wxCursor*   m_currentCursor;
 
 DECLARE_EVENT_TABLE()
 };

include/wx/gtk/region.h

@@ -146,11 +146,11 @@ public:
     void Reset() { m_current = 0u; }
     void Reset(const wxRegion& region);
 
-    operator bool () const;
     bool HaveRects() const;
+    operator bool () const { return HaveRects(); }
 
-    void operator ++ ();
+    wxRegionIterator& operator ++ ();
-    void operator ++ (int);
+    wxRegionIterator operator ++ (int);
 
     wxCoord GetX() const;
     wxCoord GetY() const;

include/wx/gtk1/region.h

@@ -146,11 +146,11 @@ public:
     void Reset() { m_current = 0u; }
     void Reset(const wxRegion& region);
 
-    operator bool () const;
     bool HaveRects() const;
+    operator bool () const { return HaveRects(); }
 
-    void operator ++ ();
+    wxRegionIterator& operator ++ ();
-    void operator ++ (int);
+    wxRegionIterator operator ++ (int);
 
     wxCoord GetX() const;
     wxCoord GetY() const;

include/wx/html/helpfrm.h

@@ -33,7 +33,9 @@
 #include "wx/stattext.h"
 #include "wx/html/htmlwin.h"
 #include "wx/html/htmprint.h"
+
 class WXDLLEXPORT wxButton;
+class WXDLLEXPORT wxTextCtrl;
 
 
 // style flags for the Help Frame

include/wx/list.h

@@ -193,7 +193,7 @@ private:
 
 class WXDLLEXPORT wxListBase : public wxObject
 {
-friend class wxNodeBase;        // should be able to call DetachNode()
+friend class WXDLLEXPORT wxNodeBase; // should be able to call DetachNode()
 friend class wxHashTableBase;   // should be able to call untyped Find()
 private:
         // common part of all ctors

include/wx/mac/app.h

@@ -109,6 +109,8 @@ public:
     static bool           s_macDefaultEncodingIsPC ;
     static bool           s_macSupportPCMenuShortcuts ;
     static long           s_macAboutMenuItemId ;
+    static long           s_macPreferencesMenuItemId ;
+    static long           s_macExitMenuItemId ;
     static wxString       s_macHelpMenuTitleName ;
 
     static bool           s_macHasAppearance ;

include/wx/mac/menu.h

@@ -63,7 +63,6 @@ public:
     // implementation only from now on
     // -------------------------------
 
-  	bool MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId, int macMenuItemNum) ;
   	int	MacGetIndexFromId( int id ) ; 
   	int	MacGetIndexFromItem( wxMenuItem *pItem ) ; 
   	void MacEnableMenu( bool bDoEnable ) ;
@@ -176,7 +175,6 @@ public:
     void Refresh(bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL);
 
   void MacInstallMenuBar() ;
-  void MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId, int macMenuItemNum) ;
   static wxMenuBar* MacGetInstalledMenuBar() { return s_macInstalledMenuBar ; }
 
 protected:

include/wx/mac/private.h

@@ -129,7 +129,7 @@ PicHandle 	    wxMacCreatePict( GWorldPtr gw , GWorldPtr mask = NULL ) ;
 CIconHandle     wxMacCreateCIcon(GWorldPtr image , GWorldPtr mask , short dstDepth , short iconSize  ) ;
 void 		        wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green ,  int blue ) ;
 CTabHandle 	    wxMacCreateColorTable( int numColors ) ;
-void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , bool forceColorIcon = false ) ;
+void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType = 0 ) ;
 
 #define MAC_WXCOLORREF(a) (*((RGBColor*)&(a)))
 #define MAC_WXHBITMAP(a) (GWorldPtr(a))

include/wx/mac/textctrl.h

@@ -152,7 +152,8 @@ public:
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
    	virtual bool MacCanFocus() const { return true ; }
-    
+    virtual bool MacSetupCursor( const wxPoint& pt ) ;
+
     virtual void 	 MacSuperShown( bool show ) ;
     virtual bool	 Show(bool show = TRUE) ;
 

include/wx/mac/window.h

@@ -242,7 +242,7 @@ public:
     virtual void         Update() ;
     // for compatibility
     void                 MacUpdateImmediately() { Update() ; }
-    bool                 MacSetupCursor( const wxPoint& pt ) ;
+    virtual bool         MacSetupCursor( const wxPoint& pt ) ;
         
 //    virtual bool         MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* rootwin )  ;
 //    virtual void         MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) ;

include/wx/motif/statbox.h

@@ -55,20 +55,11 @@ public:
     
     // Implementation
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
-    WXWidget GetTopWidget() const { return m_formWidget; }
-    WXWidget GetLabelWidget() const { return m_labelWidget; }
     
 protected:
     // Motif-specific
-    WXWidget  m_formWidget;
     WXWidget  m_labelWidget;
-    
+   
-    virtual void DoSetSize(int x, int y,
-        int width, int height,
-        int sizeFlags = wxSIZE_AUTO);
-    
 private:
     DECLARE_EVENT_TABLE()
 };

include/wx/msw/brush.h

@@ -50,8 +50,8 @@ public:
 
     bool Ok() const { return m_refData != NULL; }
 
-    // create (if necessary) and return the HBRUSH for this brush
+    // return the HBRUSH for this brush
-    WXHBRUSH GetResourceHandle() const;
+    virtual WXHANDLE GetResourceHandle() const;
 
 protected:
     virtual wxObjectRefData *CreateRefData() const;

include/wx/msw/checkbox.h

@@ -17,31 +17,37 @@
 #endif
 
 // Checkbox item (single checkbox)
-class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
 {
 public:
     wxCheckBox() { }
-    wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label,
+    wxCheckBox(wxWindow *parent,
-            const wxPoint& pos = wxDefaultPosition,
+               wxWindowID id,
-            const wxSize& size = wxDefaultSize, long style = 0,
+               const wxString& label,
-            const wxValidator& validator = wxDefaultValidator,
+               const wxPoint& pos = wxDefaultPosition,
-            const wxString& name = wxCheckBoxNameStr)
+               const wxSize& size = wxDefaultSize,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString& name = wxCheckBoxNameStr)
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
 
-    bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
+    bool Create(wxWindow *parent,
-            const wxPoint& pos = wxDefaultPosition,
+                wxWindowID id,
-            const wxSize& size = wxDefaultSize, long style = 0,
+                const wxString& label,
-            const wxValidator& validator = wxDefaultValidator,
+                const wxPoint& pos = wxDefaultPosition,
-            const wxString& name = wxCheckBoxNameStr);
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxCheckBoxNameStr);
 
     virtual void SetValue(bool value);
-    virtual bool GetValue() const ;
+    virtual bool GetValue() const;
+
+    virtual void SetLabel(const wxString& label);
 
     virtual bool MSWCommand(WXUINT param, WXWORD id);
-    virtual void SetLabel(const wxString& label);
     virtual void Command(wxCommandEvent& event);
 
 protected:
@@ -51,32 +57,5 @@ private:
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
-class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
-{
-DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox)
-
-public:
-    int checkWidth ;
-    int checkHeight ;
-
-    wxBitmapCheckBox() { checkWidth = -1; checkHeight = -1; }
-    wxBitmapCheckBox(wxWindow *parent, wxWindowID id, const wxBitmap *label,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxCheckBoxNameStr)
-    {
-        Create(parent, id, label, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id, const wxBitmap *bitmap,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxCheckBoxNameStr);
-
-    virtual void SetLabel(const wxBitmap& bitmap);
-};
-
 #endif
     // _WX_CHECKBOX_H_

include/wx/msw/checklst.h

@@ -64,7 +64,7 @@ public:
 protected:
   // we create our items ourselves and they have non-standard size,
   // so we need to override these functions
-  virtual wxOwnerDrawn *CreateItem(size_t n);
+  virtual wxOwnerDrawn *CreateLboxItem(size_t n);
   virtual bool          MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
 
   // this can't be called DoHitTest() because wxWindow already has this method

include/wx/msw/dialog.h

@@ -20,6 +20,8 @@
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 
+class WXDLLEXPORT wxWindowDisabler;
+
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase
 {
@@ -115,7 +117,7 @@ private:
 
     // while we are showing a modal dialog we disable the other windows using
     // this object
-    class wxWindowDisabler *m_windowDisabler;
+    wxWindowDisabler *m_windowDisabler;
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
     DECLARE_EVENT_TABLE()

include/wx/msw/font.h

@@ -90,11 +90,10 @@ public:
 
     virtual bool IsFree() const;
     virtual bool RealizeResource();
-    virtual WXHANDLE GetResourceHandle();
+    virtual WXHANDLE GetResourceHandle() const;
     virtual bool FreeResource(bool force = FALSE);
 
-    // for consistency with other wxMSW classes and to have a const
+    // for consistency with other wxMSW classes
-    // GetResourceHandle()-like function we have a synonym for it
     WXHFONT GetHFONT() const;
 
     /*

include/wx/msw/gdiimage.h

@@ -180,7 +180,7 @@ public:
 
     // forward some of base class virtuals to wxGDIImageRefData
     bool FreeResource(bool force = FALSE);
-    virtual WXHANDLE GetResourceHandle();
+    virtual WXHANDLE GetResourceHandle() const;
 
 protected:
     // create the data for the derived class here

include/wx/msw/gdiobj.h

@@ -49,7 +49,7 @@ public:
     bool IsNull() const { return (m_refData == 0); }
 
     // Returns handle.
-    virtual WXHANDLE GetResourceHandle() { return 0; }
+    virtual WXHANDLE GetResourceHandle() const { return 0; }
 
     virtual bool GetVisible() { return m_visible; }
     virtual void SetVisible(bool v) { m_visible = v; }

include/wx/msw/listbox.h

@@ -95,7 +95,7 @@ public:
     bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
 
     // plug-in for derived classes
-    virtual wxOwnerDrawn *CreateItem(size_t n);
+    virtual wxOwnerDrawn *CreateLboxItem(size_t n);
 
     // allows to get the item and use SetXXX functions to set it's appearance
     wxOwnerDrawn *GetItem(size_t n) const { return m_aItems[n]; }

include/wx/msw/pen.h

@@ -89,7 +89,7 @@ public:
   // Internal
   bool RealizeResource();
   bool FreeResource(bool force = FALSE);
-  WXHANDLE GetResourceHandle() ;
+  WXHANDLE GetResourceHandle() const;
   bool IsFree() const;
   void Unshare();
 };

include/wx/msw/region.h

@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
+// Copyright:   (c) 1997-2002 wxWindows team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -13,10 +13,9 @@
 #define _WX_REGION_H_
 
 #ifdef __GNUG__
-#pragma interface "region.h"
+    #pragma interface "region.h"
 #endif
 
-#include "wx/list.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 
@@ -93,11 +92,11 @@ public:
 
     // Outer bounds of region
     void GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const;
-    wxRect GetBox(void) const ;
+    wxRect GetBox() const ;
 
     // Is region empty?
-    bool Empty(void) const;
+    bool Empty() const;
-    inline bool IsEmpty(void) const { return Empty(); }
+    inline bool IsEmpty() const { return Empty(); }
 
     // Tests
     // Does the region contain the point (x,y)?
@@ -129,31 +128,39 @@ protected:
 class WXDLLEXPORT wxRegionIterator : public wxObject
 {
 public:
-    wxRegionIterator(void);
+    wxRegionIterator() { Init(); }
     wxRegionIterator(const wxRegion& region);
-    ~wxRegionIterator(void);
+    wxRegionIterator(const wxRegionIterator& ri) { Init(); *this = ri; }
 
-    void Reset(void) { m_current = 0; }
+    wxRegionIterator& operator=(const wxRegionIterator& ri);
+
+    virtual ~wxRegionIterator();
+
+    void Reset() { m_current = 0; }
     void Reset(const wxRegion& region);
 
+    bool HaveRects() const { return (m_current < m_numRects); }
+
 #ifndef __SALFORDC__
-    operator bool (void) const { return (m_current < m_numRects); }
+    operator bool () const { return HaveRects(); }
 #endif
 
-    bool HaveRects(void) const { return (m_current < m_numRects); }
+    wxRegionIterator& operator++();
+    wxRegionIterator operator++(int);
 
-    void operator ++ (void);
+    wxCoord GetX() const;
-    void operator ++ (int);
+    wxCoord GetY() const;
+    wxCoord GetW() const;
+    wxCoord GetWidth() const { return GetW(); }
+    wxCoord GetH() const;
+    wxCoord GetHeight() const { return GetH(); }
 
-    wxCoord GetX(void) const;
+    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetW(), GetH()); }
-    wxCoord GetY(void) const;
-    wxCoord GetW(void) const;
-    wxCoord GetWidth(void) const { return GetW(); }
-    wxCoord GetH(void) const;
-    wxCoord GetHeight(void) const { return GetH(); }
-    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
 
 private:
+    // common part of all ctors
+    void Init();
+
     long     m_current;
     long     m_numRects;
     wxRegion m_region;

include/wx/msw/stattext.h

@@ -48,7 +48,6 @@ protected:
     virtual void DoSetSize(int x, int y, int w, int h,
                            int sizeFlags = wxSIZE_AUTO);
     virtual wxSize DoGetBestSize() const;
-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
     DECLARE_DYNAMIC_CLASS(wxStaticText)
 };

include/wx/object.h

@@ -501,7 +501,7 @@ protected:
 
 class WXDLLEXPORT wxObjectRefData
 {
-    friend class wxObject;
+    friend class WXDLLEXPORT wxObject;
 
 public:
     wxObjectRefData() : m_count(1) { }

include/wx/strconv.h

@@ -54,6 +54,9 @@ public:
     const wxCharBuffer cWC2WX(const wchar_t *psz) const { return cWC2MB(psz); }
     const wxWCharBuffer cWX2WC(const char *psz) const { return cMB2WC(psz); }
 #endif // Unicode/ANSI
+
+    // virtual dtor for any base class
+    virtual ~wxMBConv();
 };
 
 WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc;
@@ -115,7 +118,7 @@ public:
     virtual ~wxCSConv();
 
     wxCSConv& operator=(const wxCSConv& conv);
-    
+
     void LoadNow();
 
     virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;

include/wx/univ/listbox.h

@@ -129,10 +129,10 @@ public:
     void Activate(int item = -1);
 
     // select or unselect the specified or current (if -1) item
-    void Select(bool sel = TRUE, int item = -1);
+    void DoSelect(int item = -1, bool sel = TRUE);
 
     // more readable wrapper
-    void Unselect(int item) { Select(FALSE, item); }
+    void DoUnselect(int item) { DoSelect(item, FALSE); }
 
     // select an item and send a notification about it
     void SelectAndNotify(int item);

include/wx/univ/toplevel.h

@@ -36,7 +36,7 @@ enum
     wxTOPLEVEL_BUTTON_MAXIMIZE = 0x02000000,
     wxTOPLEVEL_BUTTON_ICONIZE =  0x04000000,
     wxTOPLEVEL_BUTTON_RESTORE  = 0x08000000,
-    wxTOPLEVEL_BUTTON_HELP     = 0x10000000,
+    wxTOPLEVEL_BUTTON_HELP     = 0x10000000
 };
 
 // frame hit test return values:
@@ -143,7 +143,7 @@ public:
     virtual int GetMinWidth() const;
     virtual int GetMinHeight() const;
 
-    virtual bool ProvidesBackground() { return TRUE; }
+    virtual bool ProvidesBackground() const { return TRUE; }
     
 protected:
     // handle titlebar button click event

include/wx/univ/window.h

@@ -179,7 +179,7 @@ public:
     // to be used with function above: transparent windows get
     // their background from parents that return TRUE here,
     // so this is mostly for wxPanel, wxTopLevelWindow etc.
-    virtual bool ProvidesBackground() { return FALSE; }
+    virtual bool ProvidesBackground() const { return FALSE; }
 
     // return TRUE if this control can be highlighted when the mouse is over
     // it (the theme decides itself whether it is really highlighted or not)

include/wx/wxchar.h

@@ -257,6 +257,7 @@
     #define  wxStrcoll   _tcscoll
     #define  wxStrcpy    _tcscpy
     #define  wxStrcspn   _tcscspn
+    #define  wxStrdup    _tcsdup
     #define  wxStrftime  _tcsftime
     #define  wxStricmp   _tcsicmp
     #define  wxStrnicmp  _tcsnicmp