This commit was manufactured by cvs2svn to create tag 'wxPy-2-1-4'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxPy-2-1-4@3889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-07 23:40:33 +00:00
608 changed files with 11765 additions and 55126 deletions
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -35,25 +35,7 @@ and its make.exe).
 -> Set your path so that it includes the directory
   where your compiler and tools reside

-b-2) Using Mingw32 with gcc-2.95 and Anders Norlander's 
-	Win32 headers

-Using the newer gcc-2.95/Noralander header combination
-will allow you to compile more of the MSW code, such
-as OLE and Drag-n-Drop.
-
-Instructions are similar to those for Regular Mingw32 except
-
->Get the compiler from 
-    ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/gcc-2.95/
-
->patch the gcc headers with info in wxWin\Mingw32-gcc295.patches. 
-  PLEASE APPLY THESE PATCHES BY HAND! There are apparently a few
-  different versions of the headers floating around.
-
->copy wxWin\src\makeg295.env to wxWin\src\makeg95.env
-
-    
 c) Build instructions

 -> Assumming that you installed the wxWindows sources
@@ -62,7 +44,7 @@ c) Build instructions
   to   c:\wxWin\include\wx\msw\setup.h
 -> Edit c:\wxWin\include\wx\msw\setup.h so that
   most features are enabled (i.e. defined to 1) with
-   #define wxUSE_ODBC          0	
+   #define wxUSE_ODBC          0
   #define wxUSE_SOCKETS       0
   #define wxUSE_HTML          1
   #define wxUSE_THREADS       1
@@ -76,13 +58,9 @@ c) Build instructions

   and iostreams ares disabled with
   #define wxUSE_STD_IOSTREAM   0
-   
-   note: ODBC and SOCKETS can be 1 for gcc-2.95
-   
 -> type: cd c:\wxWin\src\msw
-> type: make -f makefile.g95  (if using GNU tools)
-or type: make -f makefile.g295 (if using Mingw32/gcc-2.95)	
-or type: make -f makefile.vc   (if using MS VC++)
+-> type: make -f makefile.g95 (if using GNU tools)
+or type: make -f makefile.vc  (if using MS VC++)


 II) Unix ports
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 09:29, 1999/10/11
+# This file was automatically generated by tmake at 15:20, 1999/10/04
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!

 #
@@ -44,9 +44,8 @@ VP6 = @top_srcdir@/src/html
 VP7 = @top_srcdir@/src/png
 VP8 = @top_srcdir@/src/jpeg
 VP9 = @top_srcdir@/src/zlib
-VP10 = @top_srcdir@/src/iodbc

-VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10)
+VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9)

 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -126,43 +125,6 @@ DISTDIR = ./_dist_dir/wx$(TOOLKIT)

 ############################## Files ##################################

-BASE_HEADERS = \
-		app.h \
-		date.h \
-		debug.h \
-		defs.h \
-		dynarray.h \
-		dynlib.h \
-		event.h \
-		ffile.h \
-		file.h \
-		fileconf.h \
-		hash.h \
-		intl.h \
-		list.h \
-		log.h \
-		longlong.h \
-		mimetype.h \
-		module.h \
-		object.h \
-		process.h \
-		setup.h \
-		strconv.h \
-		stream.h \
-		string.h \
-		textfile.h \
-		thread.h \
-		time.h \
-		timer.h \
-		tokenzr.h \
-		txtstrm.h \
-		utils.h \
-		variant.h \
-		version.h \
-		wx.h \
-		wxchar.h \
-		wxprec.h
-
 WX_HEADERS = \
 		accel.h \
 		app.h \
@@ -564,7 +526,7 @@ GENERIC_HEADERS = \
 		generic/dirdlgg.h \
 		generic/filedlgg.h \
 		generic/fontdlgg.h \
-		generic/grid.h \
+		generic/gridg.h \
 		generic/helpext.h \
 		generic/helphtml.h \
 		generic/helpwxht.h \
@@ -615,7 +577,7 @@ GTK_GENERICOBJS = \
 		dcpsg.o \
 		dirdlgg.o \
 		filedlgg.o \
-		grid.o \
+		gridg.o \
 		helphtml.o \
 		helpwxht.o \
 		imaglist.o \
@@ -648,7 +610,7 @@ GTK_GENERICDEPS = \
 		dcpsg.d \
 		dirdlgg.d \
 		filedlgg.d \
-		grid.d \
+		gridg.d \
 		helphtml.d \
 		helpwxht.d \
 		imaglist.d \
@@ -892,7 +854,6 @@ GTK_GUIOBJS = \
 		settings.o \
 		slider.o \
 		spinbutt.o \
-		spinctrl.o \
 		statbmp.o \
 		statbox.o \
 		statline.o \
@@ -952,7 +913,6 @@ GTK_GUIDEPS = \
 		settings.d \
 		slider.d \
 		spinbutt.d \
-		spinctrl.d \
 		statbmp.d \
 		statbox.d \
 		statline.d \
@@ -975,7 +935,7 @@ MOTIF_GENERICOBJS = \
 		dcpsg.o \
 		dirdlgg.o \
 		fontdlgg.o \
-		grid.o \
+		gridg.o \
 		helphtml.o \
 		helpwxht.o \
 		helpxlp.o \
@@ -1012,7 +972,7 @@ MOTIF_GENERICDEPS = \
 		dcpsg.d \
 		dirdlgg.d \
 		fontdlgg.d \
-		grid.d \
+		gridg.d \
 		helphtml.d \
 		helpwxht.d \
 		helpxlp.d \
@@ -1337,7 +1297,7 @@ MSW_GENERICOBJS = \
 		busyinfo.o \
 		choicdgg.o \
 		dirdlgg.o \
-		grid.o \
+		gridg.o \
 		laywin.o \
 		logg.o \
 		numdlgg.o \
@@ -1359,7 +1319,7 @@ MSW_GENERICDEPS = \
 		busyinfo.d \
 		choicdgg.d \
 		dirdlgg.d \
-		grid.d \
+		gridg.d \
 		laywin.d \
 		logg.d \
 		numdlgg.d \
@@ -1429,7 +1389,6 @@ MSW_COMMONOBJS = \
 		mstream.o \
 		object.o \
 		objstrm.o \
-		odbc.o \
 		paper.o \
 		prntbase.o \
 		process.o \
@@ -1519,7 +1478,6 @@ MSW_COMMONDEPS = \
 		mstream.d \
 		object.d \
 		objstrm.d \
-		odbc.d \
 		paper.d \
 		prntbase.d \
 		process.d \
@@ -1729,74 +1687,6 @@ MSW_GUIDEPS = \
 		window.d \
 		xpmhand.d

-BASE_OBJS = \
-		config.o \
-		date.o \
-		dynarray.o \
-		dynlib.o \
-		event.o \
-		extended.o \
-		ffile.o \
-		file.o \
-		fileconf.o \
-		filefn.o \
-		filesys.o \
-		hash.o \
-		init.o \
-		intl.o \
-		list.o \
-		log.o \
-		mimetype.o \
-		module.o \
-		object.o \
-		process.o \
-		strconv.o \
-		stream.o \
-		string.o \
-		textfile.o \
-		time.o \
-		timercmn.o \
-		tokenzr.o \
-		txtstrm.o \
-		utilscmn.o \
-		variant.o \
-		wxchar.o \
-		utilsunx.o
-
-BASE_DEPS = \
-		config.d \
-		date.d \
-		dynarray.d \
-		dynlib.d \
-		event.d \
-		extended.d \
-		ffile.d \
-		file.d \
-		fileconf.d \
-		filefn.d \
-		filesys.d \
-		hash.d \
-		init.d \
-		intl.d \
-		list.d \
-		log.d \
-		mimetype.d \
-		module.d \
-		object.d \
-		process.d \
-		strconv.d \
-		stream.d \
-		string.d \
-		textfile.d \
-		time.d \
-		timercmn.d \
-		tokenzr.d \
-		txtstrm.d \
-		utilscmn.d \
-		variant.d \
-		wxchar.d \
-		utilsunx.d
-
 HTMLOBJS = \
 		helpctrl.o \
 		helpdata.o \
@@ -1837,13 +1727,13 @@ HTMLDEPS = \
 		search.d \
 		winpars.d

-UNIX_OBJS = \
+UNIXOBJS = \
 		dialup.o \
 		gsocket.o \
 		threadpsx.o \
 		utilsunx.o

-UNIX_DEPS = \
+UNIXDEPS = \
 		dialup.d \
 		gsocket.d \
 		threadpsx.d \
@@ -1931,22 +1821,37 @@ JPEGOBJS    = \
 		jquant2.o \
 		jdmerge.o

-IODBCOBJS = \
-		catalog.o \
-		connect.o \
-		dlf.o \
-		dlproc.o \
-		execute.o \
-		fetch.o \
-		hdbc.o \
-		henv.o \
-		herr.o \
-		hstmt.o \
-		info.o \
-		itrace.o \
-		misc.o \
-		prepare.o \
-		result.o
+BASE_OBJS = \
+    dynarray.o \
+    event.o \
+    hash.o \
+    intl.o \
+    init.o \
+    file.o \
+    filefn.o \
+    list.o \
+    log.o \
+    object.o \
+    string.o \
+    utilscmn.o \
+    utilsunx.o
+
+BASE_DEPS = \
+    dynarray.d \
+    event.d \
+    hash.d \
+    intl.d \
+    init.d \
+    file.d \
+    filefn.d \
+    list.d \
+    log.d \
+    object.d \
+    string.d \
+    utilscmn.d \
+    utilsunx.d
+
+BASE_HEADERS =

 GUIOBJS = @GUIOBJS@
 GUIDEPS = @GUIDEPS@
@@ -1958,13 +1863,13 @@ GENERICDEPS = @GENERICDEPS@
 UNIXOBJS = @UNIXOBJS@
 UNIXDEPS = @UNIXDEPS@

-OBJECTS = @ALL_OBJECTS@ $(IODBCOBJS)
+OBJECTS = @ALL_OBJECTS@

 DEPFILES = @ALL_DEPFILES@

 HEADERS = @ALL_HEADERS@

-all: @WX_ALL@
+all: @WX_CREATE_LINKS@

@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
 	@$(INSTALL) -d ./lib
@@ -1975,7 +1880,7 @@ all: @WX_ALL@
 	@$(INSTALL) -d ./lib
 	$(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
 	
-CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
+CREATE_LINKS: @WX_TARGET_LIBRARY@
 	@$(RM) ./lib/@WX_LIBRARY_LINK1@
 	@$(RM) ./lib/@WX_LIBRARY_LINK2@
 	@$(RM) ./lib/@WX_LIBRARY_LINK3@
@@ -1983,13 +1888,13 @@ CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
 	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
 	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
 	
-CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
+CREATE_INSTALLED_LINKS:  $(libdir)/@WX_TARGET_LIBRARY@
 	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
 	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
 	$(RM) $(libdir)/@WX_LIBRARY_LINK3@
-	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@
-	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
-	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@
+	$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK1@
+	$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK2@
+	$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK3@
 	
 $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h

@@ -2066,7 +1971,7 @@ write_message:
 	@echo " Read the wxWindows Licence on licencing conditions."
 	@echo " "

-install: preinstall @WX_ALL_INSTALLED@ write_message
+install: preinstall @WX_CREATE_INSTALLED_LINKS@ write_message

 uninstall:
 	@echo " "
@@ -2332,10 +2237,6 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
-	mkdir $(DISTDIR)/samples/newgrid
-	cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
-	cp $(SAMPDIR)/newgrid/*.cpp $(DISTDIR)/samples/newgrid
-	cp $(SAMPDIR)/newgrid/*.h $(DISTDIR)/samples/newgrid
 	mkdir $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook
--- a/1473
+++ b/1473
--- a/configure.in
+++ b/configure.in
@@ -446,7 +446,7 @@ dnl WX_INTERFACE_AGE = 0

 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=1
-WX_RELEASE_NUMBER=10
+WX_RELEASE_NUMBER=0

 WX_INTERFACE_AGE=0
 WX_BINARY_AGE=0
@@ -723,7 +723,6 @@ if test $DEBUG_CONFIGURE = 1; then
  DEFAULT_wxUSE_COMBOBOX=no
  DEFAULT_wxUSE_GAUGE=no
  DEFAULT_wxUSE_GRID=no
-  DEFAULT_wxUSE_NEW_GRID=no
  DEFAULT_wxUSE_IMAGLIST=no
  DEFAULT_wxUSE_LISTBOX=no
  DEFAULT_wxUSE_LISTCTRL=no
@@ -774,7 +773,7 @@ else
  DEFAULT_wxUSE_ZLIB=yes
  DEFAULT_wxUSE_LIBPNG=yes
  DEFAULT_wxUSE_LIBJPEG=yes
-  DEFAULT_wxUSE_ODBC=yes
+  DEFAULT_wxUSE_ODBC=no

  DEFAULT_wxUSE_STD_IOSTREAM=no
  DEFAULT_wxUSE_FILE=yes
@@ -835,7 +834,6 @@ else
  DEFAULT_wxUSE_COMBOBOX=yes
  DEFAULT_wxUSE_GAUGE=yes
  DEFAULT_wxUSE_GRID=yes
-  DEFAULT_wxUSE_NEW_GRID=yes
  DEFAULT_wxUSE_IMAGLIST=yes
  DEFAULT_wxUSE_LISTBOX=yes
  DEFAULT_wxUSE_LISTCTRL=yes
@@ -938,7 +936,6 @@ if test "$wxUSE_GUI" = "no"; then
  DEFAULT_wxUSE_COMBOBOX=no
  DEFAULT_wxUSE_GAUGE=no
  DEFAULT_wxUSE_GRID=no
-  DEFAULT_wxUSE_NEW_GRID=no
  DEFAULT_wxUSE_IMAGLIST=no
  DEFAULT_wxUSE_LISTBOX=no
  DEFAULT_wxUSE_LISTCTRL=no
@@ -1102,7 +1099,6 @@ if test "$wxUSE_CONTROLS" = "yes"; then
  DEFAULT_wxUSE_CHOICE=yes
  DEFAULT_wxUSE_GAUGE=yes
  DEFAULT_wxUSE_GRID=yes
-  DEFAULT_wxUSE_NEW_GRID=yes
  DEFAULT_wxUSE_IMAGLIST=yes
  DEFAULT_wxUSE_LISTBOX=yes
  DEFAULT_wxUSE_LISTCTRL=yes
@@ -1132,7 +1128,6 @@ elif test "$wxUSE_CONTROLS" = "no"; then
  DEFAULT_wxUSE_CHOICE=no
  DEFAULT_wxUSE_GAUGE=no
  DEFAULT_wxUSE_GRID=no
-  DEFAULT_wxUSE_NEW_GRID=no
  DEFAULT_wxUSE_IMAGLIST=no
  DEFAULT_wxUSE_LISTBOX=no
  DEFAULT_wxUSE_LISTCTRL=no
@@ -1163,7 +1158,6 @@ WX_ARG_ENABLE(choice,      [  --enable-choice         use wxChoice class], wxUSE
 WX_ARG_ENABLE(combobox,    [  --enable-combobox       use wxComboBox classes], wxUSE_COMBOBOX)
 WX_ARG_ENABLE(gauge,       [  --enable-gauge          use wxGauge class], wxUSE_GAUGE)
 WX_ARG_ENABLE(grid,        [  --enable-grid           use wxGrid class], wxUSE_GRID)
-WX_ARG_ENABLE(newgrid,     [  --enable-newgrid        use new wxGrid class], wxUSE_NEW_GRID)
 WX_ARG_ENABLE(imaglist,    [  --enable-imaglist       use wxImageList class], wxUSE_IMAGLIST)
 WX_ARG_ENABLE(listbox,     [  --enable-listbox        use wxListBox class], wxUSE_LISTBOX)
 WX_ARG_ENABLE(listctrl,    [  --enable-listctrl       use wxListCtrl class], wxUSE_LISTCTRL)
@@ -1672,6 +1666,13 @@ if test "$wxUSE_MOTIF" = 1; then
    GUIDIST=MOTIF_DIST
 fi

+dnl someone explicitly added -ldl to the list of libraries for these targets -
+dnl I don't know why has this been done, but let's respect this - with the
+dnl exception of the systems which don't have libdl at all (VZ)
+if test "$wxUSE_GTK" = 1 || test "$wxUSE_MOTIF" = 1 || test "$wxUSE_WINE" = 1; then
+    AC_CHECK_LIB(dl, main, GUI_TK_LIBRARY="$GUI_TK_LIBRARY -ldl")
+fi
+
 dnl the name of the directory where the files for this toolkit live
 TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"`

@@ -1714,101 +1715,95 @@ WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"
 dnl shared library settings
 SHARED_LD=
 PIC_FLAG=
-WX_ALL=
-WX_ALL_INSTALLED=
+WX_CREATE_LINKS=

 if test "$wxUSE_SHARED" = "yes"; then
    dnl set target to shared
    WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"

-    case "${host}" in
-      *-hp-hpux* )
-        WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl"
-        SHARED_LD="${CXX} -b -o"
-        PIC_FLAG="+Z"
-        WX_ALL=${WX_LIBRARY_NAME_SHARED}
-      ;;
-      *-*-linux* )
-        SHARED_LD="${CC} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-irix5* | *-*-irix6* )
-        if test "$GCC" = yes ; then
-           SHARED_LD="${CC} -shared -o"
-           PIC_FLAG="-fPIC"
-        else
-           SHARED_LD="${CXX} -shared -o"
-        fi
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-solaris2* )
-        if test "$GCC" = yes ; then
-            SHARED_LD="${CC} -shared -o"
-            PIC_FLAG="-fPIC"
-        else
-            SHARED_LD="${CXX} -G -o"
-            PIC_FLAG="PIC"
-        fi
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-sunos4* )
-        SHARED_LD="${CC} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-freebsd* | *-*-netbsd*)
-        SHARED_LD="${CC} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-osf* )
-        SHARED_LD="${CXX} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-dgux5* )
-        SHARED_LD="${CXX} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-sysv5* )
-        SHARED_LD="${CC} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-aix* )
-        SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
-        WX_ALL=${WX_LIBRARY_NAME_SHARED}
-      ;;
-      *-*-cygwin32* )
-        dnl only static for now
-        WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
-        WX_ALL="${WX_LIBRARY_NAME_STATIC}"
-      ;;
-        *-*-mingw32* )
-        dnl only static for now
-        WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
-        WX_ALL="${WX_LIBRARY_NAME_STATIC}"
-      ;;
-      *-pc-os2_emx )
-      ;;
-      *)
-        AC_MSG_ERROR(unknown system type ${host}.)
-    esac
+case "${host}" in
+  *-hp-hpux* )
+    WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl"
+    SHARED_LD="${CXX} -b -o"
+    PIC_FLAG="+Z"
+  ;;
+  *-*-linux* )
+    SHARED_LD="${CC} -shared -o"
+    PIC_FLAG="-fPIC"
+    WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
+    WX_CREATE_LINKS="CREATE_LINKS"
+  ;;
+  *-*-irix5* | *-*-irix6* )
+    if test "$GCC" = yes ; then
+       SHARED_LD="${CC} -shared -o"
+       PIC_FLAG="-fPIC"
+    else
+       SHARED_LD="${CXX} -shared -o"
+    fi
+    WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
+    WX_CREATE_LINKS="CREATE_LINKS"
+  ;;
+  *-*-solaris2* )
+    if test "$GCC" = yes ; then
+       SHARED_LD="${CC} -shared -o"
+       PIC_FLAG="-fPIC"
+    else
+       SHARED_LD="${CXX} -G -o"
+       PIC_FLAG="PIC"
+    fi
+    WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
+    WX_CREATE_LINKS="CREATE_LINKS"
+  ;;
+  *-*-sunos4* )
+    SHARED_LD="${CC} -shared -o"
+    PIC_FLAG="-fPIC"
+    WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
+    WX_CREATE_LINKS="CREATE_LINKS"
+  ;;
+  *-*-freebsd* | *-*-netbsd*)
+    SHARED_LD="${CC} -shared -o"
+    PIC_FLAG="-fPIC"
+    WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
+    WX_CREATE_LINKS="CREATE_LINKS"
+  ;;
+  *-*-osf* )
+    SHARED_LD="${CXX} -shared -o"
+    PIC_FLAG="-fPIC"
+    WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
+    WX_CREATE_LINKS="CREATE_LINKS"
+  ;;
+  *-*-dgux5* )
+    SHARED_LD="${CXX} -shared -o"
+    PIC_FLAG="-fPIC"
+    WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
+    WX_CREATE_LINKS="CREATE_LINKS"
+  ;;
+  *-*-sysv5* )
+    SHARED_LD="${CC} -shared -o"
+    PIC_FLAG="-fPIC"
+    WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
+    WX_CREATE_LINKS="CREATE_LINKS"
+  ;;
+  *-*-aix* )
+    SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
+  ;;
+  *-*-cygwin32* )
+    dnl only static for now
+    WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+  ;;
+  *-*-mingw32* )
+    dnl only static for now
+    WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+  ;;
+  *-pc-os2_emx )
+  ;;
+  *)
+    AC_MSG_ERROR(unknown system type ${host}.)
+esac

 else
    dnl set target to static
    WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
-    WX_ALL="${WX_LIBRARY_NAME_STATIC}"
 fi

 dnl ------------------------------------------------------------------------
@@ -2334,9 +2329,14 @@ if test "$wxUSE_LONGLONG" = "yes"; then
 fi

 if test "$wxUSE_SOCKETS" = "yes" ; then
-    AC_DEFINE(wxUSE_SOCKETS)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"
-    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
+    if test "$wxUSE_THREADS" = "yes" ; then
+        AC_DEFINE(wxUSE_SOCKETS)
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"
+        INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
+    else
+        AC_MSG_WARN(Socket classes require --with-threads and won't be compiled without it)
+        wxUSE_SOCKETS=0
+    fi
 fi

 if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
@@ -2400,38 +2400,21 @@ HAVE_DL_FUNCS=0
 HAVE_SHL_FUNCS=0
 if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
    dnl the test is a bit complicated because we check for dlopen() both with
-    dnl and without -ldl and we also try to find shl_load() if there is no
-    dnl dlopen() on this system
+    dnl and without -ldl
    AC_CHECK_FUNCS(dlopen,
-        [
-            AC_DEFINE(HAVE_DLOPEN)
-            HAVE_DL_FUNCS=1
-        ],
-        [
-            AC_CHECK_LIB(dl, dlopen,
-                        [
-                            AC_DEFINE(HAVE_DLOPEN)
-                            HAVE_DL_FUNCS=1
-                            LIBS="$LIBS -ldl"
-                        ],
-                        [
-                            AC_CHECK_FUNCS(shl_load,
-                                          [
-                                            AC_DEFINE(HAVE_SHL_LOAD)
-                                            HAVE_SHL_FUNCS=1
-                                          ])
-                        ])
-        ])
+        [AC_DEFINE(HAVE_DLOPEN) HAVE_DL_FUNCS=1],
+        [AC_CHECK_LIB(dl, dlopen,
+            [AC_DEFINE(HAVE_DLOPEN) HAVE_DL_FUNCS=1])])
+    AC_CHECK_FUNCS( shl_load,
+                    [AC_DEFINE(HAVE_SHL_LOAD) HAVE_DL_FUNCS=1 HAVE_SHL_FUNCS=1])

    if test "$HAVE_DL_FUNCS" = 0; then
-        if test "$HAVE_SHL_FUNCS" = 0; then
-          if test "$USE_UNIX" = 1; then
-              AC_MSG_WARN("--with-dynlib and --with-odbc will be disabled due to missing shared library support")
-              wxUSE_ODBC=no
-              wxUSE_DYNLIB_CLASS=no
-          else
-              AC_MSG_WARN("Cannot check dynlib requirements on non-Unix platforms. dynlib remains enabled.")
-          fi
+        if test "$USE_UNIX" = 1; then
+            AC_MSG_WARN("--with-dynlib and --with-odbc will be disabled due to missing shared library support")
+            wxUSE_ODBC=no
+            wxUSE_DYNLIB_CLASS=no
+        else
+            AC_MSG_WARN("Cannot check dynlib requirements on non-Unix platforms. dynlib remains enabled.")
        fi
    fi
 fi
@@ -2463,7 +2446,6 @@ dnl ----------------------------------------------------------------
 IODBC_C_SRC=""
 if test "$wxUSE_ODBC" = "yes" ; then
  AC_DEFINE(wxUSE_ODBC)
-  WXODBCFLAG="-D_IODBC_"
  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
 fi

@@ -2610,11 +2592,6 @@ if test "$wxUSE_GRID" = "yes"; then
  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
 fi

-if test "$wxUSE_NEW_GRID" = "yes"; then
-  AC_DEFINE(wxUSE_NEW_GRID)
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
-fi
-
 if test "$wxUSE_IMAGLIST" = "yes"; then
    AC_DEFINE(wxUSE_IMAGLIST)
 fi
@@ -2799,7 +2776,7 @@ dnl ---------------------------------------------------------------------------
 GUILIBS="$GUI_TK_LIBRARY $OPENGL_LINK $LIBPNG_LINK $ZLIB_LINK $TOOLKIT_LINK"

 dnl all additional libraries (except wxWindows itself) we link with
-EXTRA_LIBS="$LIBS $POSIX4_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK"
+EXTRA_LIBS="$LIBS $POSIX4_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK"
 if test "$wxUSE_GUI" = "yes"; then
    EXTRA_LIBS="$EXTRA_LIBS $GUILIBS"
 fi
@@ -2819,7 +2796,7 @@ if test "$GXX" = yes ; then
    dnl        doing this... (VZ)
    dnl CXXWARNINGS="-Wall -Werror"
 fi
-EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
+EXTRA_CFLAGS="$WXDEBUG $PROFILE $OPTIMISE $INCLUDES"

 CPPFLAGS="-I\${top_srcdir}/include $CPPFLAGS"
 CFLAGS="$CFLAGS $EXTRA_CFLAGS"
@@ -2858,8 +2835,8 @@ AC_SUBST(WX_LIBRARY_LINK3)
 AC_SUBST(PROGRAM_EXT)

 dnl are we supposed to create the links?
-AC_SUBST(WX_ALL)
-AC_SUBST(WX_ALL_INSTALLED)
+AC_SUBST(WX_CREATE_LINKS)
+AC_SUBST(WX_CREATE_INSTALLED_LINKS)

 AC_SUBST(SHARED_LD)
 AC_SUBST(PIC_FLAG)
@@ -2934,7 +2911,6 @@ AC_OUTPUT([
            samples/checklst/Makefile
            samples/config/Makefile
            samples/controls/Makefile
-            samples/db/Makefile
            samples/dialogs/Makefile
            samples/docview/Makefile
            samples/docvwmdi/Makefile
@@ -2947,13 +2923,10 @@ AC_OUTPUT([
            samples/listctrl/Makefile
            samples/mdi/Makefile
            samples/minifram/Makefile
-	    samples/minimal/Makefile
-            samples/nettest/Makefile
-            samples/newgrid/Makefile
+            samples/minimal/Makefile
            samples/notebook/Makefile
            samples/printing/Makefile
-	    samples/proplist/Makefile
-            samples/richedit/Makefile
+            samples/proplist/Makefile
            samples/sashtest/Makefile
            samples/scroll/Makefile
            samples/splitter/Makefile
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -29,7 +29,6 @@
 #
 # Known flags:
 #  B	makes part of the base library too
-#  BO	only for the base library
 #  16	a generic file implementing Win32 control for Win16
 #  32	only can be compiled under Win32
 #  PS	PostScript related file, normally not compiled under Windows
@@ -41,9 +40,9 @@
 #  X	Not required for the Motif port
 #
 #  WX	Base header
-#  GTK	GTK header
+#  GTK  GTK header
 #  MSW	MSW header
-#  MAC	Mac header
+#  MAC  Mac header
 #  MOT	Motif header
 #  PM	OS/2 header
 #  GEN	Generic header
@@ -62,7 +61,7 @@ dcpsg.cpp	G	U
 dirdlgg.cpp	G	16
 fontdlgg.cpp	G	G,R
 filedlgg.cpp	G	U,X
-grid.cpp	G
+gridg.cpp	G
 helphtml.cpp	G	G
 helpwxht.cpp	G	G
 helpxlp.cpp	G	G,R
@@ -105,7 +104,7 @@ docmdi.cpp	C
 docview.cpp	C
 dynarray.cpp	C	B
 dynlib.cpp	C	B
-event.cpp	C	B
+event.cpp	C
 extended.c	C	B
 ffile.cpp	C	B
 file.cpp	C	B
@@ -130,7 +129,6 @@ imagjpeg.cpp	C	32
 imagpcx.cpp	C	32
 imagpng.cpp	C	32
 imagpnm.cpp	C	32
-init.cpp	C	B,BO
 intl.cpp	C	B
 ipcbase.cpp	C
 layout.cpp	C
@@ -155,7 +153,7 @@ sckstrm.cpp	C	S
 serbase.cpp	C
 sizer.cpp	C
 socket.cpp	C	S
-stream.cpp	C	B
+stream.cpp	C
 strconv.cpp	C	B
 string.cpp	C	B
 tbarbase.cpp	C
@@ -165,7 +163,7 @@ textfile.cpp	C	B
 time.cpp	C	B
 timercmn.cpp	C	B
 tokenzr.cpp	C	B
-txtstrm.cpp	C	B
+txtstrm.cpp	C
 unzip.c	C
 url.cpp	C	S
 utilscmn.cpp	C	B
@@ -278,7 +276,7 @@ gsocket.c	M	S

 dialup.cpp	U
 threadpsx.cpp	U
-utilsunx.cpp	U	B
+utilsunx.cpp	U
 gsocket.c	U

 gsockgtk.c	R
@@ -326,7 +324,6 @@ scrolbar.cpp	R
 settings.cpp	R
 slider.cpp	R
 spinbutt.cpp	R
-spinctrl.cpp	R
 statbmp.cpp	R
 statbox.cpp	R
 statline.cpp	R
@@ -416,7 +413,7 @@ search.cpp	H
 arrimpl.cpp	W
 listimpl.cpp	W
 accel.h	W
-app.h	W	B
+app.h	W
 bitmap.h	W
 bmpbuttn.h	W
 brush.h	W
@@ -438,7 +435,7 @@ config.h	W
 control.h	W
 cursor.h	W
 dataobj.h	W
-date.h	W	B
+date.h	W
 datstrm.h	W
 db.h	W
 dbtable.h	W
@@ -449,21 +446,21 @@ dcprint.h	W
 dcps.h	W
 dcscreen.h	W
 dde.h	W
-debug.h	W	B
-defs.h	W	B
+debug.h	W
+defs.h	W
 dialog.h	W
 dirdlg.h	W
 dnd.h	W
 docmdi.h	W
 docview.h	W
 dragimag.h	W
-dynarray.h	W	B
-dynlib.h	W	B
-event.h	W	B
+dynarray.h	W
+dynlib.h	W
+event.h	W
 expr.h	W
-ffile.h	W	B
-file.h	W	B
-fileconf.h	W	B
+ffile.h	W
+file.h	W
+fileconf.h	W
 filedlg.h	W
 filefn.h	W
 filesys.h	W
@@ -478,7 +475,7 @@ gdiobj.h	W
 gifdecod.h	W
 grid.h	W
 gsocket.h	W
-hash.h	W	B
+hash.h	W
 help.h	W
 helpbase.h	W
 helphtml.h	W
@@ -487,30 +484,30 @@ helpxlp.h	W
 icon.h	W
 image.h	W
 imaglist.h	W
-intl.h	W	B
+intl.h	W
 ioswrap.h	W
 ipcbase.h	W
 joystick.h	W
 layout.h	W
 laywin.h	W
-list.h	W	B
+list.h	W
 listbox.h	W
 listctrl.h	W
-log.h	W	B
-longlong.h	W	B
+log.h	W
+longlong.h	W
 matrix.h	W
 mdi.h	W
 memory.h	W
 menu.h	W
 menuitem.h	W
 metafile.h	W
-mimetype.h	W	B
+mimetype.h	W
 minifram.h	W
-module.h	W	B
+module.h	W
 msgdlg.h	W
 mstream.h	W
 notebook.h	W
-object.h	W	B
+object.h	W
 objstrm.h	W
 odbc.h	W
 ownerdrw.h	W
@@ -522,7 +519,7 @@ pnghand.h	W
 print.h	W
 printdlg.h	W
 prntbase.h	W
-process.h	W	B
+process.h	W
 progdlg.h	W
 prop.h	W
 propform.h	W
@@ -539,7 +536,7 @@ scrolbar.h	W
 scrolwin.h	W
 serbase.h	W
 settings.h	W
-setup.h	W	B
+setup.h	W
 sizer.h	W
 slider.h	W
 socket.h	W
@@ -550,9 +547,9 @@ statbox.h	W
 statline.h	W
 stattext.h	W
 statusbr.h	W
-strconv.h	W	B
-stream.h	W	B
-string.h	W	B
+strconv.h	W
+stream.h	W
+string.h	W
 tab.h	W
 tabctrl.h	W
 taskbar.h	W
@@ -562,35 +559,35 @@ tbarmsw.h	W
 tbarsmpl.h	W
 textctrl.h	W
 textdlg.h	W
-textfile.h	W	B
-txtstrm.h	W	B
-thread.h	W	B
-time.h	W	B
-timer.h	W	B
+textfile.h	W
+txtstrm.h	W
+thread.h	W
+time.h	W
+timer.h	W
 tipdlg.h	W
-tokenzr.h	W	B
+tokenzr.h	W
 toolbar.h	W
 tooltip.h	W
 treectrl.h	W
 types.h	W
 url.h	W
-utils.h	W	B
+utils.h	W
 valgen.h	W
 validate.h	W
 valtext.h	W
-variant.h	W	B
-version.h	W	B
+variant.h	W
+version.h	W
 wave.h	W
 wfstream.h	W
 window.h	W
-wx.h	W	B
+wx.h	W
 wx_cw.h	W
 wx_cw_cm.h	W
 wx_cw_d.h	W
-wxchar.h	W	B
+wxchar.h	W
 wxexpr.h	W
 wxhtml.h	W
-wxprec.h	W	B
+wxprec.h	W
 xpmhand.h	W
 zipstrm.h	W
 zstream.h	W
@@ -852,7 +849,7 @@ dcpsg.h	N
 dirdlgg.h	N
 fontdlgg.h	N
 filedlgg.h	N
-grid.h	N
+gridg.h	N
 helpext.h	N
 helpwxht.h	N
 helphtml.h	N
--- a/distrib/msw/tmake/unx.t
+++ b/distrib/msw/tmake/unx.t
@@ -51,32 +51,36 @@
    #! Common
    
    foreach $file (sort keys %wxCommon) {
-        ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
+        next if $wxCommon{$file} =~ /\bR\b/;

-        #! 'B' flag means that the file makes part of wxBase too
-        if ( $wxCommon{$file} =~ /\bB\b/ ) {
-            $project{"BASE_OBJS"} .= $fileobj . " ";
-            $project{"BASE_DEPS"} .= $filedep . " ";
-        }
+        $file2 = $file;
+        $file =~ s/cp?p?$/\o/;
+        $file2 =~ s/cp?p?$/\d/;
+        $project{"WXGTK_COMMONOBJS"} .= $file . " ";
+        $project{"WXGTK_COMMONDEPS"} .= $file2 . " "
+    }

-        #! if it's the wxBase-only file, nothing more to do with it
-        next if $wxCommon{$file} =~ /\bBO\b/;
+    foreach $file (sort keys %wxCommon) {
+        next if $wxCommon{$file} =~ /\bX\b/;

-        if ( $wxCommon{$file} !~ /\bR\b/ ) {    #! unless not for GTK
-            $project{"WXGTK_COMMONOBJS"} .= $fileobj . " ";
-            $project{"WXGTK_COMMONDEPS"} .= $filedep . " "
-        }
-        if ( $wxCommon{$file} !~ /\bX\b/ ) {    #! unless not for Motif
-            $project{"WXMOTIF_COMMONOBJS"} .= $fileobj . " ";
-            $project{"WXMOTIF_COMMONDEPS"} .= $filedep . " "
-        }
+        $file2 = $file;
+        $file =~ s/cp?p?$/\o/;
+        $file2 =~ s/cp?p?$/\d/;
+        $project{"WXMOTIF_COMMONOBJS"} .= $file . " ";
+        $project{"WXMOTIF_COMMONDEPS"} .= $file2 . " "
+    }

-        #! ODBC needs extra files (sql*.h) so not compiled by default.
-        if ( (file !~ /^odbc\./) && ($wxCommon{$file} !~ /\b(16)\b/) ) {
-            $project{"WXMSW_COMMONOBJS"} .= $fileobj . " ";
-            $project{"WXMSW_COMMONDEPS"} .= $filedep . " "
-        }
+    foreach $file (sort keys %wxCommon) {
+        next if $wxCommon{$file} =~ /\b(16)\b/;
+
+        #! needs extra files (sql*.h) so not compiled by default.
+        next if $file =~ /^odbc\./;
+
+        $file2 = $file;
+        $file =~ s/cp?p?$/\o/;
+        $file2 =~ s/cp?p?$/\d/;
+        $project{"WXMSW_COMMONOBJS"} .= $file . " ";
+        $project{"WXMSW_COMMONDEPS"} .= $file2 . " "
    }

    #! GUI
@@ -123,24 +127,17 @@
    }

    foreach $file (sort keys %wxUNIX) {
-        ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
-
-        #! 'B' flag means that the file makes part of wxBase too
-        if ( $wxUNIX{$file} =~ /\bB\b/ ) {
-            $project{"BASE_OBJS"} .= $fileobj . " ";
-            $project{"BASE_DEPS"} .= $filedep . " "
-        }
-
-        $project{"WXUNIX_OBJS"} .= $fileobj . " ";
-        $project{"WXUNIX_DEPS"} .= $filedep . " "
+        $file2 = $file;
+        $file =~ s/cp?p?$/\o/;
+        $file2 =~ s/cp?p?$/\d/;
+        $project{"WXUNIXOBJS"} .= $file . " ";
+        $project{"WXUNIXDEPS"} .= $file2 . " "
    }
    
    #! headers
    
    foreach $file (sort keys %wxWXINCLUDE) {
-        $project{"WX_HEADERS"} .= $file . " ";
-        $project{"BASE_HEADERS"} .= $file . " " if $wxWXINCLUDE{$file} =~ /\bB\b/;
+        $project{"WX_HEADERS"} .= $file . " "
    }
    
    foreach $file (sort keys %wxGENERICINCLUDE) {
@@ -217,9 +214,8 @@ VP6 = @top_srcdir@/src/html
 VP7 = @top_srcdir@/src/png
 VP8 = @top_srcdir@/src/jpeg
 VP9 = @top_srcdir@/src/zlib
-VP10 = @top_srcdir@/src/iodbc

-VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10)
+VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9)

 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -299,9 +295,6 @@ DISTDIR = ./_dist_dir/wx$(TOOLKIT)

 ############################## Files ##################################

-BASE_HEADERS = \
-		#$ ExpandList("BASE_HEADERS");
-
 WX_HEADERS = \
 		#$ ExpandList("WX_HEADERS");

@@ -388,23 +381,17 @@ MSW_GUIOBJS = \
 MSW_GUIDEPS = \
 		#$ ExpandList("WXMSW_GUIDEPS");

-BASE_OBJS = \
-		#$ ExpandList("BASE_OBJS");
-
-BASE_DEPS = \
-		#$ ExpandList("BASE_DEPS");
-
 HTMLOBJS = \
 		#$ ExpandList("WXHTMLOBJS");

 HTMLDEPS = \
 		#$ ExpandList("WXHTMLDEPS");

-UNIX_OBJS = \
-		#$ ExpandList("WXUNIX_OBJS");
+UNIXOBJS = \
+		#$ ExpandList("WXUNIXOBJS");

-UNIX_DEPS = \
-		#$ ExpandList("WXUNIX_DEPS");
+UNIXDEPS = \
+		#$ ExpandList("WXUNIXDEPS");

 ZLIBOBJS    = \
 		adler32.o \
@@ -488,40 +475,16 @@ JPEGOBJS    = \
 		jquant2.o \
 		jdmerge.o

-IODBCOBJS = \
-		catalog.o \
-		connect.o \
-		dlf.o \
-		dlproc.o \
-		execute.o \
-		fetch.o \
-		hdbc.o \
-		henv.o \
-		herr.o \
-		hstmt.o \
-		info.o \
-		itrace.o \
-		misc.o \
-		prepare.o \
-		result.o

-GUIOBJS = @GUIOBJS@
-GUIDEPS = @GUIDEPS@
-GUIHEADERS = @GUIHEADERS@
-COMMONOBJS = @COMMONOBJS@
-COMMONDEPS = @COMMONDEPS@
-GENERICOBJS = @GENERICOBJS@
-GENERICDEPS = @GENERICDEPS@
-UNIXOBJS = @UNIXOBJS@
-UNIXDEPS = @UNIXDEPS@
+OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(@UNIXOBJS@) $(HTMLOBJS) \
+	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS)

-OBJECTS = @ALL_OBJECTS@ $(IODBCOBJS)
+DEPFILES = $(@GUIDEPS@) $(@COMMONDEPS@) $(@GENERICDEPS@) $(UNIXDEPS) $(HTMLDEPS)

-DEPFILES = @ALL_DEPFILES@
+HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \
+	  $(GENERIC_HEADERS) $(WX_HEADERS)

-HEADERS = @ALL_HEADERS@
-
-all: @WX_ALL@
+all: @WX_CREATE_LINKS@

@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
 	@$(INSTALL) -d ./lib
@@ -532,7 +495,7 @@ all: @WX_ALL@
 	@$(INSTALL) -d ./lib
 	$(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
 	
-CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
+CREATE_LINKS: @WX_TARGET_LIBRARY@
 	@$(RM) ./lib/@WX_LIBRARY_LINK1@
 	@$(RM) ./lib/@WX_LIBRARY_LINK2@
 	@$(RM) ./lib/@WX_LIBRARY_LINK3@
@@ -540,13 +503,13 @@ CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
 	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
 	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
 	
-CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
+CREATE_INSTALLED_LINKS:  $(libdir)/@WX_TARGET_LIBRARY@
 	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
 	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
 	$(RM) $(libdir)/@WX_LIBRARY_LINK3@
-	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@
-	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
-	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@
+	$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK1@
+	$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK2@
+	$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK3@
 	
 $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h

@@ -623,7 +586,7 @@ write_message:
 	@echo " Read the wxWindows Licence on licencing conditions."
 	@echo " "

-install: preinstall @WX_ALL_INSTALLED@ write_message
+install: preinstall @WX_CREATE_INSTALLED_LINKS@ write_message

 uninstall:
 	@echo " "
@@ -889,10 +852,6 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
-	mkdir $(DISTDIR)/samples/newgrid
-	cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
-	cp $(SAMPDIR)/newgrid/*.cpp $(DISTDIR)/samples/newgrid
-	cp $(SAMPDIR)/newgrid/*.h $(DISTDIR)/samples/newgrid
 	mkdir $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -290,7 +290,7 @@ $(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@

 png:
    cd $(WXDIR)\src\png
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
    cd $(WXDIR)\src\msw

 clean_png:
@@ -300,7 +300,7 @@ clean_png:

 zlib:
    cd $(WXDIR)\src\zlib
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
    cd $(WXDIR)\src\msw

 clean_zlib:
@@ -310,7 +310,7 @@ clean_zlib:

 jpeg:
    cd $(WXDIR)\src\jpeg
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)  CRTFLAG=$(CRTFLAG) all
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) all
    cd $(WXDIR)\src\msw

 clean_jpeg:
@@ -320,7 +320,7 @@ clean_jpeg:

 xpm:
    cd $(WXDIR)\src\xpm
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
    cd $(WXDIR)\src\msw

 clean_xpm:
--- a/distrib/msw/tmake/vc6.t
+++ b/distrib/msw/tmake/vc6.t
@@ -19,7 +19,6 @@

    foreach $file (sort keys %wxCommon) {
        next if $wxCommon{$file} =~ /\b16\b/;
-        next if $wxCommon{$file} =~ /\bBO\b/;

        my $tag = $file =~ /\.c$/ ? "WXCSRCS" : "WXCOMMONSRCS";
        $project{$tag} .= $file . " "
@@ -28,9 +27,7 @@
    foreach $file (sort keys %wxMSW) {
        next if $wxMSW{$file} =~ /\b16\b/;

-        my $tag;
-	if ( $wxMSW{$file} =~ /\bO\b/ ) { $tag = "WXOLESRCS" }
-	else { $tag = $file =~ /\.c$/ ? "WXMSWCSRCS" : "WXMSWSRCS" }
+        my $tag = $wxMSW{$file} =~ /\bO\b/ ? "WXOLESRCS" : "WXMSWSRCS";
        $project{$tag} .= $file . " "
    }

@@ -133,7 +130,6 @@ SOURCE=.\src\msw\dummy.cpp
 #$ ExpandGlue("WXGENERICSRCS", "# Begin Source File\n\nSOURCE=.\\src\\generic\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\generic\\", "\n# End Source File\n");
 #$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n");
 #$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
-#$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
 #$ ExpandGlue("WXHTMLSRCS", "# Begin Source File\n\nSOURCE=.\\src\\html\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\html\\", "\n# End Source File\n");

 # Begin Source File
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -5,9 +5,6 @@ src/wxvc6.dsw
 src/wxvc_dll.dsp
 src/wxvc_dll.dsw

-src/jpeg/jpeg.dsp
-src/jpeg/jpeg.dsw
-
 samples/checklst/ChecklstVC.dsp
 samples/checklst/ChecklstVC.dsw

--- a/docs/gtk/changes.txt
+++ b/docs/gtk/changes.txt
@@ -1,78 +1,4 @@

-25th October '99: My birthday, wxWindows 2.1.10 released
-
-Enlightment has struck the majority of the developers and
-they have chosen ti use the Linux kernel numbering scheme
-for wxWindows from now on. This means that the next stable
-release will be called wxWindows 2.2.X, development snapshots
-will be called 2.1.X.
-
-A lot of discussion has been wasted on how to maintain a
-once released stable version will be maintained. It was
-almost universally agreed that only a commercial entity
-will have the motivation ($$$) to do that - so far there
-is no wxWindows Inc.
-
-Support for GTK 1.0 has been dropped.
-
-Many build fixes for various platforms have been applied,
-try again, poor HP-UX and *BSD users, but don't reckon
-with immediate success.
-
-My total rewrite of the wxWindows underlying GTK widget
-has turned scrolling including subwindows from barely
-functional to pretty and fast.
-
-wxSocket and Co. have been improved up to the point of
-calling it a rewrite. It works on wxMSW now too and
-seems pretty stable, but testing is still welcome.
-
-The ODBC classes contributed by Remstar Inc. have been
-overhauled (incl the sample) and have been tested with
-all relevant SQL databases (even DBase). For that reason
-I have reawakened the iODBC code from wxGTK 2.0 so you
-can now use wxODBC from wxMSW and wxGTK.
-
-Several printing things fixed.
-
-HTML widget and its wxWindows' help system based upon
-it have been reorganized and improved for easier use
-from Python and C++.
-
-wxSpinCtrl added. Like a wxSpinButton and a wxTextCtrl.
-
-Changed the beaviour of the popular new wxFileDialog to
-not forget the once typed file name when changing the
-directory.
-
-Implemented the wxSIMPLE_BORDER flag (simple black line
-without shadow affect).
-
-Michael is writing a complete rewrite of the antiquated
-wxGrid. This is still work-in-progress and might not make
-it into wxWindows 2.2, we'll see. Help would be welcome
-to make that happen.
-
-Made wxMenu code lose less memory, also added wxMenu::Delete().
-
-Added code to send wxActivateEvent to MDI windows.
-
-Vadim added configure things to compile wxWindows without any
-GUI library. This is probably work in progress. He'll also add
-a wxFontEnumerator class and has enhanced wxFont to make use
-of char-encodings.
-
-wxSlider, wxWindow, wxScrollBar now emit the correct events
-for scrolling (like page up, line up etc) instead of just
-"thumb-track" as before.
-
-Corrected bug in Reparent() code.
-
-A handler to read PCX file (in most variants) has been added.
-
-A number of problems with compressed and socket streams have
-been solved.
-
 28th August '99: Ninth wxGTK 2.1 snapshot released

 As the old makefile system didn't work, I trashed it and wrote
--- a/docs/latex/wx/evthand.tex
+++ b/docs/latex/wx/evthand.tex
@@ -118,9 +118,9 @@ Gets the pointer to the next handler in the chain.

 \wxheading{See also}

-\helpref{wxEvtHandler::SetNextHandler}{wxevthandlersetnexthandler},\rtfsp
 \helpref{wxEvtHandler::GetPreviousHandler}{wxevthandlergetprevioushandler},\rtfsp
 \helpref{wxEvtHandler::SetPreviousHandler}{wxevthandlersetprevioushandler},\rtfsp
+\helpref{wxEvtHandler::SetNextHandler}{wxevthandlersetnexthandler},\rtfsp
 \helpref{wxWindow::PushEventHandler}{wxwindowpusheventhandler},\rtfsp
 \helpref{wxWindow::PopEventHandler}{wxwindowpopeventhandler}

@@ -132,9 +132,9 @@ Gets the pointer to the previous handler in the chain.

 \wxheading{See also}

+\helpref{wxEvtHandler::GetPreviousHandler}{wxevthandlergetprevioushandler},\rtfsp
+\helpref{wxEvtHandler::SetPreviousHandler}{wxevthandlersetprevioushandler},\rtfsp
 \helpref{wxEvtHandler::SetPreviousHandler}{wxevthandlersetprevioushandler},\rtfsp
-\helpref{wxEvtHandler::GetNextHandler}{wxevthandlergetnexthandler},\rtfsp
-\helpref{wxEvtHandler::SetNextHandler}{wxevthandlersetnexthandler},\rtfsp
 \helpref{wxWindow::PushEventHandler}{wxwindowpusheventhandler},\rtfsp
 \helpref{wxWindow::PopEventHandler}{wxwindowpopeventhandler}

--- a/docs/latex/wx/listbox.tex
+++ b/docs/latex/wx/listbox.tex
@@ -7,8 +7,7 @@ is selected, the previous selection is removed) or multiple selection
 (clicking an item toggles the item on or off independently of other
 selections).

-List box elements are numbered from zero. Their number is limited in
-some platforms (e.g. ca. 2000 on GTK).
+List box elements are numbered from zero.

 A listbox callback gets an event wxEVT\_COMMAND\_LISTBOX\_SELECT for single clicks, and
 wxEVT\_COMMAND\_LISTBOX\_DOUBLE\_CLICKED for double clicks.
--- a/docs/latex/wx/pagedlg.tex
+++ b/docs/latex/wx/pagedlg.tex
@@ -117,27 +117,25 @@ instead of showing a dialog. Windows only.

 \constfunc{wxPoint}{GetMarginTopLeft}{\void}

-Returns the left (x) and top (y) margins in millimetres.
+Returns the left (x) and top (y) margins.

 \membersection{wxPageSetupDialogData::GetMarginBottomRight}\label{wxpagesetupdialogdatagetmarginbottomright}

 \constfunc{wxPoint}{GetMarginBottomRight}{\void}

-Returns the right (x) and bottom (y) margins in millimetres.
+Returns the right (x) and bottom (y) margins.

 \membersection{wxPageSetupDialogData::GetMinMarginTopLeft}\label{wxpagesetupdialogdatagetminmargintopleft}

 \constfunc{wxPoint}{GetMinMarginTopLeft}{\void}

-Returns the left (x) and top (y) minimum margins the user can enter (Windows only). Units
-are in millimetres
+Returns the left (x) and top (y) minimum margins the user can enter (Windows only).

 \membersection{wxPageSetupDialogData::GetMinMarginBottomRight}\label{wxpagesetupdialogdatagetminmarginbottomright}

 \constfunc{wxPoint}{GetMinMarginBottomRight}{\void}

-Returns the right (x) and bottom (y) minimum margins the user can enter (Windows only). Units
-are in millimetres
+Returns the right (x) and bottom (y) minimum margins the user can enter (Windows only).

 \membersection{wxPageSetupDialogData::GetPaperId}\label{wxpagesetupdialogdatagetpaperid}

@@ -171,33 +169,31 @@ instead of showing a dialog. Windows only.
 \func{void}{SetDefaultMinMargins}{\param{bool}{ flag}}

 Pass TRUE if the page setup dialog will take its minimum margin values from the currently
-selected printer properties. Windows only. Units are in millimetres
+selected printer properties. Windows only.

 \membersection{wxPageSetupDialogData::SetMarginTopLeft}\label{wxpagesetupdialogdatasetmargintopleft}

 \func{void}{GetMarginTopLeft}{\param{const wxPoint\& }{pt}}

-Sets the left (x) and top (y) margins in millimetres.
+Sets the left (x) and top (y) margins.

 \membersection{wxPageSetupDialogData::SetMarginBottomRight}\label{wxpagesetupdialogdatasetmarginbottomright}

 \func{void}{SetMarginBottomRight}{\param{const wxPoint\& }{pt}}

-Sets the right (x) and bottom (y) margins in millimetres.
+Sets the right (x) and bottom (y) margins.

 \membersection{wxPageSetupDialogData::SetMinMarginTopLeft}\label{wxpagesetupdialogdatasetminmargintopleft}

 \func{void}{SetMinMarginTopLeft}{\param{const wxPoint\& }{pt}}

-Sets the left (x) and top (y) minimum margins the user can enter (Windows only). Units are
-in millimetres.
+Sets the left (x) and top (y) minimum margins the user can enter (Windows only).

 \membersection{wxPageSetupDialogData::SetMinMarginBottomRight}\label{wxpagesetupdialogdatasetminmarginbottomright}

 \func{void}{SetMinMarginBottomRight}{\param{const wxPoint\& }{pt}}

-Sets the right (x) and bottom (y) minimum margins the user can enter (Windows only). Units are
-in millimetres.
+Sets the right (x) and bottom (y) minimum margins the user can enter (Windows only).

 \membersection{wxPageSetupDialogData::SetPaperId}\label{wxpagesetupdialogdatasetpaperid}

@@ -289,3 +285,4 @@ Returns the \helpref{page setup data}{wxpagesetupdialogdata} associated with the
 Shows the dialog, returning wxID\_OK if the user pressed OK, and wxID\_CANCEL
 otherwise.

+
--- a/docs/latex/wx/scrolwin.tex
+++ b/docs/latex/wx/scrolwin.tex
@@ -14,12 +14,6 @@ If you don't wish to calculate your own scrolling, you must call PrepareDC when
 within OnDraw, to set the device origin for the device context according to the current
 scroll position.

-Note that the underlying system knows nothing about scrolling coordinates, so that all system
-functions (mouse events, expose events, refresh calls etc) as well as the position of subwindows 
-are relative to the "physical" origin of the scrolled window. If the user insert a child window at
-position (10,10) and scrolls the window down 100 pixels (moving the child window out of the visible
-area), the child window will report a position of (10,-90).
-
 \wxheading{Derived from}

 \helpref{wxPanel}{wxpanel}\\
@@ -145,9 +139,7 @@ Enable or disable physical scrolling in the given direction. Physical
 scrolling is the physical transfer of bits up or down the
 screen when a scroll event occurs. If the application scrolls by a
 variable amount (e.g. if there are different font sizes) then physical
-scrolling will not work, and you should switch it off. Note that you
-will have to reposition child windows yourself, if physical scrolling
-is disabled.
+scrolling will not work, and you should switch it off.

 \wxheading{Parameters}

--- a/docs/latex/wx/tunicode.tex
+++ b/docs/latex/wx/tunicode.tex
@@ -47,7 +47,6 @@ be compiled either in ANSI (traditional) mode or in the Unicode one.

 This can be achieved quite simply by using the means provided by wxWindows.
 Basicly, there are only a few things to watch out for:
-
 \begin{itemize}
 \item Character type ({\tt char} or {\tt wchar\_t})
 \item Literal strings (i.e. {\tt "Hello, world!"} or {\tt '*'})
@@ -126,7 +125,6 @@ don't forget to enclose all string literals inside {\tt T()} macro, your
 program automatically becomes (almost) Unicode compliant!

 Just let us state once again the rules:
-
 \begin{itemize}
 \item Always use {\tt wxChar} instead of {\tt char}
 \item Always enclose literal string constants in {\tt T()} macro unless
@@ -156,5 +154,3 @@ useful, is \helpref{wc\_str()}{wxstringwcstr} function which always returns
 the Unicode string.

 % TODO describe fn_str(), wx_str(), wxCharBuf classes, ...
-% Please remember to put a blank line at the end of each file! (Tex2RTF 'issue')
-
--- a/docs/latex/wx/window.tex
+++ b/docs/latex/wx/window.tex
@@ -28,10 +28,10 @@ window class or on all platforms.
 \twocolwidtha{5cm}%
 \begin{twocollist}\itemsep=0pt
 \twocolitem{\windowstyle{wxSIMPLE\_BORDER}}{Displays a thin border around the window. wxBORDER is the old name
-for this style. }
+for this style. Windows only. }
 \twocolitem{\windowstyle{wxDOUBLE\_BORDER}}{Displays a double border. Windows only.}
 \twocolitem{\windowstyle{wxSUNKEN\_BORDER}}{Displays a sunken border.}
-\twocolitem{\windowstyle{wxRAISED\_BORDER}}{Displays a raised border. GTK only. }
+\twocolitem{\windowstyle{wxRAISED\_BORDER}}{Displays a raised border.}
 \twocolitem{\windowstyle{wxSTATIC\_BORDER}}{Displays a border suitable for a static control. Windows only. }
 \twocolitem{\windowstyle{wxTRANSPARENT\_WINDOW}}{The window is transparent, that is, it will not receive paint
 events. Windows only.}
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -92,12 +92,7 @@ Using project files:
   src/Release/wxvc.lib.  The project file src/wxvc_dll.dsp
   will make a DLL version of wxWindow, which will go in
   src/DebugDLL/wxvc.[lib,dll] and src/ReleaseDLL/wxvc.[lib,dll].
-3. If you want to use JPEG in your application (such as the image
-   sample), open src/jpeg/jpeg.dsp (VC++ 6 only) and compile in
-   Debug and Release configurations. If you have VC++ 5 or
-   earlier, use makefile.vc, but you may only have one set of object
-   files at a time in use (debug or release).
-4. Open a sample project file, choose a configuration, and compile.
+3. Open a sample project file, choose a configuration, and compile.
   The project files don't use precompiled headers, to save
   space, but you can switch PCH compiling on for greater speed.

@@ -115,10 +110,8 @@ Using makefiles:

   to make the wxWindows core library without debug information
   (wx\lib\wx.lib).
-3. If you wish to use JPEG in your applications, do the same
-   procedure in src\jpeg but add the 'all' target to the
-   command line.
-4. Change directory to wx\samples and type 'nmake -f makefile.vc'
+
+3. Change directory to wx\samples and type 'nmake -f makefile.vc'
   to make all the samples. You can also make them individually.

 Notes:
--- a/include/wx/arrimpl.cpp
+++ b/include/wx/arrimpl.cpp
@@ -21,7 +21,7 @@
 *****************************************************************************/

 // needed to resolve the conflict between global T and macro parameter T
-#define _WX_ERROR_REMOVE2(x)     wxT("bad index in " #x "::Remove()")
+#define _WX_ERROR_REMOVE2(x)     T("bad index in " #x "::Remove()")

 // macro implements remaining (not inline) methods of template list
 // (it's private to this file)
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -28,7 +28,7 @@ class wxCharBuffer
 public:
    wxCharBuffer(const char *str)
    {
-        wxASSERT_MSG( str, wxT("NULL string in wxCharBuffer") );
+        wxASSERT_MSG( str, T("NULL string in wxCharBuffer") );

        m_str = str ? strdup(str) : (char *)NULL;
    }
@@ -67,7 +67,7 @@ class wxWCharBuffer
 public:
    wxWCharBuffer(const wchar_t *wcs)
    {
-        wxASSERT_MSG( wcs, wxT("NULL string in wxWCharBuffer") );
+        wxASSERT_MSG( wcs, T("NULL string in wxWCharBuffer") );

        if (wcs) {
          size_t siz = (wcslen(wcs)+1)*sizeof(wchar_t);
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -5,20 +5,13 @@
 //              source such as opening and closing the data source.
 // Author:      Doug Card
 // Modified by:
-// Mods:        Dec, 1998: 
-//                -Added support for SQL statement logging and database cataloging
-//					 April, 1999
-//						-Added QUERY_ONLY mode support to reduce default number of cursors
-//						-Added additional SQL logging code
-//                -Added DEBUG-ONLY tracking of Ctable objects to detect orphaned DB connections
-//						-Set ODBC option to only read committed writes to the DB so all
-//                   databases operate the same in that respect
-//
+// Mods:        Dec, 1998: Added support for SQL statement logging and database
+//              cataloging
 // Created:     9.96
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 Remstar International, Inc.
 // Licence:     wxWindows licence, plus:
-// Notice:		 This class library and its intellectual design are free of charge for use,
+// Notice:		This class library and its intellectual design are free of charge for use,
 //              modification, enhancement, debugging under the following conditions:
 //              1) These classes may only be used as part of the implementation of a
 //                 wxWindows-based application
@@ -37,85 +30,54 @@

 #ifndef DB_DOT_H
 #define DB_DOT_H
-
-// Use this line for wxWindows v1.x
-//#include "wx_ver.h"
-// Use this line for wxWindows v2.x
-#include "wx/version.h"
-
-#if wxMAJOR_VERSION == 2
-	#ifdef __GNUG__
-	#pragma interface "db.h"
-	#endif
+ 
+#ifdef __GNUG__
+#pragma interface "db.h"
 #endif

-#if defined(wx_msw) || defined(__WXMSW__) || defined(WIN32)
+#if defined(__WXMSW__) || defined(WIN32)
 #include <windows.h>
 #endif

-#ifdef _IODBC_
-#if wxMAJOR_VERSION == 2
-	extern "C" {
-	#include "../../src/iodbc/isql.h"
-	#include "../../src/iodbc/isqlext.h"
-	}
-#else  // version == 1
-	extern "C" {
-	#include "iodbc.h"
-	#include "isqlext.h"
-	}
-#endif
-	typedef float SFLOAT; 
-	typedef double SDOUBLE; 
-	typedef unsigned int UINT;
-	#define ULONG UDWORD
-#else  // msw
-	#define ODBCVER 0x0250
-	#include <sql.h>
-	#include <sqlext.h>
-#endif

-#ifdef __UNIX__
-#   ifndef strnicmp 
-#      define strnicmp strncasecmp 
-#   endif 
-#   ifndef stricmp 
-#      define stricmp strcasecmp 
-#   endif 
-#else 
-#   include <io.h> 
+#ifdef __WXGTK__
+
+extern "C" {
+#include "../../src/iodbc/isql.h"
+#include "../../src/iodbc/isqlext.h"
+typedef float         SFLOAT;
+typedef double        SDOUBLE;
+typedef unsigned int  UINT;
+#define ULONG UDWORD
+
+}
+
+#else
+
+#define ODBCVER 0x0250
+#include <sql.h>
+#include <sqlext.h>
+
 #endif

 enum		enumDummy		{enumDum1};

-#define SQL_C_BOOLEAN(datatype) (sizeof(datatype) == 1 ? SQL_C_UTINYINT : (sizeof(datatype) == 2 ? SQL_C_USHORT : SQL_C_ULONG))
-//	#define SQL_C_BOOLEAN (sizeof(Bool) == 2 ? SQL_C_USHORT : SQL_C_ULONG)
-
-#define SQL_C_ENUM (sizeof(enumDummy) == 2 ? SQL_C_USHORT : SQL_C_ULONG)
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-const int DB_PATH_MAX							= 254;
+#define SQL_C_BOOLEAN (sizeof(int) == 2 ? SQL_C_USHORT : SQL_C_ULONG)
+#define SQL_C_ENUM (sizeof(enumDummy) == 2 ? SQL_C_USHORT : SQL_C_ULONG)    //glt 2-21-97

 // Database Globals
 const int DB_TYPE_NAME_LEN						= 40;
-const int DB_MAX_STATEMENT_LEN				= 2048;
-const int DB_MAX_WHERE_CLAUSE_LEN			= 1024;
-const int DB_MAX_ERROR_MSG_LEN				= 512;
-const int DB_MAX_ERROR_HISTORY				= 5;
+const int DB_MAX_STATEMENT_LEN					= 2048;
+const int DB_MAX_WHERE_CLAUSE_LEN				= 1024;
+const int DB_MAX_ERROR_MSG_LEN					= 512;
+const int DB_MAX_ERROR_HISTORY					= 5;
 const int DB_MAX_TABLE_NAME_LEN				= 128;
 const int DB_MAX_COLUMN_NAME_LEN				= 128;

-const int DB_DATA_TYPE_VARCHAR				= 1;
-const int DB_DATA_TYPE_INTEGER				= 2;
+const int DB_DATA_TYPE_VARCHAR					= 1;
+const int DB_DATA_TYPE_INTEGER					= 2;
 const int DB_DATA_TYPE_FLOAT					= 3;
-const int DB_DATA_TYPE_DATE					= 4;
+const int DB_DATA_TYPE_DATE						= 4;

 const int DB_SELECT_KEYFIELDS					= 1;
 const int DB_SELECT_WHERE						= 2;
@@ -130,7 +92,14 @@ const int DB_DEL_WHERE							= 2;
 const int DB_DEL_MATCHING						= 3;

 const int DB_WHERE_KEYFIELDS					= 1;
-const int DB_WHERE_MATCHING					= 2;
+const int DB_WHERE_MATCHING						= 2;
+
+const int DB_CURSOR0								= 0;
+const int DB_CURSOR1								= 1;
+const int DB_CURSOR2								= 2;
+//const int DB_CURSOR3							= 3;
+//const int DB_CURSOR4							= 4;
+//const int DB_CURSOR5							= 5;

 const int DB_GRANT_SELECT						= 1;
 const int DB_GRANT_INSERT						= 2;
@@ -141,8 +110,8 @@ const int DB_GRANT_ALL							= DB_GRANT_SELECT | DB_GRANT_INSERT | DB_GRANT_UPDA
 // ODBC Error codes (derived from ODBC SqlState codes)
 enum ODBC_ERRORS
 {
-	DB_FAILURE										= 0,
-	DB_SUCCESS										= 1,
+	DB_FAILURE									= 0,
+	DB_SUCCESS									= 1,
 	DB_ERR_NOT_IN_USE,
 	DB_ERR_GENERAL_WARNING,									// SqlState = '01000'
 	DB_ERR_DISCONNECT_ERROR,								// SqlState = '01002'
@@ -238,15 +207,9 @@ enum ODBC_ERRORS
 struct DbStuff
 {
 	HENV Henv;
-	char Dsn[SQL_MAX_DSN_LENGTH+1];				// Data Source Name
-	char Uid[20+1];									// User ID
-	char AuthStr[20+1];								// Authorization string (password)
-
-	char description[SQL_MAX_DSN_LENGTH+1];	// Not sure what the max length is
-	char fileType[SQL_MAX_DSN_LENGTH+1];		// Not sure what the max length is
-
-	// Optionals needed for some databases like dBase
-	char defaultDir[DB_PATH_MAX];					// Directory that db file resides in
+	char Dsn[SQL_MAX_DSN_LENGTH+1];	// Data Source Name
+	char Uid[20];							// User ID
+	char AuthStr[20];						// Authorization string (password)
 };

 typedef struct
@@ -273,30 +236,6 @@ enum sqlLog
 	sqlLogON
 };

-enum dbms
-{
-	dbmsUNIDENTIFIED,
-	dbmsORACLE,
-	dbmsSYBASE_ASA,		// Adaptive Server Anywhere
-	dbmsSYBASE_ASE,		// Adaptive Server Enterprise
-	dbmsMS_SQL_SERVER,
-	dbmsMY_SQL,
-	dbmsPOSTGRES,
-	dbmsACCESS,
-	dbmsDBASE
-};
-
-typedef enum dbms DBMS;
-
-// The wxDB::errorList is copied to this variable when the wxDB object
-// is closed.  This way, the error list is still available after the
-// database object is closed.  This is necessary if the database 
-// connection fails so the calling application can show the operator
-// why the connection failed.  Note: as each wxDB object is closed, it
-// will overwrite the errors of the previously destroyed wxDB object in 
-// this variable.
-extern char DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
-
 class WXDLLEXPORT wxDB
 {
 private:
@@ -322,7 +261,7 @@ public:
 	struct
 	{
 		char   dbmsName[40];								// Name of the dbms product
-		char   dbmsVer[64];								// Version # of the dbms product
+		char   dbmsVer[40];								// Version # of the dbms product
 		char   driverName[40];							// Driver name
 		char   odbcVer[60];								// ODBC version of the driver
 		char   drvMgrOdbcVer[60];						// ODBC version of the driver manager
@@ -369,9 +308,6 @@ public:
 	//Error reporting mode
 	bool silent;

-	// Number of Ctable objects connected to this db object
-	unsigned int nTables;
-
 	// Inf. about logical data types VARCHAR, INTEGER, FLOAT and DATE.
 	// This inf. is obtained from the ODBC driver by use of the
 	// SQLGetTypeInfo() function.  The key piece of inf. is the
@@ -388,28 +324,24 @@ public:
 	bool		 DispAllErrors(HENV aHenv, HDBC aHdbc = SQL_NULL_HDBC, HSTMT aHstmt = SQL_NULL_HSTMT);
 	bool		 GetNextError(HENV aHenv, HDBC aHdbc = SQL_NULL_HDBC, HSTMT aHstmt = SQL_NULL_HSTMT);
 	void		 DispNextError(void);
-	bool		 CreateView(char *viewName, char *colList, char *pSqlStmt, bool attemptDrop=TRUE);
-	bool		 DropView(char *viewName);
+	bool		 CreateView(char *viewName, char *colList, char *pSqlStmt);
 	bool		 ExecSql(char *pSqlStmt);
-	bool		 GetNext(void);
-	bool		 GetData(UWORD colNo, SWORD cType, PTR pData, SDWORD maxLen, SDWORD FAR *cbReturned);
 	bool	    Grant(int privileges, char *tableName, char *userList = "PUBLIC");
 	int	    TranslateSqlState(char *SQLState);
 	bool		 Catalog(char *userID, char *fileName = "Catalog.txt");
-	CcolInf	*GetColumns(char *tableName[], char *userID=NULL);
+	CcolInf	*GetColumns(char *tableName[]);
 	char		*GetDatabaseName(void)	{return dbInf.dbmsName;}
 	char		*GetDataSource(void)		{return dsn;}
-	char		*GetUsername(void)			{return uid;}
-	char		*GetPassword(void)			{return authStr;}
+	char		*GetUsername(void)		{return uid;}
+	char		*GetPassword(void)		{return authStr;}
 	bool		 IsOpen(void)				{return dbIsOpen;}
 	HENV		 GetHENV(void)				{return henv;}
 	HDBC		 GetHDBC(void)				{return hdbc;}
-	HSTMT		 GetHSTMT(void)				{return hstmt;}
-	bool		 TableExists(char *tableName, char *userID=NULL, char *path=NULL);  // Table name can refer to a table, view, alias or synonym
+	HSTMT		 GetHSTMT(void)			{return hstmt;}
+	bool		 TableExists(char *tableName);  // Table name can refer to a table, view, alias or synonym
 	void		 LogError(char *errMsg, char *SQLState = 0) {logError(errMsg, SQLState);}
 	bool		 SqlLog(enum sqlLog state, char *filename = "sqllog.txt", bool append = FALSE);
 	bool		 WriteSqlLog(char *logMsg);
-	DBMS		 Dbms(void);

 };  // wxDB

@@ -427,18 +359,6 @@ struct DbList
 	DbList *PtrNext;							// Pointer to next item in the list
 };

-
-#if __WXDEBUG__ > 0
-#include "wx/object.h"
-class CstructTablesInUse : public wxObject
-{
-	public:
-		const char	*tableName;
-		ULONG			 tableID;
-		class wxDB	*pDb;
-};  // CstructTablesInUse
-#endif
-
 // The following routines allow a user to get new database connections, free them
 // for other code segments to use, or close all of them when the application has
 // completed.
@@ -448,9 +368,6 @@ bool  WXDLLEXPORT FreeDbConnection(wxDB *pDb);
 void  WXDLLEXPORT CloseDbConnections(void);
 int   WXDLLEXPORT NumberDbConnectionsInUse(void);

-// This function sets the sql log state for all open wxDB objects
-bool SqlLog(enum sqlLog state, char *filename = "sqllog.txt");
-
 // This routine allows you to query a driver manager
 // for a list of available datasources.  Call this routine
 // the first time using SQL_FETCH_FIRST.  Continue to call it
--- a/include/wx/dbtable.h
+++ b/include/wx/dbtable.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        dbtable.h
+// Name:        table.h
 // Purpose:     Declaration of the wxTable class.
 // Author:      Doug Card
 // Modified by:
@@ -23,30 +23,16 @@
 // SYNOPSIS STOP
 */

-#ifndef DBTABLE_DOT_H
-#define DBTABLE_DOT_H
+#ifndef TABLE_DOT_H
+#define TABLE_DOT_H

-// Use this line for wxWindows v1.x
-//#include "wx_ver.h"
-// Use this line for wxWindows v2.x
-#include "wx/version.h"
-
-#if wxMAJOR_VERSION == 2
-	#ifdef __GNUG__
-	#pragma interface "dbtable.h"
-	#endif
+#ifdef __GNUG__
+#pragma interface "dbtable.h"
 #endif

-#if wxMAJOR_VERSION == 2
-	#include "wx/db.h"
-#else
-	#include "db.h"
-#endif
+#include "wx/db.h"

-const int	ROWID_LEN			= 24;  // 18 is the max, 24 is in case it gets larger
-const int	DEFAULT_CURSOR		= 0;
-const bool	QUERY_ONLY			= TRUE;
-const bool  DISABLE_VIEW		= TRUE;
+const int ROWID_LEN = 24;  // 18 is the max, 24 is in case it gets larger

 // The following class is used to define a column of a table.
 // The wxTable constructor will dynamically allocate as many of
@@ -60,7 +46,7 @@ const bool  DISABLE_VIEW		= TRUE;
 class WXDLLEXPORT CcolDef
 {
 public:
-	char    ColName[DB_MAX_COLUMN_NAME_LEN+1];	// Column Name
+	char    ColName[DB_MAX_COLUMN_NAME_LEN+1];	// Column Name  glt 4/19/97 added one for the null terminator
 	int     DbDataType;									// Logical Data Type; e.g. DB_DATA_TYPE_INTEGER
 	int     SqlCtype;										// C data type; e.g. SQL_C_LONG
 	void   *PtrDataObj;									// Address of the data object
@@ -70,14 +56,13 @@ public:
 	bool    InsertAllowed;								// Specifies whether this column should be included in an INSERT statement
 	bool    DerivedCol;									// Specifies whether this column is a derived value
 	SDWORD  CbValue;										// Internal use only!!!
-	bool	  Null;											// NOT FULLY IMPLEMENTED - Allows NULL values in Inserts and Updates
 };  // CcolDef

 // This structure is used when creating secondary indexes.
 class WXDLLEXPORT CidxDef
 {
 public:
-	char ColName[DB_MAX_COLUMN_NAME_LEN+1];
+	char ColName[DB_MAX_COLUMN_NAME_LEN+1];	// Column Name  glt 4/19/97 added one for the null terminator
 	bool Ascending;
 };  // CidxDef

@@ -85,10 +70,8 @@ class WXDLLEXPORT wxTable
 {
 private:

-	ULONG	tableID;  // Used for debugging.  This can help to match up mismatched constructors/destructors
-
 	// Private member variables
-	UDWORD cursorType;
+	int currCursorNo;

 	// Private member functions
 	bool bindInsertParams(void);
@@ -108,20 +91,17 @@ public:
 	HENV  henv;							// ODBC Environment handle
 	HDBC  hdbc;							// ODBC DB Connection handle
 	HSTMT hstmt;						// ODBC Statement handle
-	HSTMT *hstmtDefault;				// Default cursor
+//	HSTMT c0, c1, c2, c3, c4, c5;	// Cursors 0 through 5
+	HSTMT c0, c1, c2;					// Limited to Cursors 0 through 2 for now
 	HSTMT hstmtInsert;				// ODBC Statement handle used specifically for inserts
 	HSTMT hstmtDelete;				// ODBC Statement handle used specifically for deletes
 	HSTMT hstmtUpdate;				// ODBC Statement handle used specifically for updates
-	HSTMT hstmtInternal;				// ODBC Statement handle used internally only
-	HSTMT *hstmtCount;				// ODBC Statement handle used by Count() function (No binding of columns)
+	HSTMT hstmtCount;					// ODBC Statement handle used specifically for COUNT(*)

 	// Table Inf.
 	char tableName[DB_MAX_TABLE_NAME_LEN+1];			// Table name
 	char queryTableName[DB_MAX_TABLE_NAME_LEN+1];	// Query Table Name
 	int  noCols;												// # of columns in the table
-	bool queryOnly;											// Query Only, no inserts, updates or deletes
-
-	char tablePath[DB_PATH_MAX];  // needed for dBase tables

 	// Column Definitions
 	CcolDef *colDefs;	// Array of CcolDef structures
@@ -129,20 +109,17 @@ public:
 	// Where, Order By and From clauses
 	char *where;			// Standard SQL where clause, minus the word WHERE
 	char *orderBy;			// Standard SQL order by clause, minus the ORDER BY
-	char *from;				// Allows for joins in a wxTable::Query().  Format: ",tbl,tbl..."
+	char *from;				// Allows for joins in a Ctable::Query().  Format: ",tbl,tbl..."

 	// Flags
 	bool selectForUpdate;

 	// Public member functions
-	wxTable(wxDB *pwxDB, const char *tblName, const int nCols,
-		const char *qryTblName = 0, bool qryOnly = !QUERY_ONLY, char *tblPath=NULL);
+	wxTable(wxDB *pwxDB, const char *tblName, const int nCols, const char *qryTblName = 0);
 	virtual ~wxTable();
 	bool	Open(void);
-	bool	CreateTable(bool attemptDrop=TRUE);
-	bool	DropTable(void);
-	bool	CreateIndex(char * idxName, bool unique, int noIdxCols, CidxDef *pIdxDefs, bool attemptDrop=TRUE);
-	bool	DropIndex(char * idxName);
+	bool	CreateTable(void);
+	bool	CreateIndex(char * idxName, bool unique, int noIdxCols, CidxDef *pIdxDefs);
 	bool	CloseCursor(HSTMT cursor);
 	int   Insert(void);
 	bool	Update(void);
@@ -177,19 +154,11 @@ public:
 	void  SetColDefs (int index, char *fieldName, int dataType, void *pData, int cType,
 							int size, bool keyField = FALSE, bool upd = TRUE,
 							bool insAllow = TRUE, bool derivedCol = FALSE);
-	HSTMT *NewCursor(bool setCursor = FALSE, bool bindColumns = TRUE);
-	bool	DeleteCursor(HSTMT *hstmtDel);
-	void	SetCursor(HSTMT *hstmtActivate = (void **) DEFAULT_CURSOR);
-	HSTMT GetCursor(void) { return(hstmt); }
+	bool	SetCursor(int cursorNo = DB_CURSOR0);
+	int	GetCursor(void) { return(currCursorNo); }
 	ULONG Count(void);
 	int   DB_STATUS(void) { return(pDb->DB_STATUS); }
 	bool	Refresh(void);
-	bool	SetNull(int colNo);
-	bool	SetNull(char *colName);
-
-#if __WXDEBUG__ > 0
-	ULONG	GetTableID() { return tableID; };
-#endif

 };  // wxTable

--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -47,6 +47,10 @@
        #endif
    #endif // Sun

+    #if defined(__hpux) && !defined(__HPUX__)
+        #define __HPUX__
+    #endif // HP-UX
+
 #elif defined(applec) || defined(THINK_C) || ( defined( __MWERKS__ ) && !defined(__INTEL__) )
        // MacOS
 #elif defined(__OS2__)
@@ -202,12 +206,6 @@
 #undef PACKAGE
 #undef VERSION

-// this has to be done after including setup.h which might
-// define __HPUX__ 1 itself
-#if defined(__hpux) && !defined(__HPUX__)
-    #define __HPUX__
-#endif // HP-UX
-
 // if we're on a Unixsystem but didn't use configure (so that setup.h didn't
 // define __UNIX__), do define __UNIX__ now
 #if !defined(__UNIX__) && defined(__UNIX_LIKE__)
@@ -875,11 +873,11 @@ enum wxStretch
 /*
 * wxGauge flags
 */
+#define wxGA_PROGRESSBAR     0x0004
 #define wxGA_HORIZONTAL      wxHORIZONTAL
 #define wxGA_VERTICAL        wxVERTICAL
-#define wxGA_PROGRESSBAR     0x0010
 // Windows only
-#define wxGA_SMOOTH          0x0020
+#define wxGA_SMOOTH          0x0010

 /*
 * wxSlider flags
--- a/include/wx/dialup.h
+++ b/include/wx/dialup.h
@@ -19,14 +19,12 @@
 #if wxUSE_DIALUP_MANAGER

 // ----------------------------------------------------------------------------
-// misc
+// constants
 // ----------------------------------------------------------------------------

-class WXDLLEXPORT wxArrayString;
-
 extern const wxChar *wxEmptyString;

-#define WXDIALUP_MANAGER_DEFAULT_BEACONHOST  wxT("www.yahoo.com")
+#define WXDIALUP_MANAGER_DEFAULT_BEACONHOST  T("www.yahoo.com")

 // ----------------------------------------------------------------------------
 // A class which groups functions dealing with connecting to the network from a
@@ -67,17 +65,8 @@ public:
    // operations
    // ----------

-    // fills the array with the names of all possible values for the first
-    // parameter to Dial() on this machine and returns their number (may be 0)
-    virtual size_t GetISPNames(wxArrayString& names) const = 0;
-
    // dial the given ISP, use username and password to authentificate
    //
-    // if no nameOfISP is given, the function will select the default one
-    //
-    // if no username/password are given, the function will try to do without
-    // them, but will ask the user if really needed
-    //
    // if async parameter is FALSE, the function waits until the end of dialing
    // and returns TRUE upon successful completion.
    // if async is TRUE, the function only initiates the connection and returns
@@ -101,14 +90,6 @@ public:
    // online status
    // -------------

-    // returns TRUE if the computer has a permanent network connection (i.e. is
-    // on a LAN) and so there is no need to use Dial() function to go online
-    //
-    // NB: this functions tries to guess the result and it is not always
-    //     guaranteed to be correct, so it's better to ask user for
-    //     confirmation or give him a possibility to override it
-    virtual bool IsAlwaysOnline() const = 0;
-
    // returns TRUE if the computer is connected to the network: under Windows,
    // this just means that a RAS connection exists, under Unix we check that
    // the "well-known host" (as specified by SetWellKnownHost) is reachable
@@ -148,8 +129,8 @@ public:
    // Sets the commands to start up the network and to hang up again. Used by
    // the Unix implementations only.
    virtual void
-    SetConnectCommand(const wxString& commandDial = wxT("/usr/bin/pon"),
-                      const wxString& commandHangup = wxT("/usr/bin/poff")) = 0;
+    SetConnectCommand(const wxString& commandDial = T("/usr/bin/pon"),
+                      const wxString& commandHangup = T("/usr/bin/poff")) = 0;
 };

 // ----------------------------------------------------------------------------
@@ -183,7 +164,6 @@ typedef void (wxObject::*wxDialUpEventFunction)(wxDialUpEvent&);
 #define EVT_DIALUP_CONNECTED(func) { wxEVT_DIALUP_CONNECTED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDialUpEventFunction) & func, NULL},
 #define EVT_DIALUP_DISCONNECTED(func) { wxEVT_DIALUP_DISCONNECTED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDialUpEventFunction) & func, NULL},

-
 #endif // wxUSE_DIALUP_MANAGER

 #endif // _WX_NET_H
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -151,10 +151,10 @@ private:
 // template classes
 // ============================================================================

-// resolves the name conflict between the wxT() macor and T typedef: we can't
-// use wxT() inside WX_DEFINE_ARRAY!
-#define _WX_ERROR_SIZEOF   wxT("illegal use of DEFINE_ARRAY")
-#define _WX_ERROR_REMOVE   wxT("removing inexisting element in wxArray::Remove")
+// resolves the name conflict between the T() macor and T typedef: we can't
+// use T() inside WX_DEFINE_ARRAY!
+#define _WX_ERROR_SIZEOF   T("illegal use of DEFINE_ARRAY")
+#define _WX_ERROR_REMOVE   T("removing inexisting element in wxArray::Remove")

 // ----------------------------------------------------------------------------
 // This macro generates a new array class. It is intended for storage of simple
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -897,7 +897,7 @@ public:
    {
        // GetVeto() will return FALSE anyhow...
        wxCHECK_RET( m_canVeto,
-                     wxT("call to Veto() ignored (can't veto this event)") );
+                     T("call to Veto() ignored (can't veto this event)") );

        m_veto = veto;
    }
@@ -1319,7 +1319,7 @@ public:
    virtual void OnCommand(wxWindow& WXUNUSED(win),
                           wxCommandEvent& WXUNUSED(event))
    {
-        wxFAIL_MSG(wxT("shouldn't be called any more"));
+        wxFAIL_MSG(T("shouldn't be called any more"));
    }

    // Called if child control has no callback function
--- a/include/wx/ffile.h
+++ b/include/wx/ffile.h
@@ -51,7 +51,7 @@ public:
  bool Close();

  // assign an existing file descriptor and get it back from wxFFile object
-  void Attach(FILE *fp, const wxString& name = wxT(""))
+  void Attach(FILE *fp, const wxString& name = T(""))
    { Close(); m_fp = fp; m_name = name; }
  void Detach() { m_fp = NULL; }
  FILE *fp() const { return m_fp; }
--- a/include/wx/fileconf.h
+++ b/include/wx/fileconf.h
@@ -141,9 +141,9 @@ public:
    // New constructor: one size fits all. Specify wxCONFIG_USE_LOCAL_FILE or
    // wxCONFIG_USE_GLOBAL_FILE to say which files should be used.
  wxFileConfig(const wxString& appName,
-               const wxString& vendorName = wxT(""),
-               const wxString& localFilename = wxT(""),
-               const wxString& globalFilename = wxT(""),
+               const wxString& vendorName = T(""),
+               const wxString& localFilename = T(""),
+               const wxString& globalFilename = T(""),
               long style = wxCONFIG_USE_LOCAL_FILE);

    // dtor will save unsaved data
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -159,15 +159,15 @@ WXDLLEXPORT bool wxMkdir(const wxString& dir, int perm = 0777);
 WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);

 // separators in file names
-#define wxFILE_SEP_EXT        wxT('.')
-#define wxFILE_SEP_DSK        wxT(':')
-#define wxFILE_SEP_PATH_DOS   wxT('\\')
-#define wxFILE_SEP_PATH_UNIX  wxT('/')
+#define wxFILE_SEP_EXT        T('.')
+#define wxFILE_SEP_DSK        T(':')
+#define wxFILE_SEP_PATH_DOS   T('\\')
+#define wxFILE_SEP_PATH_UNIX  T('/')

 // separator in the path list (as in PATH environment variable)
 // NB: these are strings and not characters on purpose!
-#define wxPATH_SEP_DOS        wxT(";")
-#define wxPATH_SEP_UNIX       wxT(":")
+#define wxPATH_SEP_DOS        T(";")
+#define wxPATH_SEP_UNIX       T(":")

 // platform independent versions
 #ifdef  __UNIX__
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -195,7 +195,10 @@ private:
 // macros
 // ----------------------------------------------------------------------------

+#if !defined(__VISAGECPP__)
+// VZ: this is ugly (FIXME)
 #define M_FONTDATA GetFontData()
+#endif

 #endif
    // _WX_FONT_H_BASE_
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -18,7 +18,9 @@
 #   define wxFontDialog wxGenericFontDialog
 #   define sm_classwxFontDialog sm_classwxGenericFontDialog
 #elif defined(__WXPM__)
-#include "wx/os2/fontdlg.h"
+#include "wx/generic/fontdlgg.h"
+#   define wxFontDialog wxGenericFontDialog
+#   define sm_classwxFontDialog sm_classwxGenericFontDialog
 #elif defined(__WXSTUBS__)
 #include "wx/generic/fontdlgg.h"
 #   define wxFontDialog wxGenericFontDialog
--- a/include/wx/fontenum.h
+++ b/include/wx/fontenum.h
@@ -32,7 +32,7 @@ public:
    // enumerate the different encodings either for given font family or for
    // all font families - will result in OnFontEncoding() being called for
    // each available (family, encoding) couple
-    virtual bool EnumerateEncodings(const wxString& family = wxT(""));
+    virtual bool EnumerateEncodings(const wxString& family = T(""));

    // callbacks which are called after one of EnumerateXXX() functions from
    // above is invoked - all of them may return FALSE to stop enumeration or
--- a/include/wx/generic/filedlgg.h
+++ b/include/wx/generic/filedlgg.h
@@ -100,7 +100,7 @@ public:
                const wxSize &size = wxDefaultSize,
                long style = wxLC_LIST,
                const wxValidator &validator = wxDefaultValidator,
-                const wxString &name = wxT("filelist") );
+                const wxString &name = T("filelist") );
    void ChangeToListMode();
    void ChangeToReportMode();
    void ChangeToIconMode();
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
--- a/include/wx/generic/gridg.h
+++ b/include/wx/generic/gridg.h
@@ -352,12 +352,6 @@ public:
        : wxGenericGrid(parent, x, y, width, height, style, name)
        {
        }
-    wxGrid(wxWindow *parent, wxWindowID id, const wxPoint& pos,
-           const wxSize& size, long style = 0, const wxString& name = "grid")
-        : wxGenericGrid(parent, id, pos, size, style, name)
-        {
-        }
-
 };

 class WXDLLEXPORT wxGridEvent : public wxCommandEvent
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -54,7 +54,7 @@ public:
       @param newmsg if used, new message to display
       @returns true if ABORT button has not been pressed
   */
-   bool Update(int value = -1, const wxString& newmsg = wxT(""));
+   bool Update(int value = -1, const wxString& newmsg = T(""));

   /* Can be called to continue after the cancel button has been pressed, but
       the program decided to continue the operation (e.g., user didn't
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -281,7 +281,11 @@ public:
    }

 private:
-    friend class WXDLLEXPORT wxSplitterWindow;
+#ifdef __MWERKS__
+    friend class wxSplitterWindow;
+#else
+    friend wxSplitterWindow;
+#endif

    // data for the different types of event
    union
--- a/include/wx/grid.h
+++ b/include/wx/grid.h
@@ -1,7 +1,11 @@
 #ifndef _WX_GRID_H_BASE_
 #define _WX_GRID_H_BASE_

-#include "wx/generic/grid.h"
+#include "wx/generic/gridg.h"
+
+#ifndef wxGrid
+#define wxGrid wxGenericGrid
+#endif

 #endif
    // _WX_GRID_H_BASE_
--- a/include/wx/gtk/accel.h
+++ b/include/wx/gtk/accel.h
@@ -56,7 +56,8 @@ extern wxAcceleratorTable wxNullAcceleratorTable;

 class wxAcceleratorEntry: public wxObject
 {
-public:
+  public:
+
    wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0)
      { m_flags = flags; m_keyCode = keyCode; m_command = cmd; }

--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -80,7 +80,6 @@ private:
    /// Set to TRUE while we are in wxYield().
    bool m_suppressIdleEvents;

-private:
    DECLARE_DYNAMIC_CLASS(wxApp)
    DECLARE_EVENT_TABLE()
 };
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -43,57 +43,56 @@ extern const wxChar *wxButtonNameStr;

 class wxBitmapButton: public wxButton
 {
+  DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+
 public:
-    wxBitmapButton();
-    inline wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
+  wxBitmapButton();
+  inline wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
                         const wxValidator& validator = wxDefaultValidator,
                         const wxString& name = wxButtonNameStr )
-    {
-        Create(parent, id, bitmap, pos, size, style, validator, name);
-    }
-    bool Create( wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
+  {
+      Create(parent, id, bitmap, pos, size, style, validator, name);
+  }
+  bool Create( wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
               const wxValidator& validator = wxDefaultValidator,
               const wxString& name = wxButtonNameStr);
-    virtual void SetDefault();
+  virtual void SetDefault();
    
-    void SetLabel( const wxString &label );
-    wxString GetLabel() const;
-    virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
+  void SetLabel( const wxString &label );
+  wxString GetLabel() const;
+  virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
    
-    wxBitmap& GetBitmapDisabled() const { return (wxBitmap&) m_disabled; }
-    wxBitmap& GetBitmapFocus() const { return (wxBitmap&) m_focus; }
-    wxBitmap& GetBitmapLabel() const { return (wxBitmap&) m_bitmap; }
-    wxBitmap& GetBitmapSelected() const { return (wxBitmap&) m_selected; }
+  wxBitmap& GetBitmapDisabled() const { return (wxBitmap&) m_disabled; }
+  wxBitmap& GetBitmapFocus() const { return (wxBitmap&) m_focus; }
+  wxBitmap& GetBitmapLabel() const { return (wxBitmap&) m_bitmap; }
+  wxBitmap& GetBitmapSelected() const { return (wxBitmap&) m_selected; }
    
-    void SetBitmapDisabled( const wxBitmap& bitmap );
-    void SetBitmapFocus( const wxBitmap& bitmap );
-    void SetBitmapLabel( const wxBitmap& bitmap );
-    void SetBitmapSelected( const wxBitmap& bitmap );
+  void SetBitmapDisabled( const wxBitmap& bitmap );
+  void SetBitmapFocus( const wxBitmap& bitmap );
+  void SetBitmapLabel( const wxBitmap& bitmap );
+  void SetBitmapSelected( const wxBitmap& bitmap );
    
-    virtual bool Enable(bool enable);
+  virtual bool Enable(bool enable);
  
 // implementation

-    void HasFocus();
-    void NotFocus();
-    void StartSelect();
-    void EndSelect();
-    void SetBitmap();
-    void ApplyWidgetStyle();    
+  void HasFocus();
+  void NotFocus();
+  void StartSelect();
+  void EndSelect();
+  void SetBitmap();
+  void ApplyWidgetStyle();    
  
-    bool         m_hasFocus;
-    bool         m_isSelected;
-    wxBitmap     m_bitmap; 
-    wxBitmap     m_disabled;
-    wxBitmap     m_focus;
-    wxBitmap     m_selected;   
-  
-private:
-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+  bool         m_hasFocus;
+  bool         m_isSelected;
+  wxBitmap     m_bitmap; 
+  wxBitmap     m_disabled;
+  wxBitmap     m_focus;
+  wxBitmap     m_selected;   
 };

 #endif
--- a/include/wx/gtk/brush.h
+++ b/include/wx/gtk/brush.h
@@ -33,7 +33,10 @@ class wxBrush;

 class wxBrush: public wxGDIObject
 {
-public:
+  DECLARE_DYNAMIC_CLASS(wxBrush)
+
+  public:
+
    wxBrush();
    wxBrush( const wxColour &colour, int style );
    wxBrush( const wxBitmap &stippleBitmap );
@@ -55,8 +58,7 @@ public:

    void Unshare();

-private:
-    DECLARE_DYNAMIC_CLASS(wxBrush)
+    // no data :-)
 };

 #endif // __GTKBRUSHH__
--- a/include/wx/gtk/button.h
+++ b/include/wx/gtk/button.h
@@ -7,6 +7,7 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

+
 #ifndef __GTKBUTTONH__
 #define __GTKBUTTONH__

@@ -37,7 +38,10 @@ extern const wxChar *wxButtonNameStr;

 class wxButton: public wxControl
 {
-public:
+  DECLARE_DYNAMIC_CLASS(wxButton)
+
+  public:
+
    wxButton();
    inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
           const wxPoint& pos = wxDefaultPosition,
@@ -62,9 +66,6 @@ public:
  // implementation        
  
    void ApplyWidgetStyle();    
-    
-private:
-    DECLARE_DYNAMIC_CLASS(wxButton)
 };

 #endif // __GTKBUTTONH__
--- a/include/wx/gtk/checkbox.h
+++ b/include/wx/gtk/checkbox.h
@@ -7,6 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

+
 #ifndef __GTKCHECKBOXH__
 #define __GTKCHECKBOXH__

@@ -40,6 +41,8 @@ extern const char *wxCheckBoxNameStr;

 class wxCheckBox: public wxControl
 {
+DECLARE_DYNAMIC_CLASS(wxCheckBox)
+
 public:
    wxCheckBox();
    wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label,
@@ -70,9 +73,6 @@ public:

    GtkWidget *m_widgetCheckbox;
    GtkWidget *m_widgetLabel;
-    
-private:
-    DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };

 #endif
--- a/include/wx/gtk/checklst.h
+++ b/include/wx/gtk/checklst.h
@@ -36,6 +36,8 @@ class wxCheckListBox;

 class wxCheckListBox : public wxListBox
 {
+DECLARE_DYNAMIC_CLASS(wxCheckListBox)
+
 public:
    wxCheckListBox();
    wxCheckListBox(wxWindow *parent, wxWindowID id,
@@ -51,9 +53,6 @@ public:
    void Check( int index, bool check = TRUE );

    int GetItemHeight() const;
-    
-private:
-    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 };

 #endif
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -38,6 +38,8 @@ extern const wxChar *wxChoiceNameStr;

 class wxChoice : public wxControl
 {
+    DECLARE_DYNAMIC_CLASS(wxChoice)
+
 public:
    wxChoice();
    wxChoice( wxWindow *parent, wxWindowID id,
@@ -95,9 +97,6 @@ public:
    void EnableEvents();
    void AppendCommon( const wxString &item );
    void ApplyWidgetStyle();
-    
-private:
-    DECLARE_DYNAMIC_CLASS(wxChoice)
 };


--- a/include/wx/gtk/clipbrd.h
+++ b/include/wx/gtk/clipbrd.h
@@ -44,6 +44,8 @@ extern wxClipboard* wxTheClipboard;

 class wxClipboard : public wxObject
 {
+    DECLARE_DYNAMIC_CLASS(wxClipboard)
+
 public:
    wxClipboard();
    ~wxClipboard();
@@ -89,9 +91,6 @@ public:
    GdkAtom           m_targetRequested;
    bool              m_usePrimary;
    wxDataObject      *m_receivedData;
-    
-private:
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
 };

 //-----------------------------------------------------------------------------
@@ -100,13 +99,12 @@ private:

 class wxClipboardModule: public wxModule
 {
+  DECLARE_DYNAMIC_CLASS(wxClipboardModule)
+
 public:
    wxClipboardModule() {}
    bool OnInit();
    void OnExit();
-    
-private:
-    DECLARE_DYNAMIC_CLASS(wxClipboardModule)
 };

 #endif
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -42,9 +42,12 @@ extern const wxChar* wxEmptyString;

 class wxComboBox : public wxControl
 {
+  DECLARE_DYNAMIC_CLASS(wxComboBox)
+
 public:
-    inline wxComboBox() {}
-    inline wxComboBox(wxWindow *parent, wxWindowID id,
+
+  inline wxComboBox() {}
+  inline wxComboBox(wxWindow *parent, wxWindowID id,
           const wxString& value = wxEmptyString,
           const wxPoint& pos = wxDefaultPosition,
           const wxSize& size = wxDefaultSize,
@@ -52,11 +55,11 @@ public:
           long style = 0,
           const wxValidator& validator = wxDefaultValidator,
           const wxString& name = wxComboBoxNameStr)
-    {
-        Create(parent, id, value, pos, size, n, choices, style, validator, name);
-    }
-    ~wxComboBox();
-    bool Create(wxWindow *parent, wxWindowID id,
+  {
+    Create(parent, id, value, pos, size, n, choices, style, validator, name);
+  }
+  ~wxComboBox();
+  bool Create(wxWindow *parent, wxWindowID id,
           const wxString& value = wxEmptyString,
           const wxPoint& pos = wxDefaultPosition,
           const wxSize& size = wxDefaultSize,
@@ -65,65 +68,63 @@ public:
           const wxValidator& validator = wxDefaultValidator,
           const wxString& name = wxComboBoxNameStr);

-    void Append( const wxString &item );
-    void Append( const wxString &item, void* clientData );
-    void Append( const wxString &item, wxClientData* clientData );
+  void Append( const wxString &item );
+  void Append( const wxString &item, void* clientData );
+  void Append( const wxString &item, wxClientData* clientData );
  
-    void SetClientData( int n, void* clientData );
-    void* GetClientData( int n );
-    void SetClientObject( int n, wxClientData* clientData );
-    wxClientData* GetClientObject( int n );
+  void SetClientData( int n, void* clientData );
+  void* GetClientData( int n );
+  void SetClientObject( int n, wxClientData* clientData );
+  wxClientData* GetClientObject( int n );
  
-    void SetClientObject( wxClientData *data )  { wxControl::SetClientObject( data ); }
-    wxClientData *GetClientObject() const       { return wxControl::GetClientObject(); }
-    void SetClientData( void *data )            { wxControl::SetClientData( data ); }
-    void *GetClientData() const                 { return wxControl::GetClientData(); }
+  void SetClientObject( wxClientData *data )  { wxControl::SetClientObject( data ); }
+  wxClientData *GetClientObject() const       { return wxControl::GetClientObject(); }
+  void SetClientData( void *data )            { wxControl::SetClientData( data ); }
+  void *GetClientData() const                 { return wxControl::GetClientData(); }
    
-    void Clear();
-    void Delete( int n );
+  void Clear();
+  void Delete( int n );
  
-    int FindString( const wxString &item );
-    int GetSelection() const;
-    wxString GetString( int n ) const;
-    wxString GetStringSelection() const;
-    int Number() const;
-    void SetSelection( int n );
-    void SetStringSelection( const wxString &string );
+  int FindString( const wxString &item );
+  int GetSelection() const;
+  wxString GetString( int n ) const;
+  wxString GetStringSelection() const;
+  int Number() const;
+  void SetSelection( int n );
+  void SetStringSelection( const wxString &string );

-    wxString GetValue() const;
-    void SetValue(const wxString& value);
+  wxString GetValue() const;
+  void SetValue(const wxString& value);

-    void Copy();
-    void Cut();
-    void Paste();
-    void SetInsertionPoint( long pos );
-    void SetInsertionPointEnd();
-    long GetInsertionPoint() const;
-    long GetLastPosition() const;
-    void Replace( long from, long to, const wxString& value );
-    void Remove( long from, long to );
-    void SetSelection( long from, long to );
-    void SetEditable( bool editable );
+  void Copy();
+  void Cut();
+  void Paste();
+  void SetInsertionPoint( long pos );
+  void SetInsertionPointEnd();
+  long GetInsertionPoint() const;
+  long GetLastPosition() const;
+  void Replace( long from, long to, const wxString& value );
+  void Remove( long from, long to );
+  void SetSelection( long from, long to );
+  void SetEditable( bool editable );
  
-    // implementation
+  void OnSize( wxSizeEvent &event );
+  void OnChar( wxKeyEvent &event );
+  
+// implementation
    
-    void OnSize( wxSizeEvent &event );
-    void OnChar( wxKeyEvent &event );
-  
-    bool     m_alreadySent;
-    wxList   m_clientDataList;
-    wxList   m_clientObjectList;
+  bool     m_alreadySent;
+  wxList   m_clientDataList;
+  wxList   m_clientObjectList;

-    void DisableEvents();
-    void EnableEvents();
-    void AppendCommon( const wxString &item );
-    GtkWidget* GetConnectWidget();
-    bool IsOwnGtkWindow( GdkWindow *window );
-    void ApplyWidgetStyle();
- 
-private: 
-    DECLARE_DYNAMIC_CLASS(wxComboBox)
-    DECLARE_EVENT_TABLE()
+  void DisableEvents();
+  void EnableEvents();
+  void AppendCommon( const wxString &item );
+  GtkWidget* GetConnectWidget();
+  bool IsOwnGtkWindow( GdkWindow *window );
+  void ApplyWidgetStyle();
+  
+  DECLARE_EVENT_TABLE()
 };

 #endif
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -31,6 +31,8 @@ class wxControl;

 class wxControl : public wxWindow
 {
+    DECLARE_DYNAMIC_CLASS(wxControl)
+
 public:
    wxControl();
    wxControl( wxWindow *parent,
@@ -48,9 +50,6 @@ public:
 protected:
    wxString   m_label;
    char       m_chAccel;  // enabled to avoid breaking binary compatibility later on
-    
-private:
-    DECLARE_DYNAMIC_CLASS(wxControl)
 };

 #endif // __GTKCONTROLH__
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -64,7 +64,7 @@ public:

 #if wxUSE_STATUSBAR
    virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
-            const wxString& name = wxT("statusBar"));
+            const wxString& name = T("statusBar"));
    virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
            const wxString& name );
    virtual wxStatusBar *GetStatusBar() const;
@@ -78,7 +78,7 @@ public:
            const wxString& name = wxToolBarNameStr);
    virtual wxToolBar *OnCreateToolBar( long style, wxWindowID id, const wxString& name );
    virtual wxToolBar *GetToolBar() const;
-    void SetToolBar(wxToolBar *toolbar);
+    void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
 #endif // wxUSE_TOOLBAR

    virtual void SetMenuBar( wxMenuBar *menuBar );
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -128,11 +128,11 @@ public:

    ~wxMenu();

-    // title
+    // operations
+        // title
    void SetTitle(const wxString& label);
    const wxString GetTitle() const;
-    
-    // menu creation
+        // menu creation
    void AppendSeparator();
    void Append(int id, const wxString &item,
                const wxString &helpStr = "", bool checkable = FALSE);
@@ -141,9 +141,6 @@ public:
    void Append(wxMenuItem *pItem);
    void Break() { }

-    // delete item. don't delete the wxMenu if it's a submenu
-    void Delete( int id );
-
    // find item by name/id
    int FindItem( const wxString itemString ) const;
    wxMenuItem *FindItem( int id ) const;
--- a/include/wx/gtk/menuitem.h
+++ b/include/wx/gtk/menuitem.h
@@ -40,7 +40,6 @@ DECLARE_DYNAMIC_CLASS(wxMenuItem)

 public:
    wxMenuItem();
-    ~wxMenuItem();

    // accessors
        // id
--- a/include/wx/gtk/region.h
+++ b/include/wx/gtk/region.h
@@ -55,8 +55,8 @@ class wxRegion : public wxGDIObject
    wxRegion( long x, long y, long w, long h );
    wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight );
    wxRegion( const wxRect& rect );
-    wxRegion();
-    ~wxRegion();
+    wxRegion(void);
+    ~wxRegion(void);

    inline wxRegion( const wxRegion& r ): wxGDIObject()
      { Ref(r); }
@@ -66,7 +66,7 @@ class wxRegion : public wxGDIObject
    bool operator == ( const wxRegion& region );
    bool operator != ( const wxRegion& region );
    
-    void Clear();
+    void Clear(void);

    bool Union( long x, long y, long width, long height );
    bool Union( const wxRect& rect );
@@ -85,10 +85,9 @@ class wxRegion : public wxGDIObject
    bool Xor( const wxRegion& region );

    void GetBox( long& x, long& y, long&w, long &h ) const;
-    wxRect GetBox() const ;
+    wxRect GetBox(void) const ;

-    bool Empty() const;
-    bool IsEmpty() const { return Empty(); }
+    bool Empty(void) const;

    wxRegionContain Contains( long x, long y ) const;
    wxRegionContain Contains( long x, long y, long w, long h ) const;
@@ -98,38 +97,39 @@ class wxRegion : public wxGDIObject
  public:
  
    wxList    *GetRectList() const;    
-    GdkRegion *GetRegion() const;
+    GdkRegion *GetRegion(void) const;
 };

 class wxRegionIterator: public wxObject 
 {
-public:
-    wxRegionIterator();
+  DECLARE_DYNAMIC_CLASS(wxRegionIterator);
+  
+  public:
+  
+    wxRegionIterator(void);
    wxRegionIterator(const wxRegion& region);

-    void Reset() { m_current = 0; }
+    void Reset(void) { m_current = 0; }
    void Reset(const wxRegion& region);

-    operator bool () const;
-    bool HaveRects() const;
+    operator bool (void) const;
+    bool HaveRects(void) const;

-    void operator ++ ();
+    void operator ++ (void);
    void operator ++ (int);

-    long GetX() const;
-    long GetY() const;
-    long GetW() const;
-    long GetWidth() const { return GetW(); }
-    long GetH() const;
-    long GetHeight() const { return GetH(); }
+    long GetX(void) const;
+    long GetY(void) const;
+    long GetW(void) const;
+    long GetWidth(void) const { return GetW(); }
+    long GetH(void) const;
+    long GetHeight(void) const { return GetH(); }
    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }

-private:
-    long       m_current;
-    wxRegion   m_region;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxRegionIterator);
+  private:
+  
+   long       m_current;
+   wxRegion   m_region;
 };


--- a/include/wx/gtk/spinbutt.h
+++ b/include/wx/gtk/spinbutt.h
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __GTKSPINBUTTH__
+#ifndef __GTKSPINPUTTH__
 #define __GTKSPINBUTTH__

 #ifdef __GNUG__
@@ -21,6 +21,8 @@

 class wxSpinButton : public wxSpinButtonBase
 {
+    DECLARE_DYNAMIC_CLASS(wxSpinButton)
+
 public:
    wxSpinButton() { }
    wxSpinButton( wxWindow *parent, wxWindowID id = -1,
@@ -29,6 +31,7 @@ public:
    {
        Create(parent, id, pos, size, style, name);
    }
+    ~wxSpinButton();

    bool Create( wxWindow *parent, wxWindowID id = -1,
            const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
@@ -51,7 +54,6 @@ public:

 private:
    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxSpinButton)
 };

 #endif
--- a/include/wx/gtk/spinctrl.h
+++ b/include/wx/gtk/spinctrl.h
@@ -1,62 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        spinctrl.h
-// Purpose:     wxSpinCtrl class
-// Author:      Robert Roebling
-// Modified by:
-// RCS-ID:      $Id$
-// Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __GTKSPINCTRLH__
-#define __GTKSPINCTRLH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-//-----------------------------------------------------------------------------
-// wxSpinButton
-//-----------------------------------------------------------------------------
-
-class wxSpinCtrl : public wxControl
-{
-public:
-    wxSpinCtrl() {}
-    wxSpinCtrl(wxWindow *parent,
-               wxWindowID id = -1,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = wxSP_ARROW_KEYS,
-               int min = 0, int max = 100, int initial = 0,
-               const wxString& name = _T("wxSpinCtrl"))
-    {
-        Create(parent, id, pos, size, style, min, max, initial, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id = -1,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxSP_ARROW_KEYS,
-                int min = 0, int max = 100, int initial = 0,
-                const wxString& name = _T("wxSpinCtrl"));
-
-    virtual int GetValue() const;
-    virtual void SetValue( int value );
-    virtual void SetRange( int minVal, int maxVal );
-    virtual int GetMin() const;
-    virtual int GetMax() const;
-
-    bool IsOwnGtkWindow( GdkWindow *window );
-    void ApplyWidgetStyle();
-
-    GtkAdjustment  *m_adjust;
-    float           m_oldPos;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
-};
-
-#endif
-    // __GTKSPINCTRLH__
--- a/include/wx/gtk/win_gtk.h
+++ b/include/wx/gtk/win_gtk.h
@@ -36,74 +36,66 @@ typedef enum

 typedef struct _GtkMyFixed        GtkMyFixed;
 typedef struct _GtkMyFixedClass   GtkMyFixedClass;
+typedef struct _GtkMyFixedChild   GtkMyFixedChild;

 struct _GtkMyFixed
 {
  GtkContainer container;
  GList *children;
+#if (GTK_MINOR_VERSION > 0)
  GtkMyShadowType shadow_type;
-  
-  guint width;
-  guint height;
-
-  guint xoffset;
-  guint yoffset;
-
-  GdkWindow *bin_window;
-
-  GdkVisibilityState visibility;
-  gulong configure_serial;
-  gint scroll_x;
-  gint scroll_y;
-  
-  gboolean clear_on_draw;
+#endif
 };

 struct _GtkMyFixedClass
 {
  GtkContainerClass parent_class;

+#if (GTK_MINOR_VERSION > 0)
  void  (*set_scroll_adjustments)   (GtkMyFixed     *myfixed,
 				     GtkAdjustment  *hadjustment,
 				     GtkAdjustment  *vadjustment);
+#endif
+};
+
+struct _GtkMyFixedChild
+{
+  GtkWidget *widget;
+  gint16 x;
+  gint16 y;
+  gint16 width;
+  gint16 height;
 };

 guint      gtk_myfixed_get_type        (void);
 GtkWidget* gtk_myfixed_new             (void);
-
+#if (GTK_MINOR_VERSION > 0)
 void       gtk_myfixed_set_shadow_type (GtkMyFixed     *myfixed,
 				        GtkMyShadowType  type);
-					
-void       gtk_my_fixed_set_clear      (GtkMyFixed     *myfixed,
-                                        gboolean        clear);		
-					
-void       gtk_myfixed_scroll          	(GtkMyFixed     *myfixed,	
-                                         gint         dx,
-                                         gint         dy);
-					
+#endif
 void       gtk_myfixed_put             (GtkMyFixed     *myfixed,
                                        GtkWidget      *widget,
-                                        gint         x,
-                                        gint         y,
-					gint         width,
-					gint         height);
+                                        gint16         x,
+                                        gint16         y,
+					gint16         width,
+					gint16         height);

 void       gtk_myfixed_move            (GtkMyFixed     *myfixed,
                                        GtkWidget      *widget,
-                                        gint         x,
-                                        gint         y );
+                                        gint16         x,
+                                        gint16         y );
 					
 void       gtk_myfixed_resize          (GtkMyFixed     *myfixed,
                                        GtkWidget      *widget,
-                                        gint         width,
-                                        gint         height );
+                                        gint16         width,
+                                        gint16         height );
 					
 void       gtk_myfixed_set_size        (GtkMyFixed     *myfixed,
                                        GtkWidget      *widget,
-                                        gint         x,
-                                        gint         y,
-                                        gint         width,
-                                        gint         height);
+                                        gint16         x,
+                                        gint16         y,
+                                        gint16         width,
+                                        gint16         height);
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -172,9 +172,14 @@ public:
    float                m_oldHorizontalPos;
    float                m_oldVerticalPos;

+    // we need an extra XGC flag set to get exposed
+    // events from overlapping children upon moving
+    // them. this flag will be set in this GC and
+    // the GC will be used in wxWindow::ScrollWindow().
+    GdkGC               *m_scrollGC;
+
    // extra (wxGTK-specific) flags
    bool                 m_needParent:1;    /* ! wxFrame, wxDialog, wxNotebookPage ?  */
-    bool                 m_noExpose:1;      /* wxGLCanvas has its own redrawing */
    bool                 m_hasScrolling:1;
    bool                 m_isScrolling:1;
    bool                 m_hasVMT:1;
@@ -183,7 +188,7 @@ public:
    bool                 m_isStaticBox:1;   /* faster than IS_KIND_OF */
    bool                 m_isRadioButton:1; /* faster than IS_KIND_OF */
    bool                 m_isFrame:1;       /* faster than IS_KIND_OF */
-    bool                 m_acceptsFocus:1;  /* not wxStaticBox, not wxStaticBitmap etc.  */
+    bool                 m_acceptsFocus:1;  /* ! wxStaticBox etc.  */

    // these are true if the style were set before the widget was realized
    // (typcally in the constructor) but the actual GTK style must not be set
@@ -191,7 +196,13 @@ public:
    bool                 m_delayedFont:1;
    bool                 m_delayedForegroundColour:1;
    bool                 m_delayedBackgroundColour:1;
+    bool                 m_delayedCursor:1;
    
+    // the cursor is set in OnInternalIdle(). this fields holds
+    // a reference to the cursor currently set in theGdk window 
+    // so that we don't have to set it more than once
+    wxCursor             m_currentGdkCursor;
+
    // contains GTK's widgets internal information about non-default widget
    // font and colours. we create one for each widget that gets any
    // non-default attribute set via SetFont() or SetForegroundColour() /
--- a/include/wx/gtk1/accel.h
+++ b/include/wx/gtk1/accel.h
@@ -56,7 +56,8 @@ extern wxAcceleratorTable wxNullAcceleratorTable;

 class wxAcceleratorEntry: public wxObject
 {
-public:
+  public:
+
    wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0)
      { m_flags = flags; m_keyCode = keyCode; m_command = cmd; }

--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -80,7 +80,6 @@ private:
    /// Set to TRUE while we are in wxYield().
    bool m_suppressIdleEvents;

-private:
    DECLARE_DYNAMIC_CLASS(wxApp)
    DECLARE_EVENT_TABLE()
 };
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -43,57 +43,56 @@ extern const wxChar *wxButtonNameStr;

 class wxBitmapButton: public wxButton
 {
+  DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+
 public:
-    wxBitmapButton();
-    inline wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
+  wxBitmapButton();
+  inline wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
                         const wxValidator& validator = wxDefaultValidator,
                         const wxString& name = wxButtonNameStr )
-    {
-        Create(parent, id, bitmap, pos, size, style, validator, name);
-    }
-    bool Create( wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
+  {
+      Create(parent, id, bitmap, pos, size, style, validator, name);
+  }
+  bool Create( wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
               const wxValidator& validator = wxDefaultValidator,
               const wxString& name = wxButtonNameStr);
-    virtual void SetDefault();
+  virtual void SetDefault();
    
-    void SetLabel( const wxString &label );
-    wxString GetLabel() const;
-    virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
+  void SetLabel( const wxString &label );
+  wxString GetLabel() const;
+  virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
    
-    wxBitmap& GetBitmapDisabled() const { return (wxBitmap&) m_disabled; }
-    wxBitmap& GetBitmapFocus() const { return (wxBitmap&) m_focus; }
-    wxBitmap& GetBitmapLabel() const { return (wxBitmap&) m_bitmap; }
-    wxBitmap& GetBitmapSelected() const { return (wxBitmap&) m_selected; }
+  wxBitmap& GetBitmapDisabled() const { return (wxBitmap&) m_disabled; }
+  wxBitmap& GetBitmapFocus() const { return (wxBitmap&) m_focus; }
+  wxBitmap& GetBitmapLabel() const { return (wxBitmap&) m_bitmap; }
+  wxBitmap& GetBitmapSelected() const { return (wxBitmap&) m_selected; }
    
-    void SetBitmapDisabled( const wxBitmap& bitmap );
-    void SetBitmapFocus( const wxBitmap& bitmap );
-    void SetBitmapLabel( const wxBitmap& bitmap );
-    void SetBitmapSelected( const wxBitmap& bitmap );
+  void SetBitmapDisabled( const wxBitmap& bitmap );
+  void SetBitmapFocus( const wxBitmap& bitmap );
+  void SetBitmapLabel( const wxBitmap& bitmap );
+  void SetBitmapSelected( const wxBitmap& bitmap );
    
-    virtual bool Enable(bool enable);
+  virtual bool Enable(bool enable);
  
 // implementation

-    void HasFocus();
-    void NotFocus();
-    void StartSelect();
-    void EndSelect();
-    void SetBitmap();
-    void ApplyWidgetStyle();    
+  void HasFocus();
+  void NotFocus();
+  void StartSelect();
+  void EndSelect();
+  void SetBitmap();
+  void ApplyWidgetStyle();    
  
-    bool         m_hasFocus;
-    bool         m_isSelected;
-    wxBitmap     m_bitmap; 
-    wxBitmap     m_disabled;
-    wxBitmap     m_focus;
-    wxBitmap     m_selected;   
-  
-private:
-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+  bool         m_hasFocus;
+  bool         m_isSelected;
+  wxBitmap     m_bitmap; 
+  wxBitmap     m_disabled;
+  wxBitmap     m_focus;
+  wxBitmap     m_selected;   
 };

 #endif
--- a/include/wx/gtk1/brush.h
+++ b/include/wx/gtk1/brush.h
@@ -33,7 +33,10 @@ class wxBrush;

 class wxBrush: public wxGDIObject
 {
-public:
+  DECLARE_DYNAMIC_CLASS(wxBrush)
+
+  public:
+
    wxBrush();
    wxBrush( const wxColour &colour, int style );
    wxBrush( const wxBitmap &stippleBitmap );
@@ -55,8 +58,7 @@ public:

    void Unshare();

-private:
-    DECLARE_DYNAMIC_CLASS(wxBrush)
+    // no data :-)
 };

 #endif // __GTKBRUSHH__
--- a/include/wx/gtk1/button.h
+++ b/include/wx/gtk1/button.h
@@ -7,6 +7,7 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

+
 #ifndef __GTKBUTTONH__
 #define __GTKBUTTONH__

@@ -37,7 +38,10 @@ extern const wxChar *wxButtonNameStr;

 class wxButton: public wxControl
 {
-public:
+  DECLARE_DYNAMIC_CLASS(wxButton)
+
+  public:
+
    wxButton();
    inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
           const wxPoint& pos = wxDefaultPosition,
@@ -62,9 +66,6 @@ public:
  // implementation        
  
    void ApplyWidgetStyle();    
-    
-private:
-    DECLARE_DYNAMIC_CLASS(wxButton)
 };

 #endif // __GTKBUTTONH__
--- a/include/wx/gtk1/checkbox.h
+++ b/include/wx/gtk1/checkbox.h
@@ -7,6 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

+
 #ifndef __GTKCHECKBOXH__
 #define __GTKCHECKBOXH__

@@ -40,6 +41,8 @@ extern const char *wxCheckBoxNameStr;

 class wxCheckBox: public wxControl
 {
+DECLARE_DYNAMIC_CLASS(wxCheckBox)
+
 public:
    wxCheckBox();
    wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label,
@@ -70,9 +73,6 @@ public:

    GtkWidget *m_widgetCheckbox;
    GtkWidget *m_widgetLabel;
-    
-private:
-    DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };

 #endif
--- a/include/wx/gtk1/checklst.h
+++ b/include/wx/gtk1/checklst.h
@@ -36,6 +36,8 @@ class wxCheckListBox;

 class wxCheckListBox : public wxListBox
 {
+DECLARE_DYNAMIC_CLASS(wxCheckListBox)
+
 public:
    wxCheckListBox();
    wxCheckListBox(wxWindow *parent, wxWindowID id,
@@ -51,9 +53,6 @@ public:
    void Check( int index, bool check = TRUE );

    int GetItemHeight() const;
-    
-private:
-    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 };

 #endif
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -38,6 +38,8 @@ extern const wxChar *wxChoiceNameStr;

 class wxChoice : public wxControl
 {
+    DECLARE_DYNAMIC_CLASS(wxChoice)
+
 public:
    wxChoice();
    wxChoice( wxWindow *parent, wxWindowID id,
@@ -95,9 +97,6 @@ public:
    void EnableEvents();
    void AppendCommon( const wxString &item );
    void ApplyWidgetStyle();
-    
-private:
-    DECLARE_DYNAMIC_CLASS(wxChoice)
 };


--- a/include/wx/gtk1/clipbrd.h
+++ b/include/wx/gtk1/clipbrd.h
@@ -44,6 +44,8 @@ extern wxClipboard* wxTheClipboard;

 class wxClipboard : public wxObject
 {
+    DECLARE_DYNAMIC_CLASS(wxClipboard)
+
 public:
    wxClipboard();
    ~wxClipboard();
@@ -89,9 +91,6 @@ public:
    GdkAtom           m_targetRequested;
    bool              m_usePrimary;
    wxDataObject      *m_receivedData;
-    
-private:
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
 };

 //-----------------------------------------------------------------------------
@@ -100,13 +99,12 @@ private:

 class wxClipboardModule: public wxModule
 {
+  DECLARE_DYNAMIC_CLASS(wxClipboardModule)
+
 public:
    wxClipboardModule() {}
    bool OnInit();
    void OnExit();
-    
-private:
-    DECLARE_DYNAMIC_CLASS(wxClipboardModule)
 };

 #endif
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -42,9 +42,12 @@ extern const wxChar* wxEmptyString;

 class wxComboBox : public wxControl
 {
+  DECLARE_DYNAMIC_CLASS(wxComboBox)
+
 public:
-    inline wxComboBox() {}
-    inline wxComboBox(wxWindow *parent, wxWindowID id,
+
+  inline wxComboBox() {}
+  inline wxComboBox(wxWindow *parent, wxWindowID id,
           const wxString& value = wxEmptyString,
           const wxPoint& pos = wxDefaultPosition,
           const wxSize& size = wxDefaultSize,
@@ -52,11 +55,11 @@ public:
           long style = 0,
           const wxValidator& validator = wxDefaultValidator,
           const wxString& name = wxComboBoxNameStr)
-    {
-        Create(parent, id, value, pos, size, n, choices, style, validator, name);
-    }
-    ~wxComboBox();
-    bool Create(wxWindow *parent, wxWindowID id,
+  {
+    Create(parent, id, value, pos, size, n, choices, style, validator, name);
+  }
+  ~wxComboBox();
+  bool Create(wxWindow *parent, wxWindowID id,
           const wxString& value = wxEmptyString,
           const wxPoint& pos = wxDefaultPosition,
           const wxSize& size = wxDefaultSize,
@@ -65,65 +68,63 @@ public:
           const wxValidator& validator = wxDefaultValidator,
           const wxString& name = wxComboBoxNameStr);

-    void Append( const wxString &item );
-    void Append( const wxString &item, void* clientData );
-    void Append( const wxString &item, wxClientData* clientData );
+  void Append( const wxString &item );
+  void Append( const wxString &item, void* clientData );
+  void Append( const wxString &item, wxClientData* clientData );
  
-    void SetClientData( int n, void* clientData );
-    void* GetClientData( int n );
-    void SetClientObject( int n, wxClientData* clientData );
-    wxClientData* GetClientObject( int n );
+  void SetClientData( int n, void* clientData );
+  void* GetClientData( int n );
+  void SetClientObject( int n, wxClientData* clientData );
+  wxClientData* GetClientObject( int n );
  
-    void SetClientObject( wxClientData *data )  { wxControl::SetClientObject( data ); }
-    wxClientData *GetClientObject() const       { return wxControl::GetClientObject(); }
-    void SetClientData( void *data )            { wxControl::SetClientData( data ); }
-    void *GetClientData() const                 { return wxControl::GetClientData(); }
+  void SetClientObject( wxClientData *data )  { wxControl::SetClientObject( data ); }
+  wxClientData *GetClientObject() const       { return wxControl::GetClientObject(); }
+  void SetClientData( void *data )            { wxControl::SetClientData( data ); }
+  void *GetClientData() const                 { return wxControl::GetClientData(); }
    
-    void Clear();
-    void Delete( int n );
+  void Clear();
+  void Delete( int n );
  
-    int FindString( const wxString &item );
-    int GetSelection() const;
-    wxString GetString( int n ) const;
-    wxString GetStringSelection() const;
-    int Number() const;
-    void SetSelection( int n );
-    void SetStringSelection( const wxString &string );
+  int FindString( const wxString &item );
+  int GetSelection() const;
+  wxString GetString( int n ) const;
+  wxString GetStringSelection() const;
+  int Number() const;
+  void SetSelection( int n );
+  void SetStringSelection( const wxString &string );

-    wxString GetValue() const;
-    void SetValue(const wxString& value);
+  wxString GetValue() const;
+  void SetValue(const wxString& value);

-    void Copy();
-    void Cut();
-    void Paste();
-    void SetInsertionPoint( long pos );
-    void SetInsertionPointEnd();
-    long GetInsertionPoint() const;
-    long GetLastPosition() const;
-    void Replace( long from, long to, const wxString& value );
-    void Remove( long from, long to );
-    void SetSelection( long from, long to );
-    void SetEditable( bool editable );
+  void Copy();
+  void Cut();
+  void Paste();
+  void SetInsertionPoint( long pos );
+  void SetInsertionPointEnd();
+  long GetInsertionPoint() const;
+  long GetLastPosition() const;
+  void Replace( long from, long to, const wxString& value );
+  void Remove( long from, long to );
+  void SetSelection( long from, long to );
+  void SetEditable( bool editable );
  
-    // implementation
+  void OnSize( wxSizeEvent &event );
+  void OnChar( wxKeyEvent &event );
+  
+// implementation
    
-    void OnSize( wxSizeEvent &event );
-    void OnChar( wxKeyEvent &event );
-  
-    bool     m_alreadySent;
-    wxList   m_clientDataList;
-    wxList   m_clientObjectList;
+  bool     m_alreadySent;
+  wxList   m_clientDataList;
+  wxList   m_clientObjectList;

-    void DisableEvents();
-    void EnableEvents();
-    void AppendCommon( const wxString &item );
-    GtkWidget* GetConnectWidget();
-    bool IsOwnGtkWindow( GdkWindow *window );
-    void ApplyWidgetStyle();
- 
-private: 
-    DECLARE_DYNAMIC_CLASS(wxComboBox)
-    DECLARE_EVENT_TABLE()
+  void DisableEvents();
+  void EnableEvents();
+  void AppendCommon( const wxString &item );
+  GtkWidget* GetConnectWidget();
+  bool IsOwnGtkWindow( GdkWindow *window );
+  void ApplyWidgetStyle();
+  
+  DECLARE_EVENT_TABLE()
 };

 #endif
--- a/include/wx/gtk1/control.h
+++ b/include/wx/gtk1/control.h
@@ -31,6 +31,8 @@ class wxControl;

 class wxControl : public wxWindow
 {
+    DECLARE_DYNAMIC_CLASS(wxControl)
+
 public:
    wxControl();
    wxControl( wxWindow *parent,
@@ -48,9 +50,6 @@ public:
 protected:
    wxString   m_label;
    char       m_chAccel;  // enabled to avoid breaking binary compatibility later on
-    
-private:
-    DECLARE_DYNAMIC_CLASS(wxControl)
 };

 #endif // __GTKCONTROLH__
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -64,7 +64,7 @@ public:

 #if wxUSE_STATUSBAR
    virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
-            const wxString& name = wxT("statusBar"));
+            const wxString& name = T("statusBar"));
    virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
            const wxString& name );
    virtual wxStatusBar *GetStatusBar() const;
@@ -78,7 +78,7 @@ public:
            const wxString& name = wxToolBarNameStr);
    virtual wxToolBar *OnCreateToolBar( long style, wxWindowID id, const wxString& name );
    virtual wxToolBar *GetToolBar() const;
-    void SetToolBar(wxToolBar *toolbar);
+    void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
 #endif // wxUSE_TOOLBAR

    virtual void SetMenuBar( wxMenuBar *menuBar );
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -128,11 +128,11 @@ public:

    ~wxMenu();

-    // title
+    // operations
+        // title
    void SetTitle(const wxString& label);
    const wxString GetTitle() const;
-    
-    // menu creation
+        // menu creation
    void AppendSeparator();
    void Append(int id, const wxString &item,
                const wxString &helpStr = "", bool checkable = FALSE);
@@ -141,9 +141,6 @@ public:
    void Append(wxMenuItem *pItem);
    void Break() { }

-    // delete item. don't delete the wxMenu if it's a submenu
-    void Delete( int id );
-
    // find item by name/id
    int FindItem( const wxString itemString ) const;
    wxMenuItem *FindItem( int id ) const;
--- a/include/wx/gtk1/menuitem.h
+++ b/include/wx/gtk1/menuitem.h
@@ -40,7 +40,6 @@ DECLARE_DYNAMIC_CLASS(wxMenuItem)

 public:
    wxMenuItem();
-    ~wxMenuItem();

    // accessors
        // id
--- a/include/wx/gtk1/region.h
+++ b/include/wx/gtk1/region.h
@@ -55,8 +55,8 @@ class wxRegion : public wxGDIObject
    wxRegion( long x, long y, long w, long h );
    wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight );
    wxRegion( const wxRect& rect );
-    wxRegion();
-    ~wxRegion();
+    wxRegion(void);
+    ~wxRegion(void);

    inline wxRegion( const wxRegion& r ): wxGDIObject()
      { Ref(r); }
@@ -66,7 +66,7 @@ class wxRegion : public wxGDIObject
    bool operator == ( const wxRegion& region );
    bool operator != ( const wxRegion& region );
    
-    void Clear();
+    void Clear(void);

    bool Union( long x, long y, long width, long height );
    bool Union( const wxRect& rect );
@@ -85,10 +85,9 @@ class wxRegion : public wxGDIObject
    bool Xor( const wxRegion& region );

    void GetBox( long& x, long& y, long&w, long &h ) const;
-    wxRect GetBox() const ;
+    wxRect GetBox(void) const ;

-    bool Empty() const;
-    bool IsEmpty() const { return Empty(); }
+    bool Empty(void) const;

    wxRegionContain Contains( long x, long y ) const;
    wxRegionContain Contains( long x, long y, long w, long h ) const;
@@ -98,38 +97,39 @@ class wxRegion : public wxGDIObject
  public:
  
    wxList    *GetRectList() const;    
-    GdkRegion *GetRegion() const;
+    GdkRegion *GetRegion(void) const;
 };

 class wxRegionIterator: public wxObject 
 {
-public:
-    wxRegionIterator();
+  DECLARE_DYNAMIC_CLASS(wxRegionIterator);
+  
+  public:
+  
+    wxRegionIterator(void);
    wxRegionIterator(const wxRegion& region);

-    void Reset() { m_current = 0; }
+    void Reset(void) { m_current = 0; }
    void Reset(const wxRegion& region);

-    operator bool () const;
-    bool HaveRects() const;
+    operator bool (void) const;
+    bool HaveRects(void) const;

-    void operator ++ ();
+    void operator ++ (void);
    void operator ++ (int);

-    long GetX() const;
-    long GetY() const;
-    long GetW() const;
-    long GetWidth() const { return GetW(); }
-    long GetH() const;
-    long GetHeight() const { return GetH(); }
+    long GetX(void) const;
+    long GetY(void) const;
+    long GetW(void) const;
+    long GetWidth(void) const { return GetW(); }
+    long GetH(void) const;
+    long GetHeight(void) const { return GetH(); }
    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }

-private:
-    long       m_current;
-    wxRegion   m_region;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxRegionIterator);
+  private:
+  
+   long       m_current;
+   wxRegion   m_region;
 };


--- a/include/wx/gtk1/spinbutt.h
+++ b/include/wx/gtk1/spinbutt.h
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __GTKSPINBUTTH__
+#ifndef __GTKSPINPUTTH__
 #define __GTKSPINBUTTH__

 #ifdef __GNUG__
@@ -21,6 +21,8 @@

 class wxSpinButton : public wxSpinButtonBase
 {
+    DECLARE_DYNAMIC_CLASS(wxSpinButton)
+
 public:
    wxSpinButton() { }
    wxSpinButton( wxWindow *parent, wxWindowID id = -1,
@@ -29,6 +31,7 @@ public:
    {
        Create(parent, id, pos, size, style, name);
    }
+    ~wxSpinButton();

    bool Create( wxWindow *parent, wxWindowID id = -1,
            const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
@@ -51,7 +54,6 @@ public:

 private:
    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxSpinButton)
 };

 #endif
--- a/include/wx/gtk1/spinctrl.h
+++ b/include/wx/gtk1/spinctrl.h
@@ -1,62 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        spinctrl.h
-// Purpose:     wxSpinCtrl class
-// Author:      Robert Roebling
-// Modified by:
-// RCS-ID:      $Id$
-// Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __GTKSPINCTRLH__
-#define __GTKSPINCTRLH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-//-----------------------------------------------------------------------------
-// wxSpinButton
-//-----------------------------------------------------------------------------
-
-class wxSpinCtrl : public wxControl
-{
-public:
-    wxSpinCtrl() {}
-    wxSpinCtrl(wxWindow *parent,
-               wxWindowID id = -1,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = wxSP_ARROW_KEYS,
-               int min = 0, int max = 100, int initial = 0,
-               const wxString& name = _T("wxSpinCtrl"))
-    {
-        Create(parent, id, pos, size, style, min, max, initial, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id = -1,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxSP_ARROW_KEYS,
-                int min = 0, int max = 100, int initial = 0,
-                const wxString& name = _T("wxSpinCtrl"));
-
-    virtual int GetValue() const;
-    virtual void SetValue( int value );
-    virtual void SetRange( int minVal, int maxVal );
-    virtual int GetMin() const;
-    virtual int GetMax() const;
-
-    bool IsOwnGtkWindow( GdkWindow *window );
-    void ApplyWidgetStyle();
-
-    GtkAdjustment  *m_adjust;
-    float           m_oldPos;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
-};
-
-#endif
-    // __GTKSPINCTRLH__
--- a/include/wx/gtk1/win_gtk.h
+++ b/include/wx/gtk1/win_gtk.h
@@ -36,74 +36,66 @@ typedef enum

 typedef struct _GtkMyFixed        GtkMyFixed;
 typedef struct _GtkMyFixedClass   GtkMyFixedClass;
+typedef struct _GtkMyFixedChild   GtkMyFixedChild;

 struct _GtkMyFixed
 {
  GtkContainer container;
  GList *children;
+#if (GTK_MINOR_VERSION > 0)
  GtkMyShadowType shadow_type;
-  
-  guint width;
-  guint height;
-
-  guint xoffset;
-  guint yoffset;
-
-  GdkWindow *bin_window;
-
-  GdkVisibilityState visibility;
-  gulong configure_serial;
-  gint scroll_x;
-  gint scroll_y;
-  
-  gboolean clear_on_draw;
+#endif
 };

 struct _GtkMyFixedClass
 {
  GtkContainerClass parent_class;

+#if (GTK_MINOR_VERSION > 0)
  void  (*set_scroll_adjustments)   (GtkMyFixed     *myfixed,
 				     GtkAdjustment  *hadjustment,
 				     GtkAdjustment  *vadjustment);
+#endif
+};
+
+struct _GtkMyFixedChild
+{
+  GtkWidget *widget;
+  gint16 x;
+  gint16 y;
+  gint16 width;
+  gint16 height;
 };

 guint      gtk_myfixed_get_type        (void);
 GtkWidget* gtk_myfixed_new             (void);
-
+#if (GTK_MINOR_VERSION > 0)
 void       gtk_myfixed_set_shadow_type (GtkMyFixed     *myfixed,
 				        GtkMyShadowType  type);
-					
-void       gtk_my_fixed_set_clear      (GtkMyFixed     *myfixed,
-                                        gboolean        clear);		
-					
-void       gtk_myfixed_scroll          	(GtkMyFixed     *myfixed,	
-                                         gint         dx,
-                                         gint         dy);
-					
+#endif
 void       gtk_myfixed_put             (GtkMyFixed     *myfixed,
                                        GtkWidget      *widget,
-                                        gint         x,
-                                        gint         y,
-					gint         width,
-					gint         height);
+                                        gint16         x,
+                                        gint16         y,
+					gint16         width,
+					gint16         height);

 void       gtk_myfixed_move            (GtkMyFixed     *myfixed,
                                        GtkWidget      *widget,
-                                        gint         x,
-                                        gint         y );
+                                        gint16         x,
+                                        gint16         y );
 					
 void       gtk_myfixed_resize          (GtkMyFixed     *myfixed,
                                        GtkWidget      *widget,
-                                        gint         width,
-                                        gint         height );
+                                        gint16         width,
+                                        gint16         height );
 					
 void       gtk_myfixed_set_size        (GtkMyFixed     *myfixed,
                                        GtkWidget      *widget,
-                                        gint         x,
-                                        gint         y,
-                                        gint         width,
-                                        gint         height);
+                                        gint16         x,
+                                        gint16         y,
+                                        gint16         width,
+                                        gint16         height);
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -172,9 +172,14 @@ public:
    float                m_oldHorizontalPos;
    float                m_oldVerticalPos;

+    // we need an extra XGC flag set to get exposed
+    // events from overlapping children upon moving
+    // them. this flag will be set in this GC and
+    // the GC will be used in wxWindow::ScrollWindow().
+    GdkGC               *m_scrollGC;
+
    // extra (wxGTK-specific) flags
    bool                 m_needParent:1;    /* ! wxFrame, wxDialog, wxNotebookPage ?  */
-    bool                 m_noExpose:1;      /* wxGLCanvas has its own redrawing */
    bool                 m_hasScrolling:1;
    bool                 m_isScrolling:1;
    bool                 m_hasVMT:1;
@@ -183,7 +188,7 @@ public:
    bool                 m_isStaticBox:1;   /* faster than IS_KIND_OF */
    bool                 m_isRadioButton:1; /* faster than IS_KIND_OF */
    bool                 m_isFrame:1;       /* faster than IS_KIND_OF */
-    bool                 m_acceptsFocus:1;  /* not wxStaticBox, not wxStaticBitmap etc.  */
+    bool                 m_acceptsFocus:1;  /* ! wxStaticBox etc.  */

    // these are true if the style were set before the widget was realized
    // (typcally in the constructor) but the actual GTK style must not be set
@@ -191,7 +196,13 @@ public:
    bool                 m_delayedFont:1;
    bool                 m_delayedForegroundColour:1;
    bool                 m_delayedBackgroundColour:1;
+    bool                 m_delayedCursor:1;
    
+    // the cursor is set in OnInternalIdle(). this fields holds
+    // a reference to the cursor currently set in theGdk window 
+    // so that we don't have to set it more than once
+    wxCursor             m_currentGdkCursor;
+
    // contains GTK's widgets internal information about non-default widget
    // font and colours. we create one for each widget that gets any
    // non-default attribute set via SetFont() or SetForegroundColour() /
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -38,7 +38,7 @@ class wxHtmlContainerCell;
 class WXDLLEXPORT wxHtmlCell : public wxObject
 {
    public:
-        wxHtmlCell() : wxObject() {m_Next = NULL; m_Parent = NULL; m_Width = m_Height = m_Descent = 0; m_CanLiveOnPagebreak = TRUE;}
+        wxHtmlCell() : wxObject() {m_Next = NULL; m_Parent = NULL; m_Width = m_Height = m_Descent = 0;};
        virtual ~wxHtmlCell() {if (m_Next) delete m_Next;};

        void SetParent(wxHtmlContainerCell *p) {m_Parent = p;}
@@ -94,20 +94,6 @@ class WXDLLEXPORT wxHtmlCell : public wxObject
                // Parent is pointer to wxHtmlWindow that generated the event
                // HINT: if this handling is not enough for you you should use
                //       wxHtmlBinderCell
-                
-        virtual bool AdjustPagebreak(int *pagebreak);
-                // This method used to adjust pagebreak position. The parameter is
-                // variable that contains y-coordinate of page break (= horizontal line that
-                // should not be crossed by words, images etc.). If this cell cannot be divided
-                // into two pieces (each one on another page) then it moves the pagebreak
-                // few pixels up.
-                //
-                // Returned value : true if pagebreak was modified, false otherwise
-                // Usage : while (container->AdjustPagebreak(&p)) {}
-                
-        void SetCanLiveOnPagebreak(bool can) {m_CanLiveOnPagebreak = can;}
-                // Sets cell's behaviour on pagebreaks (see AdjustPagebreak). Default
-                // is true - the cell can be split on two pages


    protected:
@@ -122,8 +108,6 @@ class WXDLLEXPORT wxHtmlCell : public wxObject
                // position where the fragment is drawn
        wxString m_Link;
                // destination address if this fragment is hypertext link, "" otherwise
-        bool m_CanLiveOnPagebreak;
-                // true if this cell can be placed on pagebreak, false otherwise

 };

@@ -191,7 +175,6 @@ class WXDLLEXPORT wxHtmlContainerCell : public wxHtmlCell
        virtual void Layout(int w);
        virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
        virtual void DrawInvisible(wxDC& dc, int x, int y);
-        virtual bool AdjustPagebreak(int *pagebreak);

        void InsertCell(wxHtmlCell *cell);
                // insert cell at the end of m_Cells list
--- a/include/wx/html/htmldefs.h
+++ b/include/wx/html/htmldefs.h
@@ -77,8 +77,8 @@
 	
 #define HTML_COND_ISIMAGEMAP            2
        // Finds imagemap of 'param' name (pointer to wxString).
-	// (used exclusively by m_image.cpp)
-	
+	// (used exclusively by mod_image.cpp)
+
 #define HTML_COND_USER              10000
        // User-defined conditions should start from this number

@@ -94,8 +94,6 @@
    /* size of temporary buffer used during parsing */
 #define HTML_REALLOC_STEP              32
    /* steps of array reallocation */
-#define HTML_PRINT_MAX_PAGES          999
-    /* maximum number of pages printable via html printing */

 #endif
 #endif
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -70,6 +70,25 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
 {
    DECLARE_DYNAMIC_CLASS(wxHtmlWindow)

+    private:
+        bool m_tmpMouseMoved;
+                // a flag indicated if mouse moved
+                // (if TRUE we will try to change cursor in last call to OnIdle)
+        bool m_tmpCanDraw;
+                // if FALSE contents of the window is not redrawn
+                // (in order to avoid ugly bliking)
+
+        static wxList m_Filters;
+                // list of HTML filters
+        static wxHtmlFilter *m_DefaultFilter;
+                // this filter is used when no filter is able to read some file
+
+        HtmlHistoryArray m_History;
+        int m_HistoryPos;
+                // browser history
+        bool m_HistoryOn;
+                // if this FLAG is false, items are not added to history
+
    public:
        wxHtmlWindow() : wxScrolledWindow() {};
        wxHtmlWindow(wxWindow *parent, wxWindowID id = -1,
@@ -169,7 +188,6 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
 	virtual wxHtmlFilter *GetDefaultFilter() {return new wxHtmlFilterPlainText;}
 	        // returns new filter (will be stored into m_DefaultFilter variable)

-
    protected:
        wxHtmlContainerCell *m_Cell;
                // This is pointer to the first cell in parsed data.
@@ -197,27 +215,6 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow

        int m_Style;

-    private:
-        bool m_tmpMouseMoved;
-                // a flag indicated if mouse moved
-                // (if TRUE we will try to change cursor in last call to OnIdle)
-        wxString m_tmpLastLink;
-                // contains last link name
-        bool m_tmpCanDraw;
-                // if FALSE contents of the window is not redrawn
-                // (in order to avoid ugly bliking)
-
-        static wxList m_Filters;
-                // list of HTML filters
-        static wxHtmlFilter *m_DefaultFilter;
-                // this filter is used when no filter is able to read some file
-
-        HtmlHistoryArray m_History;
-        int m_HistoryPos;
-                // browser history
-        bool m_HistoryOn;
-                // if this FLAG is false, items are not added to history
-

    DECLARE_EVENT_TABLE()
 };
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -356,14 +356,14 @@ public:

  static void CleanUpHandlers();
  static void InitStandardHandlers();
-
+ 
 protected:

  static wxList sm_handlers;

 };

-extern void WXDLLEXPORT wxInitAllImageHandlers();
+extern void wxInitAllImageHandlers();

 #endif
  // _WX_IMAGE_H_
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -32,7 +32,7 @@
 // gettext() style macro (notice that xgettext should be invoked with "-k_"
 // option to extract the strings inside _() from the sources)
 #ifndef WXINTL_NO_GETTEXT_MACRO
-    #define   _(str)  wxGetTranslation(wxT(str))
+    #define   _(str)  wxGetTranslation(T(str))
 #endif

 // ----------------------------------------------------------------------------
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -132,13 +132,6 @@ public:
    bool HasPendingMessages() const { return m_bHasMessages; }

    // only one sink is active at each moment
-        // flush the active target if any
-    static void FlushActive()
-    {
-        wxLog *log = GetActiveTarget();
-        if ( log )
-            log->Flush();
-    }
        // get current log target, will call wxApp::CreateLogTarget() to
        // create one if none exists
    static wxLog *GetActiveTarget();
@@ -480,12 +473,12 @@ DECLARE_LOG_FUNCTION2(SysError, long lErrCode);
    // will take us immediately to the place of the failed API
 #ifdef __VISUALC__
    #define wxLogApiError(api, rc)                                              \
-        wxLogDebug(wxT("%s(%d): '%s' failed with error 0x%08lx (%s)."),          \
+        wxLogDebug(T("%s(%d): '%s' failed with error 0x%08lx (%s)."),          \
                   __TFILE__, __LINE__, api,                                    \
                   rc, wxSysErrorMsg(rc))
 #else // !VC++
    #define wxLogApiError(api, rc)                                              \
-        wxLogDebug(wxT("In file %s at line %d: '%s' failed with "                \
+        wxLogDebug(T("In file %s at line %d: '%s' failed with "                \
                      "error 0x%08lx (%s)."),                                   \
                   __TFILE__, __LINE__, api,                                    \
                   rc, wxSysErrorMsg(rc))
--- a/include/wx/mac/macsock.h
+++ b/include/wx/mac/macsock.h
@@ -1056,3 +1056,4 @@ __END_DECLS
 		long nothing ;
 	} ;

+#endif /* !_GUSI_ */
--- a/include/wx/mac/statusbr.h
+++ b/include/wx/mac/statusbr.h
@@ -51,3 +51,4 @@ protected:
 };

 #endif
+    // _WX_STATBAR_H_
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -32,7 +32,11 @@ class wxMimeTypesManagerImpl;
 // the accessors *must* be checked!
 class WXDLLEXPORT wxFileType
 {
-friend class WXDLLEXPORT wxMimeTypesManagerImpl;  // it has access to m_impl
+#ifdef __MWERKS__
+friend class wxMimeTypesManagerImpl;  // it has access to m_impl
+#else
+friend wxMimeTypesManagerImpl;  // it has access to m_impl
+#endif

 public:
    // An object of this class must be passed to Get{Open|Print}Command. The
--- a/include/wx/motif/clipbrd.h
+++ b/include/wx/motif/clipbrd.h
@@ -110,7 +110,7 @@ class WXDLLEXPORT wxClipboardClient : public wxObject

 public:
  /* This list should be filled in with strings indicating the formats
-     this client can provide. Almost all clients will provide "TEXT".
+     this client can provide. Almost all clients will provide "TEXT(".
     Format names should be 4 characters long, so things will work
     out on the Macintosh */
  wxStringList formats;
@@ -147,7 +147,7 @@ class WXDLLEXPORT wxClipboard : public wxObject
  /* Set the clipboard string; does not require a client. */
  void SetClipboardString(char *, long time);

-  /* Get data from the clipboard in the format "TEXT". */
+  /* Get data from the clipboard in the format "TEXT(". */
  char *GetClipboardString(long time);

  /* Get data from the clipboard */
--- a/include/wx/motif/dnd.h
+++ b/include/wx/motif/dnd.h
@@ -92,7 +92,7 @@ public:
    
  // the string ID identifies the format of clipboard or DnD data. a word
  // processor would e.g. add a wxTextDataObject and a wxPrivateDataObject
-  // to the clipboard - the latter with the Id "WXWORD_FORMAT".
+  // to the clipboard - the latter with the Id "WXWORD_FORMAT(".
    
  void SetId( const wxString& id )
      { m_id = id; }
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -139,17 +139,17 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 * for this combination of CTl3D/FAFA settings
 */

-#define STATIC_CLASS     wxT("STATIC")
+#define STATIC_CLASS     T("STATIC")
 #define STATIC_FLAGS     (SS_LEFT|WS_CHILD|WS_VISIBLE)
-#define CHECK_CLASS      wxT("BUTTON")
+#define CHECK_CLASS      T("BUTTON")
 #define CHECK_FLAGS      (BS_AUTOCHECKBOX|WS_TABSTOP|WS_CHILD)
 #define CHECK_IS_FAFA   FALSE
-#define RADIO_CLASS      wxT("BUTTON")
+#define RADIO_CLASS      T("BUTTON")
 #define RADIO_FLAGS      (BS_AUTORADIOBUTTON|WS_CHILD|WS_VISIBLE)
 #define RADIO_SIZE       20
 #define RADIO_IS_FAFA   FALSE
 #define PURE_WINDOWS
-#define GROUP_CLASS      wxT("BUTTON")
+#define GROUP_CLASS      T("BUTTON")
 #define GROUP_FLAGS      (BS_GROUPBOX|WS_CHILD|WS_VISIBLE)

 /*
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -103,11 +103,6 @@

 #define wxUSE_CARET        1
                                // Define 1 to use wxCaret class
-
-#define wxUSE_NEW_GRID     1
-                                // Define 1 to use the new wxGrid class
-                                // (still under development, define 0 to
-                                //  use existing wxGrid class)
 #define wxUSE_XPM_IN_MSW   1
                                // Define 1 to support the XPM package in wxBitmap.
 #define wxUSE_IMAGE_LOADING_IN_MSW        1
--- a/include/wx/msw/spinbutt.h
+++ b/include/wx/msw/spinbutt.h
@@ -13,7 +13,7 @@
 #define _WX_SPINBUTT_H_

 #ifdef __GNUG__
-    #pragma interface "spinbutt.h"
+#pragma interface "spinbutt.h"
 #endif

 #include "wx/control.h"
@@ -21,10 +21,15 @@

 #if defined(__WIN95__)

+
 class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase
 {
+DECLARE_DYNAMIC_CLASS(wxSpinButton)
+
 public:
-    // construction
+    /*
+     * Public interface
+     */
    wxSpinButton() { }

    wxSpinButton(wxWindow *parent,
@@ -57,15 +62,9 @@ public:
    virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
    virtual bool MSWOnScroll(int orientation, WXWORD wParam,
                             WXWORD pos, WXHWND control);
-
-protected:
-   virtual wxSize DoGetBestSize();
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxSpinButton)
 };

 #endif
-    // __WIN95__
+    // _WX_WIN95__
 #endif
    // _WX_SPINBUTT_H_
--- a/include/wx/msw/spinctrl.h
+++ b/include/wx/msw/spinctrl.h
@@ -1,61 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        msw/spinctrl.h
-// Purpose:     wxSpinCtrl class declaration for Win32
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     22.07.99
-// RCS-ID:      $Id$
-// Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_SPINCTRL_H_
-#define _WX_MSW_SPINCTRL_H_
-
-#ifdef __GNUG__
-    #pragma interface "spinctrl.h"
-#endif
-
-#include "wx/spinbutt.h"    // the base class
-
-// ----------------------------------------------------------------------------
-// Under Win32, wxSpinCtrl is a wxSpinButton with a buddy (as MSDN docs call
-// it) text window whose contents is automatically updated when the spin
-// control is clicked.
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxSpinCtrl : public wxSpinButton
-{
-public:
-    wxSpinCtrl() { }
-
-    wxSpinCtrl(wxWindow *parent,
-               wxWindowID id = -1,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = wxSP_ARROW_KEYS,
-               int min = 0, int max = 100, int initial = 0,
-               const wxString& name = _T("wxSpinCtrl"))
-    {
-        Create(parent, id, pos, size, style, min, max, initial, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id = -1,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxSP_ARROW_KEYS,
-                int min = 0, int max = 100, int initial = 0,
-                const wxString& name = _T("wxSpinCtrl"));
-
-protected:
-    void DoMoveWindow(int x, int y, int width, int height);
-
-    WXHWND m_hwndBuddy;
-
-    DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
-};
-
-#endif // _WX_MSW_SPINCTRL_H_
-
-
--- a/include/wx/msw/statbr95.h
+++ b/include/wx/msw/statbr95.h
@@ -2,7 +2,7 @@
 // Name:        msw/statbr95.h
 // Purpose:     native implementation of wxStatusBar
 // Author:      Vadim Zeitlin
-// Modified by:
+// Modified by: 
 // Created:     04.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
@@ -52,4 +52,4 @@ protected:

 #endif  // wxUSE_NATIVE_STATUSBAR

-#endif
+#endif  //_STATBR95_H
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -49,7 +49,6 @@ enum
 // ---------------------------------------------------------------------------
 // wxWindow declaration for MSW
 // ---------------------------------------------------------------------------
-
 class WXDLLEXPORT wxWindow : public wxWindowBase
 {
    DECLARE_DYNAMIC_CLASS(wxWindow);
@@ -405,12 +404,6 @@ protected:
    // will be the width and height of the text
    virtual wxSize DoGetBestSize();

-    // move the window to the specified location and resize it: this is called
-    // from both DoSetSize() and DoSetClientSize() and would usually just call
-    // ::MoveWindow() except for composite controls which will want to arrange
-    // themselves inside the given rectangle
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-
 #if wxUSE_TOOLTIPS
    virtual void DoSetToolTip( wxToolTip *tip );
 #endif // wxUSE_TOOLTIPS
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -117,13 +117,13 @@ WXDLLEXPORT wxObject* wxCreateStoredObject( wxInputStream& stream );
 #define IMPLEMENT_DYNAMIC_CLASS(name, basename) \
 wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
   { return new name; }\
- wxClassInfo name::sm_class##name((wxChar *) wxT(#name), (wxChar *) wxT(#basename), (wxChar *) NULL, (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name);
+ wxClassInfo name::sm_class##name((wxChar *) T(#name), (wxChar *) T(#basename), (wxChar *) NULL, (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name);

 // Multiple inheritance with two base classes
 #define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2) \
 wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
   { return new name; }\
- wxClassInfo name::sm_class##name((wxChar *) wxT(#name), (wxChar *) wxT(#basename1), (wxChar *) wxT(#basename2), (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name);
+ wxClassInfo name::sm_class##name((wxChar *) T(#name), (wxChar *) T(#basename1), (wxChar *) T(#basename2), (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name);

 //////
 ////// for abstract classes
@@ -131,13 +131,13 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \

 // Single inheritance with one base class
 #define IMPLEMENT_ABSTRACT_CLASS(name, basename) \
- wxClassInfo name::sm_class##name((wxChar *) wxT(#name), (wxChar *) wxT(#basename), \
+ wxClassInfo name::sm_class##name((wxChar *) T(#name), (wxChar *) T(#basename), \
         (wxChar *) NULL, (int) sizeof(name), (wxObjectConstructorFn) NULL);

 // Multiple inheritance with two base classes
 #define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) \
- wxClassInfo name::sm_class##name((wxChar *) wxT(#name), (wxChar *) wxT(#basename1), \
-         (wxChar *) wxT(#basename2), (int) sizeof(name), (wxObjectConstructorFn) NULL);
+ wxClassInfo name::sm_class##name((wxChar *) T(#name), (wxChar *) T(#basename1), \
+         (wxChar *) T(#basename2), (int) sizeof(name), (wxObjectConstructorFn) NULL);

 #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
--- a/include/wx/os2/accel.h
+++ b/include/wx/os2/accel.h
@@ -67,19 +67,11 @@ public:

    ~wxAcceleratorTable();

-    inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel)
-    { if (*this == accel) return (*this); Ref(accel); return *this; };
-    inline bool operator == (const wxAcceleratorTable& accel)
-    { return m_refData == accel.m_refData; };
-    inline bool operator != (const wxAcceleratorTable& accel)
-    { return m_refData != accel.m_refData; };
+    inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if (*this == accel) return (*this); Ref(accel); return *this; }
+    inline bool operator == (const wxAcceleratorTable& accel) { return m_refData == accel.m_refData; }
+    inline bool operator != (const wxAcceleratorTable& accel) { return m_refData != accel.m_refData; }

    bool Ok() const;
-    void SetHACCEL(WXHACCEL hAccel);
-    WXHACCEL GetHACCEL() const;
-
-    // translate the accelerator, return TRUE if done
-    bool Translate(wxWindow *window, WXMSG *msg) const;
 };

 WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
--- a/include/wx/os2/brush.h
+++ b/include/wx/os2/brush.h
@@ -34,7 +34,10 @@ protected:
    int           m_style;
    wxBitmap      m_stipple ;
    wxColour      m_colour;
+
+/* TODO: implementation
    WXHBRUSH      m_hBrush;
+*/
 };

 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
@@ -71,10 +74,6 @@ public:
  // Useful helper: create the brush resource
  bool RealizeResource();

-  WXHANDLE GetResourceHandle(void) ;
-  bool FreeResource(bool force = FALSE);
-  bool IsFree() const;
-
  // When setting properties, we must make sure we're not changing
  // another object
  void Unshare();
--- a/include/wx/os2/dc.h
+++ b/include/wx/os2/dc.h
@@ -143,10 +143,6 @@ class WXDLLEXPORT wxDC: public wxDCBase
    virtual void DoDrawSpline(wxList *points);
 #endif

-    // OS2-specific member variables
-    int               m_windowExtX;
-    int               m_windowExtY;
-
 //-----------------------------------------------------------------------------
 // Other virtuals from wxDCBase that are overridden here
 //-----------------------------------------------------------------------------
--- a/include/wx/os2/font.h
+++ b/include/wx/os2/font.h
@@ -1,96 +1,88 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        font.h
 // Purpose:     wxFont class
-// Author:      David Webster
+// Author:      AUTHOR
 // Modified by:
-// Created:     10/06/99
+// Created:     ??/??/98
 // RCS-ID:      $Id$
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Copyright:   (c) AUTHOR
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_

+#ifdef __GNUG__
+#pragma interface "font.h"
+#endif
+
 #include "wx/gdiobj.h"

-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
+class WXDLLEXPORT wxFont;

-// ----------------------------------------------------------------------------
-// wxFont
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxFont : public wxFontBase
+class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 {
+    friend class WXDLLEXPORT wxFont;
 public:
-    // ctors and such
-    wxFont() { Init(); }
-    wxFont(const wxFont& font) { Init(); Ref(font); }
-
-    wxFont(int size,
-           int family,
-           int style,
-           int weight,
-           bool underlined = FALSE,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        Init();
-
-        (void)Create(size, family, style, weight, underlined, face, encoding);
-    }
-
-    bool Create(int size,
-                int family,
-                int style,
-                int weight,
-                bool underlined = FALSE,
-                const wxString& face = wxEmptyString,
-                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
-
-    virtual ~wxFont();
-
-    // assignment
-    wxFont& operator=(const wxFont& font);
-
-    // implement base class pure virtuals
-    virtual int GetPointSize() const;
-    virtual int GetFamily() const;
-    virtual int GetStyle() const;
-    virtual int GetWeight() const;
-    virtual bool GetUnderlined() const;
-    virtual wxString GetFaceName() const;
-    virtual wxFontEncoding GetEncoding() const;
-
-    virtual void SetPointSize(int pointSize);
-    virtual void SetFamily(int family);
-    virtual void SetStyle(int style);
-    virtual void SetWeight(int weight);
-    virtual void SetFaceName(const wxString& faceName);
-    virtual void SetUnderlined(bool underlined);
-    virtual void SetEncoding(wxFontEncoding encoding);
-
-    // implementation only from now on
-    // -------------------------------
-
-    int GetFontId() const;
-    virtual bool IsFree() const;
-    virtual bool RealizeResource();
-    virtual WXHANDLE GetResourceHandle();
-    virtual bool FreeResource(bool force = FALSE);
-    /*
-       virtual bool UseResource();
-       virtual bool ReleaseResource();
-     */
-
+    wxFontRefData();
+    wxFontRefData(const wxFontRefData& data);
+    ~wxFontRefData();
 protected:
-    // common part of all ctors
-    void Init();
+  int           m_pointSize;
+  int           m_family;
+  int           m_style;
+  int           m_weight;
+  bool          m_underlined;
+  wxString      m_faceName;
+/* TODO: implementation
+  WXHFONT       m_hFont;
+*/
+};

-    void Unshare();
+#define M_FONTDATA ((wxFontRefData *)m_refData)

-private:
-    DECLARE_DYNAMIC_CLASS(wxFont)
+WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+
+// Font
+class WXDLLEXPORT wxFont: public wxGDIObject
+{
+  DECLARE_DYNAMIC_CLASS(wxFont)
+public:
+  wxFont();
+  wxFont(int pointSize, int family, int style, int weight, bool underlined = FALSE, const wxString& faceName = wxEmptyString);
+  inline wxFont(const wxFont& font) { Ref(font); }
+
+  ~wxFont();
+
+  bool Create(int pointSize, int family, int style, int weight, bool underlined = FALSE, const wxString& faceName = wxEmptyString);
+
+  virtual bool Ok() const { return (m_refData != NULL) ; }
+
+  inline int GetPointSize() const { return M_FONTDATA->m_pointSize; }
+  inline int GetFamily() const { return M_FONTDATA->m_family; }
+  inline int GetStyle() const { return M_FONTDATA->m_style; }
+  inline int GetWeight() const { return M_FONTDATA->m_weight; }
+  wxString GetFamilyString() const ;
+  wxString GetFaceName() const ;
+  wxString GetStyleString() const ;
+  wxString GetWeightString() const ;
+  inline bool GetUnderlined() const { return M_FONTDATA->m_underlined; }
+
+  void SetPointSize(int pointSize);
+  void SetFamily(int family);
+  void SetStyle(int style);
+  void SetWeight(int weight);
+  void SetFaceName(const wxString& faceName);
+  void SetUnderlined(bool underlined);
+
+  inline wxFont& operator = (const wxFont& font) { if (*this == font) return (*this); Ref(font); return *this; }
+  inline bool operator == (const wxFont& font) { return m_refData == font.m_refData; }
+  inline bool operator != (const wxFont& font) { return m_refData != font.m_refData; }
+
+  // Implementation
+protected:
+  bool RealizeResource();
+  void Unshare();
 };

 #endif
--- a/include/wx/os2/fontdlg.h
+++ b/include/wx/os2/fontdlg.h
@@ -2,24 +2,28 @@
 // Name:        fontdlg.h
 // Purpose:     wxFontDialog class. Use generic version if no
 //              platform-specific implementation.
-// Author:      David Webster
+// Author:      AUTHOR
 // Modified by:
-// Created:     10/06/99
+// Created:     ??/??/98
 // RCS-ID:      $Id$
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Copyright:   (c) AUTHOR
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _WX_FONTDLG_H_
 #define _WX_FONTDLG_H_

+#ifdef __GNUG__
+#pragma interface "fontdlg.h"
+#endif
+
 #include "wx/dialog.h"
 #include "wx/cmndata.h"

 /*
 * Font dialog
 */
-
+ 
 class WXDLLEXPORT wxFontDialog: public wxDialog
 {
 DECLARE_DYNAMIC_CLASS(wxFontDialog)
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.h
 // Purpose:     wxFrame class
-// Author:      David Webster
+// Author:      AUTHOR
 // Modified by:
-// Created:     10/06/99
+// Created:     ??/??/98
 // RCS-ID:      $Id$
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Copyright:   (c) AUTHOR
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _WX_FRAME_H_
@@ -18,12 +18,11 @@

 #include "wx/window.h"
 #include "wx/toolbar.h"
-#include "wx/os2/accel.h"
+#include "wx/accel.h"
 #include "wx/icon.h"

-WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
+WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
+WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;

 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
@@ -33,194 +32,126 @@ class WXDLLEXPORT wxFrame: public wxWindow {
  DECLARE_DYNAMIC_CLASS(wxFrame)

 public:
-    wxFrame();
-    inline wxFrame( wxWindow*       parent
-                   ,wxWindowID      id
-                   ,const wxString& title
-                   ,const wxPoint&  pos = wxDefaultPosition
-                   ,const wxSize&   size = wxDefaultSize
-                   ,long            style = wxDEFAULT_FRAME_STYLE
-                   ,const wxString& name = wxFrameNameStr
-                  )
-    {
-        Create(parent, id, title, pos, size, style, name);
-    }
+  wxFrame();
+  inline wxFrame(wxWindow *parent,
+           wxWindowID id,
+           const wxString& title,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize,
+           long style = wxDEFAULT_FRAME_STYLE,
+           const wxString& name = wxFrameNameStr)
+  {
+      Create(parent, id, title, pos, size, style, name);
+  }

-    ~wxFrame();
+  ~wxFrame();

-    bool Create( wxWindow*       parent
-                ,wxWindowID      id
-                ,const wxString& title
-                ,const wxPoint&  pos = wxDefaultPosition
-                ,const wxSize&   size = wxDefaultSize
-                ,long            style = wxDEFAULT_FRAME_STYLE
-                ,const wxString& name = wxFrameNameStr
-               );
+  bool Create(wxWindow *parent,
+           wxWindowID id,
+           const wxString& title,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize,
+           long style = wxDEFAULT_FRAME_STYLE,
+           const wxString& name = wxFrameNameStr);

-    virtual bool Destroy();
+  virtual bool Destroy();
+  void SetClientSize(int width, int height);
+  void GetClientSize(int *width, int *height) const;

-    virtual void ClientToScreen(int *x, int *y) const;
-    virtual void ScreenToClient(int *x, int *y) const;
+  void GetSize(int *width, int *height) const ;
+  void GetPosition(int *x, int *y) const ;
+  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+  void ClientToScreen(int *x, int *y) const;
+  void ScreenToClient(int *x, int *y) const;

-    void SetClientSize(int width, int height);
-    void GetClientSize(int *width, int *height) const;
+  void OnSize(wxSizeEvent& event);
+  void OnMenuHighlight(wxMenuEvent& event);
+  void OnActivate(wxActivateEvent& event);
+  void OnIdle(wxIdleEvent& event);
+  void OnCloseWindow(wxCloseEvent& event);

-    void OnSize(wxSizeEvent& event);
-    void OnMenuHighlight(wxMenuEvent& event);
-    void OnActivate(wxActivateEvent& event);
-    void OnIdle(wxIdleEvent& event);
-    void OnCloseWindow(wxCloseEvent& event);
+  bool Show(bool show);

-    bool Show(bool show);
+  // Set menu bar
+  void SetMenuBar(wxMenuBar *menu_bar);
+  virtual wxMenuBar *GetMenuBar() const ;

-    void DetachMenuBar();
+  // Set title
+  void SetTitle(const wxString& title);
+  wxString GetTitle() const ;

-    // Set menu bar
-    void SetMenuBar(wxMenuBar *menu_bar);
-    virtual wxMenuBar *GetMenuBar() const ;
+  void Centre(int direction = wxBOTH);

-    // Call this to simulate a menu command
-    inline bool Command(int id) { return ProcessCommand(id); }
+  // Call this to simulate a menu command
+  virtual void Command(int id);
+  virtual void ProcessCommand(int id);

-    // process menu command: returns TRUE if processed
-    bool ProcessCommand(int id);
+  // Set icon
+  virtual void SetIcon(const wxIcon& icon);

-    // make the window modal (all other windows unresponsive)
-    virtual void MakeModal(bool modal = TRUE);
+  // Create status line
+  virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
+    const wxString& name = "statusBar");
+  inline wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
+  virtual void PositionStatusBar();
+  virtual wxStatusBar *OnCreateStatusBar(int number, long style, wxWindowID id,
+    const wxString& name);

-    // Set icon
-    virtual void SetIcon(const wxIcon& icon);
+  // Create toolbar
+  virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1, const wxString& name = wxToolBarNameStr);
+  virtual wxToolBar *OnCreateToolBar(long style, wxWindowID id, const wxString& name);
+  // If made known to the frame, the frame will manage it automatically.
+  virtual inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
+  virtual inline wxToolBar *GetToolBar() const { return m_frameToolBar; }
+  virtual void PositionToolBar();

-    // Toolbar
-#if wxUSE_TOOLBAR
-    virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
-                                     wxWindowID id = -1,
-                                     const wxString& name = wxToolBarNameStr);
+  // Set status line text
+  virtual void SetStatusText(const wxString& text, int number = 0);

-    virtual wxToolBar *OnCreateToolBar(long style, wxWindowID id, const wxString& name);
+  // Set status line widths
+  virtual void SetStatusWidths(int n, const int widths_field[]);

-    virtual void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
-    virtual wxToolBar *GetToolBar() const { return m_frameToolBar; }
+  // Hint to tell framework which status bar to use
+  // TODO: should this go into a wxFrameworkSettings class perhaps?
+  static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
+  static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };

-    virtual void PositionToolBar();
-#endif // wxUSE_TOOLBAR
+  // Fit frame around subwindows
+  virtual void Fit();

-#if wxUSE_STATUSBAR
-    // Status bar
-    virtual wxStatusBar* CreateStatusBar(int number = 1,
-                                         long style = wxST_SIZEGRIP,
-                                         wxWindowID id = 0,
-                                         const wxString& name = wxStatusLineNameStr);
+  // Iconize
+  virtual void Iconize(bool iconize);

-    wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
-    void SetStatusBar(wxStatusBar *statusBar) { m_frameStatusBar = statusBar; }
+  virtual bool IsIconized() const ;

-    virtual void PositionStatusBar();
-    virtual wxStatusBar *OnCreateStatusBar(int number,
-                                           long style,
-                                           wxWindowID id,
-                                           const wxString& name);
+  // Compatibility
+  inline bool Iconized() const { return IsIconized(); }

-    // Set status line text
-    virtual void SetStatusText(const wxString& text, int number = 0);
+  // Is the frame maximized?
+  virtual bool IsMaximized(void) const ;

-    // Set status line widths
-    virtual void SetStatusWidths(int n, const int widths_field[]);
+  virtual void Maximize(bool maximize);

-    // Hint to tell framework which status bar to use
-    // TODO: should this go into a wxFrameworkSettings class perhaps?
-    static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
-    static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };
-#endif // wxUSE_STATUSBAR
+  // Responds to colour changes
+  void OnSysColourChanged(wxSysColourChangedEvent& event);

-    // Iconize
-    virtual void Iconize(bool iconize);
+  // Query app for menu item updates (called from OnIdle)
+  void DoMenuUpdates();
+  void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);

-    virtual bool IsIconized() const;
-
-    // Is it maximized?
-    virtual bool IsMaximized() const;
-
-    // Compatibility
-    bool Iconized() const { return IsIconized(); }
-
-    virtual void Maximize(bool maximize);
-    //  virtual bool LoadAccelerators(const wxString& table);
-
-    // Responds to colour changes
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-
-    // Query app for menu item updates (called from OnIdle)
-    void DoMenuUpdates();
-    void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
-
-    WXHMENU GetWinMenu() const { return m_hMenu; }
-
-    // Returns the origin of client area (may be different from (0,0) if the
-    // frame has a toolbar)
-    virtual wxPoint GetClientAreaOrigin() const;
-
-    // Implementation only from here
-        // event handlers
-    bool HandlePaint();
-    bool HandleSize(int x, int y, WXUINT flag);
-    bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
-    bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
-
-    bool OS2Create(int id, wxWindow *parent, const wxChar *wclass,
-                   wxWindow *wx_win, const wxChar *title,
-                   int x, int y, int width, int height, long style);
-
-  // tooltip management
-#if wxUSE_TOOLTIPS
-    WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
-    void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
-#endif // tooltips
+  // Checks if there is a toolbar, and returns the first free client position
+  virtual wxPoint GetClientAreaOrigin() const;

 protected:
-    // override base class virtuals
-    virtual void DoGetClientSize(int *width, int *height) const;
-    virtual void DoGetSize(int *width, int *height) const;
-    virtual void DoGetPosition(int *x, int *y) const;
+  wxMenuBar *           m_frameMenuBar;
+  wxStatusBar *         m_frameStatusBar;
+  wxIcon                m_icon;
+  bool                  m_iconized;
+  static bool           m_useNativeStatusBar;
+  wxToolBar *           m_frameToolBar ;

-    virtual void DoSetClientSize(int width, int height);
-
-    // a plug in for MDI frame classes which need to do something special when
-    // the menubar is set
-    virtual void InternalSetMenuBar();
-
-    // propagate our state change to all child frames
-    void IconizeChildFrames(bool bIconize);
-
-    // we add menu bar accel processing
-    bool OS2TranslateMessage(WXMSG* pMsg);
-
-    // window proc for the frames
-    MRESULT OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-
-    wxMenuBar *           m_frameMenuBar;
-    wxIcon                m_icon;
-    bool                  m_iconized;
-    WXHICON               m_defaultIcon;
-
-#if wxUSE_STATUSBAR
-    wxStatusBar *         m_frameStatusBar;
-
-    static bool           m_useNativeStatusBar;
-#endif // wxUSE_STATUSBAR
-
-#if wxUSE_TOOLBAR
-    wxToolBar *           m_frameToolBar;
-#endif // wxUSE_TOOLBAR
-
-private:
-#if wxUSE_TOOLTIPS
-    WXHWND                m_hwndToolTip;
-#endif // tooltips
-
-    DECLARE_EVENT_TABLE()
+  DECLARE_EVENT_TABLE()
 };

 #endif
    // _WX_FRAME_H_
-
--- a/include/wx/os2/gauge.h
+++ b/include/wx/os2/gauge.h
@@ -1,21 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gauge.h
 // Purpose:     wxGauge class
-// Author:      David Webster
+// Author:      AUTHOR
 // Modified by:
-// Created:     10/06/99
+// Created:     ??/??/98
 // RCS-ID:      $Id$
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
+// Copyright:   (c) AUTHOR
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _WX_GAUGE_H_
 #define _WX_GAUGE_H_

+#ifdef __GNUG__
+#pragma interface "gauge.h"
+#endif
+
 #include "wx/control.h"

 WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;

+// Group box
 class WXDLLEXPORT wxGauge: public wxControl
 {
  DECLARE_DYNAMIC_CLASS(wxGauge)
@@ -51,8 +56,7 @@ class WXDLLEXPORT wxGauge: public wxControl
  int GetRange() const ;
  int GetValue() const ;

-  bool SetForegroundColour(const wxColour& col);
-  bool SetBackgroundColour(const wxColour& col);
+  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);

  virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;

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