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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxPy-2-1-5@3935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
distrib tweaks
1999-10-12 03:04:38 +00:00 · 1999-10-12 03:04:38 +00:00 · 1999-10-12 03:04:13 +00:00 · 1999-10-11 22:36:46 +00:00 · 1999-10-11 22:16:33 +00:00 · 1999-10-11 19:32:58 +00:00
637 changed files with 40231 additions and 22539 deletions
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -35,7 +35,25 @@ 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
@@ -44,7 +62,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
@@ -58,9 +76,13 @@ 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.vc  (if using MS VC++)
+-> 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++)


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

 #
@@ -44,8 +44,9 @@ 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)
+VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10)

 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -125,6 +126,43 @@ 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 \
@@ -526,7 +564,7 @@ GENERIC_HEADERS = \
 		generic/dirdlgg.h \
 		generic/filedlgg.h \
 		generic/fontdlgg.h \
-		generic/gridg.h \
+		generic/grid.h \
 		generic/helpext.h \
 		generic/helphtml.h \
 		generic/helpwxht.h \
@@ -577,7 +615,7 @@ GTK_GENERICOBJS = \
 		dcpsg.o \
 		dirdlgg.o \
 		filedlgg.o \
-		gridg.o \
+		grid.o \
 		helphtml.o \
 		helpwxht.o \
 		imaglist.o \
@@ -610,7 +648,7 @@ GTK_GENERICDEPS = \
 		dcpsg.d \
 		dirdlgg.d \
 		filedlgg.d \
-		gridg.d \
+		grid.d \
 		helphtml.d \
 		helpwxht.d \
 		imaglist.d \
@@ -854,6 +892,7 @@ GTK_GUIOBJS = \
 		settings.o \
 		slider.o \
 		spinbutt.o \
+		spinctrl.o \
 		statbmp.o \
 		statbox.o \
 		statline.o \
@@ -913,6 +952,7 @@ GTK_GUIDEPS = \
 		settings.d \
 		slider.d \
 		spinbutt.d \
+		spinctrl.d \
 		statbmp.d \
 		statbox.d \
 		statline.d \
@@ -935,7 +975,7 @@ MOTIF_GENERICOBJS = \
 		dcpsg.o \
 		dirdlgg.o \
 		fontdlgg.o \
-		gridg.o \
+		grid.o \
 		helphtml.o \
 		helpwxht.o \
 		helpxlp.o \
@@ -972,7 +1012,7 @@ MOTIF_GENERICDEPS = \
 		dcpsg.d \
 		dirdlgg.d \
 		fontdlgg.d \
-		gridg.d \
+		grid.d \
 		helphtml.d \
 		helpwxht.d \
 		helpxlp.d \
@@ -1297,7 +1337,7 @@ MSW_GENERICOBJS = \
 		busyinfo.o \
 		choicdgg.o \
 		dirdlgg.o \
-		gridg.o \
+		grid.o \
 		laywin.o \
 		logg.o \
 		numdlgg.o \
@@ -1319,7 +1359,7 @@ MSW_GENERICDEPS = \
 		busyinfo.d \
 		choicdgg.d \
 		dirdlgg.d \
-		gridg.d \
+		grid.d \
 		laywin.d \
 		logg.d \
 		numdlgg.d \
@@ -1389,6 +1429,7 @@ MSW_COMMONOBJS = \
 		mstream.o \
 		object.o \
 		objstrm.o \
+		odbc.o \
 		paper.o \
 		prntbase.o \
 		process.o \
@@ -1478,6 +1519,7 @@ MSW_COMMONDEPS = \
 		mstream.d \
 		object.d \
 		objstrm.d \
+		odbc.d \
 		paper.d \
 		prntbase.d \
 		process.d \
@@ -1687,6 +1729,74 @@ 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 \
@@ -1727,13 +1837,13 @@ HTMLDEPS = \
 		search.d \
 		winpars.d

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

-UNIXDEPS = \
+UNIX_DEPS = \
 		dialup.d \
 		gsocket.d \
 		threadpsx.d \
@@ -1821,16 +1931,40 @@ 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

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

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

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

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

@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
 	@$(INSTALL) -d ./lib
@@ -1841,7 +1975,7 @@ all: @WX_CREATE_LINKS@
 	@$(INSTALL) -d ./lib
 	$(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
 	
-CREATE_LINKS: @WX_TARGET_LIBRARY@
+CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
 	@$(RM) ./lib/@WX_LIBRARY_LINK1@
 	@$(RM) ./lib/@WX_LIBRARY_LINK2@
 	@$(RM) ./lib/@WX_LIBRARY_LINK3@
@@ -1849,13 +1983,13 @@ CREATE_LINKS: @WX_TARGET_LIBRARY@
 	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
 	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
 	
-CREATE_INSTALLED_LINKS:  $(libdir)/@WX_TARGET_LIBRARY@
+CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
 	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
 	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
 	$(RM) $(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@
+	$(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@
 	
 $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h

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

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

 uninstall:
 	@echo " "
@@ -2198,6 +2332,10 @@ 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/1930
+++ b/1930
--- a/configure.in
+++ b/configure.in
@@ -64,8 +64,8 @@ main ()
   if (gtk_minor_version == 1) return FALSE;

   return !((gtk_major_version > major) ||
-	    ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-	    ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
+    ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+    ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
 }
 ],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
     CFLAGS="$ac_save_CFLAGS"
@@ -446,7 +446,7 @@ dnl WX_INTERFACE_AGE = 0

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

 WX_INTERFACE_AGE=0
 WX_BINARY_AGE=0
@@ -723,6 +723,7 @@ 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
@@ -744,7 +745,7 @@ if test $DEBUG_CONFIGURE = 1; then

  DEFAULT_wxUSE_UNICODE=no
  DEFAULT_wxUSE_WCSRTOMBS=no
-  
+
  DEFAULT_wxUSE_GIF=no
  DEFAULT_wxUSE_PCX=no
  DEFAULT_wxUSE_PNM=no
@@ -773,7 +774,7 @@ else
  DEFAULT_wxUSE_ZLIB=yes
  DEFAULT_wxUSE_LIBPNG=yes
  DEFAULT_wxUSE_LIBJPEG=yes
-  DEFAULT_wxUSE_ODBC=no
+  DEFAULT_wxUSE_ODBC=yes

  DEFAULT_wxUSE_STD_IOSTREAM=no
  DEFAULT_wxUSE_FILE=yes
@@ -834,6 +835,7 @@ 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
@@ -855,7 +857,7 @@ else

  DEFAULT_wxUSE_UNICODE=no
  DEFAULT_wxUSE_WCSRTOMBS=no
-  
+
  DEFAULT_wxUSE_GIF=yes
  DEFAULT_wxUSE_PCX=yes
  DEFAULT_wxUSE_PNM=yes
@@ -880,6 +882,86 @@ for toolkit in `echo $ALL_TOOLKITS`; do
  fi
 done

+dnl ---------------------------------------------------------------------------
+dnl --disable-gui will build only non-GUI part of wxWindows: check for this
+dnl first to disable many other switches if it's given
+dnl
+dnl NB: this is still in testing stage, don't use if you don't know what you're
+dnl     doing
+dnl ---------------------------------------------------------------------------
+
+WX_ARG_ENABLE(gui,         [  --enable-gui            use GUI classes], wxUSE_GUI)
+
+dnl disable everything GUI related then
+if test "$wxUSE_GUI" = "no"; then
+  DEFAULT_wxUSE_ZLIB=no
+  DEFAULT_wxUSE_LIBPNG=no
+  DEFAULT_wxUSE_LIBJPEG=no
+  DEFAULT_wxUSE_SOCKETS=no
+  DEFAULT_wxUSE_JOYSTICK=no
+  DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=no
+  DEFAULT_wxUSE_NORMALIZED_PS_FONTS=no
+  DEFAULT_wxUSE_POSTSCRIPT=no
+  DEFAULT_wxUSE_X_RESOURCES=no
+  DEFAULT_wxUSE_CLIPBOARD=no
+  DEFAULT_wxUSE_TOOLTIPS=no
+  DEFAULT_wxUSE_DRAG_AND_DROP=no
+  DEFAULT_wxUSE_SPLINES=no
+  DEFAULT_wxUSE_MDI_ARCHITECTURE=no
+  DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=no
+  DEFAULT_wxUSE_PRINTING_ARCHITECTURE=no
+  DEFAULT_wxUSE_PROLOGIO=no
+  DEFAULT_wxUSE_RESOURCES=no
+  DEFAULT_wxUSE_CONSTRAINTS=no
+  DEFAULT_wxUSE_IPC=no
+  DEFAULT_wxUSE_HELP=no
+  DEFAULT_wxUSE_WXTREE=no
+  DEFAULT_wxUSE_METAFILE=no
+  DEFAULT_wxUSE_COMMONDLGS=no
+  DEFAULT_wxUSE_DIRDLG=no
+  DEFAULT_wxUSE_TEXTDLG=no
+  DEFAULT_wxUSE_STARTUP_TIPS=no
+  DEFAULT_wxUSE_PROGRESSDLG=no
+  DEFAULT_wxUSE_MINIFRAME=no
+  DEFAULT_wxUSE_HTML=no
+  DEFAULT_wxUSE_FS_INET=no
+  DEFAULT_wxUSE_FS_ZIP=no
+  DEFAULT_wxUSE_BUSYINFO=no
+  DEFAULT_wxUSE_ZIPSTREAM=no
+  DEFAULT_wxUSE_VALIDATORS=yes
+  DEFAULT_wxUSE_ACCEL=no
+  DEFAULT_wxUSE_CARET=no
+  DEFAULT_wxUSE_BMPBUTTON=no
+  DEFAULT_wxUSE_CHECKBOX=no
+  DEFAULT_wxUSE_CHECKLST=no
+  DEFAULT_wxUSE_CHOICE=yes
+  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
+  DEFAULT_wxUSE_NOTEBOOK=no
+  DEFAULT_wxUSE_RADIOBOX=no
+  DEFAULT_wxUSE_RADIOBTN=no
+  DEFAULT_wxUSE_SASH=no
+  DEFAULT_wxUSE_SCROLLBAR=no
+  DEFAULT_wxUSE_SLIDER=no
+  DEFAULT_wxUSE_SPINBTN=no
+  DEFAULT_wxUSE_SPLITTER=no
+  DEFAULT_wxUSE_STATBMP=no
+  DEFAULT_wxUSE_STATBOX=no
+  DEFAULT_wxUSE_STATLINE=no
+  DEFAULT_wxUSE_STATUSBAR=yes
+  DEFAULT_wxUSE_TABDIALOG=no
+  DEFAULT_wxUSE_TOOLBAR=no
+  DEFAULT_wxUSE_TREECTRL=no
+  DEFAULT_wxUSE_GIF=no
+  DEFAULT_wxUSE_PCX=no
+  DEFAULT_wxUSE_PNM=no
+fi
+
 AC_ARG_WITH(gtk,           [  --with-gtk              use GTK+], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(wine,          [  --with-wine             use WINE], [wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1])
@@ -929,15 +1011,6 @@ WX_ARG_ENABLE(no_exceptions, [  --enable-no_exceptions  create code without exce
 WX_ARG_ENABLE(permissive,    [  --enable-permissive     compile code disregarding strict ANSI], wxUSE_PERMISSIVE)
 WX_ARG_ENABLE(no_deps,       [  --enable-no_deps        create code without dependency information], wxUSE_NO_DEPS)

-dnl ---------------------------------------------------------------------------
-dnl --disable-gui will build only non-GUI part of wxWindows
-dnl
-dnl NB: this is still in testing stage, don't use if you don't know what you're
-dnl     doing
-dnl ---------------------------------------------------------------------------
-
-WX_ARG_ENABLE(gui,         [  --enable-gui            use GUI classes], wxUSE_GUI)
-
 dnl ---------------------------------------------------------------------------
 dnl (small) optional non GUI classes
 dnl ---------------------------------------------------------------------------
@@ -1029,6 +1102,7 @@ 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
@@ -1058,6 +1132,7 @@ 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
@@ -1088,6 +1163,7 @@ 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)
@@ -1139,6 +1215,8 @@ dnl we have a default one

 AC_MSG_CHECKING(for toolkit)

+if test "$wxUSE_GUI" = "yes"; then
+
 if test "$TOOLKIT_GIVEN" = 1; then
  dnl convert "yes" to 1 and "no" to 0
  for toolkit in `echo $ALL_TOOLKITS`; do
@@ -1187,6 +1265,11 @@ for toolkit in `echo $ALL_TOOLKITS`; do
  fi
 done

+dnl from "if wxUSE_GUI"
+else
+    AC_MSG_RESULT(base only)
+fi
+
 dnl ---------------------------------------------------------------------------
 dnl Checks for programs
 dnl ---------------------------------------------------------------------------
@@ -1390,6 +1473,8 @@ dnl ----------------------------------------------------------------
 dnl search for toolkit (widget sets)
 dnl ----------------------------------------------------------------

+if test "$wxUSE_GUI" = "yes"; then
+
 TOOLKIT=
 TOOLKIT_INCLUDE=

@@ -1409,14 +1494,14 @@ PROGRAM_EXT=

 if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
    if test "$cross_compiling" = "yes" ; then
-    	AC_MSG_WARN(Cross compiling --- skipping windows.h check)
+        AC_MSG_WARN(Cross compiling --- skipping windows.h check)
    else
-	AC_MSG_CHECKING(for Windows headers)
-    	WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h)
-    	if test "$ac_find_includes" != "" ; then
+        AC_MSG_CHECKING(for Windows headers)
+        WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h)
+        if test "$ac_find_includes" != "" ; then
            AC_MSG_RESULT(found $ac_find_includes)
            TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
-	else
+        else
            AC_MSG_RESULT(no)
            AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
        fi
@@ -1429,10 +1514,10 @@ if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then

    TOOLKIT=MSW

-    GUIOBJS=MSW_GUIOBJS
-    GUIHEADERS=MSW_HEADERS
-    COMMONOBJS=MSW_COMMONOBJS
-    GENERICOBJS=MSW_GENERICOBJS
+    GUIOBJS="\$(MSW_GUIOBJS)"
+    GUIHEADERS="\$(MSW_HEADERS)"
+    COMMONOBJS="\$(MSW_COMMONOBJS)"
+    GENERICOBJS="\$(MSW_GENERICOBJS)"
    UNIXOBJS=
    GUIDIST=MSW_DIST
    PROGRAM_EXT=.exe
@@ -1450,14 +1535,14 @@ if test "$wxUSE_GTK" = 1; then
    GUI_TK_LIBRARY="$GTK_LIBS"
    TOOLKIT=GTK

-    GUIHEADERS=GTK_HEADERS
-    GUIOBJS=GTK_GUIOBJS
-    COMMONOBJS=GTK_COMMONOBJS
-    GENERICOBJS=GTK_GENERICOBJS
-    GUIDEPS=GTK_GUIDEPS
-    COMMONDEPS=GTK_COMMONDEPS
-    GENERICDEPS=GTK_GENERICDEPS
-    UNIXOBJS=UNIXOBJS
+    GUIOBJS="\$(GTK_GUIOBJS)"
+    GUIHEADERS="\$(GTK_HEADERS)"
+    COMMONOBJS="\$(GTK_COMMONOBJS)"
+    GENERICOBJS="\$(GTK_GENERICOBJS)"
+    GUIDEPS="\$(GTK_GUIDEPS)"
+    COMMONDEPS="\$(GTK_COMMONDEPS)"
+    GENERICDEPS="\$(GTK_GENERICDEPS)"
+    UNIXOBJS="\$(UNIX_OBJS)"
    GUIDIST=GTK_DIST
 fi

@@ -1501,14 +1586,14 @@ if test "$wxUSE_WINE" = 1; then
    WXWINE=1
    TOOLKIT=MSW

-    GUIHEADERS=MSW_HEADERS
-    GUIOBJS=MSW_GUIOBJS
-    COMMONOBJS=MSW_COMMONOBJS
-    GENERICOBJS=MSW_GENERICOBJS
-    GUIDEPS=MSW_GUIDEPS
-    COMMONDEPS=MSW_COMMONDEPS
-    GENERICDEPS=MSW_GENERICDEPS
-    UNIXOBJS=UNIXOBJS
+    GUIHEADERS="\$(MSW_HEADERS)"
+    GUIOBJS="\$(MSW_GUIOBJS)"
+    COMMONOBJS="\$(MSW_COMMONOBJS)"
+    GENERICOBJS="\$(MSW_GENERICOBJS)"
+    GUIDEPS="\$(MSW_GUIDEPS)"
+    COMMONDEPS="\$(MSW_COMMONDEPS)"
+    GENERICDEPS="\$(MSW_GENERICDEPS)"
+    UNIXOBJS="\$(UNIX_OBJS)"
    GUIDIST=MSW_DIST
 fi

@@ -1576,24 +1661,17 @@ if test "$wxUSE_MOTIF" = 1; then
    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
    TOOLKIT=MOTIF

-    GUIHEADERS=MOTIF_HEADERS
-    GUIOBJS=MOTIF_GUIOBJS
-    COMMONOBJS=MOTIF_COMMONOBJS
-    GENERICOBJS=MOTIF_GENERICOBJS
-    GUIDEPS=MOTIF_GUIDEPS
-    COMMONDEPS=MOTIF_COMMONDEPS
-    GENERICDEPS=MOTIF_GENERICDEPS
-    UNIXOBJS=UNIXOBJS
+    GUIHEADERS="\$(MOTIF_HEADERS)"
+    GUIOBJS="\$(MOTIF_GUIOBJS)"
+    COMMONOBJS="\$(MOTIF_COMMONOBJS)"
+    GENERICOBJS="\$(MOTIF_GENERICOBJS)"
+    GUIDEPS="\$(MOTIF_GUIDEPS)"
+    COMMONDEPS="\$(MOTIF_COMMONDEPS)"
+    GENERICDEPS="\$(MOTIF_GENERICDEPS)"
+    UNIXOBJS="\$(UNIX_OBJS)"
    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"`

@@ -1603,112 +1681,134 @@ TOOLKIT_DEF="-D__WX${TOOLKIT}__"
 dnl the name of the (libtool) library
 WX_LIBRARY="wx_${TOOLKIT_DIR}"

+    dnl the sources, their dependenices and the headers
+    ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(JPEGOBJS) \$(PNGOBJS) \$(ZLIBOBJS)"
+    ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS)"
+    ALL_HEADERS="\$(GUIHEADERS) \$(HTML_HEADERS) \$(UNIX_HEADERS) \$(PROTOCOL_HEADERS) \$(GENERIC_HEADERS) \$(WX_HEADERS)"
+else
+    dnl leave all TOOLKIT_XXX vars empty
+
+    dnl the sources, their dependenices and the headers
+    ALL_OBJECTS="\$(BASE_OBJS)"
+    ALL_DEPFILES="\${BASE_DEPS}"
+    ALL_HEADERS="\${BASE_HEADERS}"
+
+    dnl building wxBase only
+    WX_LIBRARY="wxbase"
+fi
+
 dnl the name of the (libtool) library
-WX_LIBRARY_NAME="libwx_${TOOLKIT_DIR}.la"
+WX_LIBRARY_NAME="lib${WX_LIBRARY}.la"

 dnl the name of the static library
-WX_LIBRARY_NAME_STATIC="libwx_${TOOLKIT_DIR}.a"
+WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"

 dnl the name of the shared library
-WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"

 dnl the name of the links to the shared library
-WX_LIBRARY_LINK1="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}"
-WX_LIBRARY_LINK2="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so"
-WX_LIBRARY_LINK3="libwx_${TOOLKIT_DIR}.so"
+WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
+WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
+WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"

 dnl shared library settings
 SHARED_LD=
 PIC_FLAG=
-WX_CREATE_LINKS=
+WX_ALL=
+WX_ALL_INSTALLED=

 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"
-  ;;
-  *-*-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
+    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

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

 dnl ------------------------------------------------------------------------
@@ -1725,8 +1825,11 @@ dnl defines HAVE_WCSTR_H
 AC_CHECK_HEADERS(wcstr.h)
 dnl defines HAVE_FNMATCH_H
 AC_CHECK_HEADERS(fnmatch.h)
-dnl defines HAVE_X11_XKBLIB_H
-AC_CHECK_HEADERS(X11/XKBlib.h)
+
+if test "$wxUSE_GUI" = "yes"; then
+    dnl defines HAVE_X11_XKBLIB_H
+    AC_CHECK_HEADERS(X11/XKBlib.h)
+fi

 dnl ---------------------------------------------------------------------------
 dnl Checks for typedefs
@@ -1863,6 +1966,9 @@ AC_CHECK_FUNCS(nanosleep, AC_DEFINE(HAVE_NANOSLEEP), [
 dnl check for uname (POSIX) and gethostname (BSD)
 AC_CHECK_FUNCS(uname gethostname, break)

+dnl check for MT-safe version of strtok
+AC_CHECK_FUNCS(strtok_r)
+
 dnl check for inet_addr, inet_aton, ...
 AC_CHECK_FUNCS(inet_addr)
 AC_CHECK_FUNCS(inet_aton)
@@ -2051,10 +2157,10 @@ fi
 DEP_INFO_FLAGS=
 if test "$GCC" = yes ; then
    if test "$wxUSE_NO_RTTI" = "yes" ; then
-	WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti"
+        WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti"
    fi
    if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
-	WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions"
+        WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions"
    fi
    if test "$wxUSE_PERMISSIVE" = "yes" ; then
       CFLAGS="${CFLAGS} -fpermissive"
@@ -2228,14 +2334,9 @@ if test "$wxUSE_LONGLONG" = "yes"; then
 fi

 if test "$wxUSE_SOCKETS" = "yes" ; then
-    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
+    AC_DEFINE(wxUSE_SOCKETS)
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"
+    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
 fi

 if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
@@ -2299,22 +2400,39 @@ 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
+    dnl and without -ldl and we also try to find shl_load() if there is no
+    dnl dlopen() on this system
    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])])
-    AC_CHECK_FUNCS( shl_load,
-                    [AC_DEFINE(HAVE_SHL_LOAD) HAVE_DL_FUNCS=1 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
+                            LIBS="$LIBS -ldl"
+                        ],
+                        [
+                            AC_CHECK_FUNCS(shl_load,
+                                          [
+                                            AC_DEFINE(HAVE_SHL_LOAD)
+                                            HAVE_SHL_FUNCS=1
+                                          ])
+                        ])
+        ])

    if test "$HAVE_DL_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 "$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
+        fi
    fi
 fi

@@ -2345,6 +2463,7 @@ dnl ----------------------------------------------------------------
 IODBC_C_SRC=""
 if test "$wxUSE_ODBC" = "yes" ; then
  AC_DEFINE(wxUSE_ODBC)
+  WXODBCFLAG="-D_IODBC_"
  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
 fi

@@ -2429,13 +2548,13 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
    if test "$wxUSE_GTK" = 1; then
        if test "$WXGTK12" != 1; then
            AC_MSG_WARN([Drag and drop is only supported under GTK+ 1.2])
-	    wxUSE_DRAG_AND_DROP=no
+            wxUSE_DRAG_AND_DROP=no
        fi
    fi

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

    if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
@@ -2491,6 +2610,11 @@ 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
@@ -2556,7 +2680,7 @@ if test "$wxUSE_STATLINE" = "yes"; then
    if test "$wxUSE_WINE" = 1 ; then
        AC_MSG_WARN([wxStaticLine is not supported under WINE])
    else
-	AC_DEFINE(wxUSE_STATLINE)
+        AC_DEFINE(wxUSE_STATLINE)
    fi
 fi

@@ -2672,16 +2796,13 @@ dnl ---------------------------------------------------------------------------
 dnl Output the makefiles and such from the results found above
 dnl ---------------------------------------------------------------------------

-dnl if we add wxUSE_GUI in the future, it might be handy to separate the libs
-dnl into GUI and non-GUI parts
 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 $GUILIBS"
-
-dnl all the libraries needed to link wxWindows programs (when the library is not
-dnl yet installed)
-LIBS="\${top_builddir}/src/${TOOLKIT_DIR}/${WX_LIBRARY_NAME} $EXTRA_LIBS"
+EXTRA_LIBS="$LIBS $POSIX4_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK"
+if test "$wxUSE_GUI" = "yes"; then
+    EXTRA_LIBS="$EXTRA_LIBS $GUILIBS"
+fi

 dnl all the libraries needed to link wxWindows programs when using the
 dnl makefile system without libtool
@@ -2694,11 +2815,11 @@ dnl C/C++ compiler options used to compile wxWindows
 if test "$GXX" = yes ; then
    dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
    CXXWARNINGS="-Wall"
-    dnl there is one weird warning in docview.h:71 which prevents me from doing
-    dnl this...
+    dnl FIXME: there is one weird warning in docview.h:71 which prevents me from
+    dnl        doing this... (VZ)
    dnl CXXWARNINGS="-Wall -Werror"
 fi
-EXTRA_CFLAGS="$WXDEBUG $PROFILE $OPTIMISE $INCLUDES"
+EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"

 CPPFLAGS="-I\${top_srcdir}/include $CPPFLAGS"
 CFLAGS="$CFLAGS $EXTRA_CFLAGS"
@@ -2712,6 +2833,8 @@ if test "$wxUSE_GUI" = "yes"; then
    dnl      mfc, nativdlg, oleauto, ownerdrw, proplist
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \
                     forty fractal image wxpoem"
+else
+    SAMPLES_SUBDIRS=""
 fi

 dnl for convenience, sort the samples in alphabetical order
@@ -2735,8 +2858,8 @@ AC_SUBST(WX_LIBRARY_LINK3)
 AC_SUBST(PROGRAM_EXT)

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

 AC_SUBST(SHARED_LD)
 AC_SUBST(PIC_FLAG)
@@ -2760,6 +2883,10 @@ AC_SUBST(GUIDEPS)
 AC_SUBST(COMMONDEPS)
 AC_SUBST(GENERICDEPS)
 AC_SUBST(UNIXOBJS)
+AC_SUBST(UNIXDEPS)
+AC_SUBST(ALL_OBJECTS)
+AC_SUBST(ALL_DEPFILES)
+AC_SUBST(ALL_HEADERS)
 AC_SUBST(GUIDIST)

 dnl additional subdirectories where we will build
@@ -2797,9 +2924,9 @@ dnl (the original file name may be overriden by appending another name after a
 dnl colon)
 AC_OUTPUT([
            wx-config
-	    src/make.env
-	    src/makeprog.env
-	    src/makelib.env
+            src/make.env
+            src/makeprog.env
+            src/makelib.env
            Makefile
            samples/Makefile
            samples/bombs/Makefile
@@ -2807,63 +2934,67 @@ AC_OUTPUT([
            samples/checklst/Makefile
            samples/config/Makefile
            samples/controls/Makefile
-	    samples/dialogs/Makefile
-	    samples/docview/Makefile
-	    samples/docvwmdi/Makefile
-	    samples/dnd/Makefile
-	    samples/drawing/Makefile
-	    samples/dynamic/Makefile
-	    samples/image/Makefile
-	    samples/internat/Makefile
-	    samples/layout/Makefile
-	    samples/listctrl/Makefile
-	    samples/mdi/Makefile
-	    samples/minifram/Makefile
+            samples/db/Makefile
+            samples/dialogs/Makefile
+            samples/docview/Makefile
+            samples/docvwmdi/Makefile
+            samples/dnd/Makefile
+            samples/drawing/Makefile
+            samples/dynamic/Makefile
+            samples/image/Makefile
+            samples/internat/Makefile
+            samples/layout/Makefile
+            samples/listctrl/Makefile
+            samples/mdi/Makefile
+            samples/minifram/Makefile
 	    samples/minimal/Makefile
-	    samples/notebook/Makefile
+            samples/nettest/Makefile
+            samples/newgrid/Makefile
+            samples/notebook/Makefile
            samples/printing/Makefile
-            samples/proplist/Makefile
-	    samples/sashtest/Makefile
-	    samples/scroll/Makefile
-	    samples/splitter/Makefile
-	    samples/text/Makefile
-	    samples/thread/Makefile
-	    samples/toolbar/Makefile
-	    samples/treectrl/Makefile
-	    samples/typetest/Makefile
-	    samples/validate/Makefile
-	    samples/wxpoem/Makefile
-	    samples/wxsocket/Makefile
-	    samples/wizard/Makefile
-	    samples/html/Makefile
-	    samples/html/about/Makefile
-	    samples/html/help/Makefile
-	    samples/html/printing/Makefile
-	    samples/html/test/Makefile
-	    samples/html/zip/Makefile
-	    samples/html/virtual/Makefile
-	    samples/html/widget/Makefile
-	    utils/Makefile
-	    utils/wxMMedia2/Makefile
-	    utils/wxMMedia2/lib/Makefile
-	    utils/wxMMedia2/sample/Makefile
-	    utils/glcanvas/Makefile
-	    utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile
-	    utils/ogl/Makefile
-	    utils/ogl/src/Makefile
+	    samples/proplist/Makefile
+            samples/richedit/Makefile
+            samples/sashtest/Makefile
+            samples/scroll/Makefile
+            samples/splitter/Makefile
+            samples/text/Makefile
+            samples/thread/Makefile
+            samples/toolbar/Makefile
+            samples/treectrl/Makefile
+            samples/typetest/Makefile
+            samples/validate/Makefile
+            samples/wxpoem/Makefile
+            samples/wxsocket/Makefile
+            samples/wizard/Makefile
+            samples/html/Makefile
+            samples/html/about/Makefile
+            samples/html/help/Makefile
+            samples/html/printing/Makefile
+            samples/html/test/Makefile
+            samples/html/zip/Makefile
+            samples/html/virtual/Makefile
+            samples/html/widget/Makefile
+            utils/Makefile
+            utils/wxMMedia2/Makefile
+            utils/wxMMedia2/lib/Makefile
+            utils/wxMMedia2/sample/Makefile
+            utils/glcanvas/Makefile
+            utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile
+            utils/ogl/Makefile
+            utils/ogl/src/Makefile
          ],
          [
            chmod +x wx-config
-	    if test ! -d include; then
-	      mkdir include
-	    fi
-	    if test ! -d include/wx; then
-	      mkdir include/wx
-	    fi
-	    if test ! -d include/wx/${TOOLKIT_DIR}; then
-	      mkdir include/wx/${TOOLKIT_DIR}
-	    fi
-	    cp -f setup.h include/wx/${TOOLKIT_DIR}/setup.h
+            if test ! -d include; then
+              mkdir include
+            fi
+            if test ! -d include/wx; then
+              mkdir include/wx
+            fi
+            if test ! -d include/wx/${TOOLKIT_DIR}; then
+              mkdir include/wx/${TOOLKIT_DIR}
+            fi
+            cp -f setup.h include/wx/${TOOLKIT_DIR}/setup.h
          ],
          [
            LN_S="${ac_cv_prog_LN_S}"
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -28,6 +28,8 @@
 # compiler, &c)
 #
 # 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
@@ -37,10 +39,11 @@
 #  S	Socket file (currently doesn't compile under Win16 nor with GNU)
 #  R	Not required for the GTK port
 #  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
@@ -59,7 +62,7 @@ dcpsg.cpp	G	U
 dirdlgg.cpp	G	16
 fontdlgg.cpp	G	G,R
 filedlgg.cpp	G	U,X
-gridg.cpp	G
+grid.cpp	G
 helphtml.cpp	G	G
 helpwxht.cpp	G	G
 helpxlp.cpp	G	G,R
@@ -90,9 +93,9 @@ wizard.cpp	G

 choiccmn.cpp	C	R
 cmndata.cpp	C
-config.cpp	C
+config.cpp	C	B
 ctrlcmn.cpp	C	R
-date.cpp	C
+date.cpp	C	B
 datstrm.cpp	C
 db.cpp	C
 dbtable.cpp	C
@@ -100,15 +103,15 @@ dcbase.cpp	C
 dlgcmn.cpp	C
 docmdi.cpp	C
 docview.cpp	C
-dynarray.cpp	C
-dynlib.cpp	C
-event.cpp	C
-extended.c	C
-ffile.cpp	C
-file.cpp	C
-fileconf.cpp	C
-filefn.cpp	C
-filesys.cpp	C
+dynarray.cpp	C	B
+dynlib.cpp	C	B
+event.cpp	C	B
+extended.c	C	B
+ffile.cpp	C	B
+file.cpp	C	B
+fileconf.cpp	C	B
+filefn.cpp	C	B
+filesys.cpp	C	B
 fontcmn.cpp	C
 framecmn.cpp	C
 fs_inet.cpp	C
@@ -116,7 +119,7 @@ fs_zip.cpp	C
 ftp.cpp	C	S
 gdicmn.cpp	C
 gifdecod.cpp	C
-hash.cpp	C
+hash.cpp	C	B
 helpbase.cpp	C
 http.cpp	C	S
 imagbmp.cpp	C
@@ -127,21 +130,22 @@ imagjpeg.cpp	C	32
 imagpcx.cpp	C	32
 imagpng.cpp	C	32
 imagpnm.cpp	C	32
-intl.cpp	C
+init.cpp	C	B,BO
+intl.cpp	C	B
 ipcbase.cpp	C
 layout.cpp	C
-list.cpp	C
-log.cpp	C
+list.cpp	C	B
+log.cpp	C	B
 memory.cpp	C
-mimetype.cpp	C	32
-module.cpp	C
+mimetype.cpp	C	32,B
+module.cpp	C	B
 mstream.cpp	C
-object.cpp	C
+object.cpp	C	B
 objstrm.cpp	C
 odbc.cpp	C	R
 paper.cpp	C
 prntbase.cpp	C
-process.cpp	C	32
+process.cpp	C	32,B
 protocol.cpp	C	S
 resource.cpp	C
 sckaddr.cpp	C	S
@@ -151,27 +155,27 @@ sckstrm.cpp	C	S
 serbase.cpp	C
 sizer.cpp	C
 socket.cpp	C	S
-stream.cpp	C
-strconv.cpp	C
-string.cpp	C
+stream.cpp	C	B
+strconv.cpp	C	B
+string.cpp	C	B
 tbarbase.cpp	C
 tbarsmpl.cpp	C
 textcmn.cpp	C
-textfile.cpp	C
-time.cpp	C
-timercmn.cpp	C
-tokenzr.cpp	C
-txtstrm.cpp	C
+textfile.cpp	C	B
+time.cpp	C	B
+timercmn.cpp	C	B
+tokenzr.cpp	C	B
+txtstrm.cpp	C	B
 unzip.c	C
 url.cpp	C	S
-utilscmn.cpp	C
+utilscmn.cpp	C	B
 valgen.cpp	C
 validate.cpp	C
 valtext.cpp	C
-variant.cpp	C
+variant.cpp	C	B
 wfstream.cpp	C
 wincmn.cpp	C
-wxchar.cpp	C
+wxchar.cpp	C	B
 wxexpr.cpp	C
 zipstrm.cpp	C
 zstream.cpp	C
@@ -272,8 +276,9 @@ window.cpp	M
 xpmhand.cpp	M
 gsocket.c	M	S

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

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

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

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

-        $file2 = $file;
-        $file =~ s/cp?p?$/\o/;
-        $file2 =~ s/cp?p?$/\d/;
-        $project{"WXMOTIF_COMMONOBJS"} .= $file . " ";
-        $project{"WXMOTIF_COMMONDEPS"} .= $file2 . " "
-    }
+        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 . " "
+        }

-    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 . " "
+        #! 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 . " "
+        }
    }

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

    foreach $file (sort keys %wxUNIX) {
-        $file2 = $file;
-        $file =~ s/cp?p?$/\o/;
-        $file2 =~ s/cp?p?$/\d/;
-        $project{"WXUNIXOBJS"} .= $file . " ";
-        $project{"WXUNIXDEPS"} .= $file2 . " "
+        ($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 . " "
    }
    
    #! headers
    
    foreach $file (sort keys %wxWXINCLUDE) {
-        $project{"WX_HEADERS"} .= $file . " "
+        $project{"WX_HEADERS"} .= $file . " ";
+        $project{"BASE_HEADERS"} .= $file . " " if $wxWXINCLUDE{$file} =~ /\bB\b/;
    }
    
    foreach $file (sort keys %wxGENERICINCLUDE) {
@@ -214,8 +217,9 @@ 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)
+VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10)

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

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

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

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

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

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

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

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

 ZLIBOBJS    = \
 		adler32.o \
@@ -475,16 +488,40 @@ 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

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

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

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

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

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

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

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

 uninstall:
 	@echo " "
@@ -852,6 +889,10 @@ 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)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
    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)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
    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) all
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)  CRTFLAG=$(CRTFLAG) 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)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
    cd $(WXDIR)\src\msw

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

    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 . " "
@@ -27,7 +28,9 @@
    foreach $file (sort keys %wxMSW) {
        next if $wxMSW{$file} =~ /\b16\b/;

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

@@ -130,6 +133,7 @@ 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,6 +5,9 @@ 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,4 +1,78 @@

+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/html/roadmap.htm
+++ b/docs/html/roadmap.htm
@@ -116,6 +116,7 @@ combined base/GUI library for GUI applications only.
 <li>Release date: c. July 2nd, 2000
 <li>Unicode compilation working in wxGTK and wxMSW.
 <li>wxDateTime class.
+<li>Regular expressions support.
 </ul>

 <P>
--- a/docs/html/standard.htm
+++ b/docs/html/standard.htm
@@ -50,6 +50,7 @@ C++ portability guide</A> by David Williams.
    <LI><A HREF="#no_stl">Don't use STL</A></LI>
    <LI><A HREF="#no_fordecl">Don't declare variables inside <TT>for()</TT></A></LI>
    <LI><A HREF="#no_nestedclasses">Don't use nested classes</A></LI>
+    <LI><A HREF="#no_ternarywithobjects">Use ternary operator ?: carefully</A></LI>
  </OL>
  <BR>
  <LI>General recommendations</LI>
@@ -332,6 +333,25 @@ you can try the following:
 <P>A nice side effect is that you don't need to recompile all the files
 including the header if you change the PrivateLibClass declaration (it's
 an example of a more general interface/implementation separation idea).
+
+  <P><LI><A NAME="no_ternarywithobjects"></A><B>Use ternary operator ?: carefully</B></LI><P>
+  The ternary operator <TT>?:</TT> shouldn't be used with objects (i.e. if any
+of its operands are objects) because some compilers (notable Borland C++) fail
+to compile such code.
+<P><U>Workaround</U>: use <TT>if/else</TT> instead.
+<PRE>
+    wxString s1, s2;
+
+    // Borland C++ won't compile the line below
+    wxString s = s1.Len() < s2.Len() ? s1 : s2;
+
+    // but any C++ compiler will compile this
+    wxString s;
+    if ( s1.Len() < s2.Len() )
+        s = s1;
+    else
+        s = s2;
+</PRE>
 </OL>

  <BR>
--- a/docs/latex/wx/dc.tex
+++ b/docs/latex/wx/dc.tex
@@ -418,6 +418,9 @@ Gets the current pen (see \helpref{wxDC::SetPen}{wxdcsetpen}).
 Sets {\it colour} to the colour at the specified location. Windows only; an X implementation
 is being worked on. Not available for wxPostScriptDC or wxMetafileDC.

+\pythonnote{For wxPython the wxColour value is returned and is not
+required as a parameter.}
+
 \membersection{wxDC::GetSize}\label{wxdcgetsize}

 \func{void}{GetSize}{\param{long *}{width}, \param{long *}{height}}
--- 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,7 +7,8 @@ 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.
+List box elements are numbered from zero. Their number is limited in
+some platforms (e.g. ca. 2000 on GTK).

 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/listctrl.tex
+++ b/docs/latex/wx/listctrl.tex
@@ -376,6 +376,10 @@ giving details in {\it flags}. {\it flags} will be a combination of the followin
 wxLIST\_HITTEST\_ONITEMSTATEICON.}
 \end{twocollist}

+\pythonnote{A tuple of values is returned in the wxPython version of
+thsi method.  The first value is the item id and the second is the
+flags value mentioned above.}
+
 \membersection{wxListCtrl::InsertColumn}\label{wxlistctrlinsertcolumn}

 \func{long}{InsertColumn}{\param{long }{col}, \param{wxListItem\& }{info}}
--- a/docs/latex/wx/log.tex
+++ b/docs/latex/wx/log.tex
@@ -52,6 +52,7 @@ empty, {\it HasPendingMessages()} is also provided which allows to explicitly
 verify it.

 \helpref{Flush}{wxlogflush}\\
+\helpref{FlushActive}{wxlogflushactive}\\
 \helpref{HasPendingMessages}{haspendingmessages}

 \membersection{Customization}\label{wxlogcustomization}
@@ -142,6 +143,16 @@ currently. (Almost) for internal use only.
 Shows all the messages currently in buffer and clears it. If the buffer
 is already empty, nothing happens.

+\membersection{wxLog::FlushActive}\label{wxlogflushactive}
+
+\func{static void}{FlushActive}{\void}
+
+Flushes the current log target if any, does nothing if there is none.
+
+See also:
+
+\helpref{Flush}{wxlogflush}
+
 \membersection{wxLog::HasPendingMessages}\label{haspendingmessages}

 \constfunc{bool}{HasPendingMessages}{\void}
--- a/docs/latex/wx/pagedlg.tex
+++ b/docs/latex/wx/pagedlg.tex
@@ -117,25 +117,27 @@ instead of showing a dialog. Windows only.

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

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

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

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

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

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

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

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

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

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

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

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

@@ -169,31 +171,33 @@ 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.
+selected printer properties. Windows only. Units are in millimetres

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

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

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

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

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

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

 \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).
+Sets the left (x) and top (y) minimum margins the user can enter (Windows only). Units are
+in millimetres.

 \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).
+Sets the right (x) and bottom (y) minimum margins the user can enter (Windows only). Units are
+in millimetres.

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

@@ -285,4 +289,3 @@ 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,6 +14,12 @@ 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}\\
@@ -139,7 +145,9 @@ 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.
+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.

 \wxheading{Parameters}

--- a/docs/latex/wx/topics.tex
+++ b/docs/latex/wx/topics.tex
@@ -9,6 +9,7 @@ This chapter contains a selection of topic overviews.
 \input tcontain.tex
 \input tlog.tex
 \input tconfig.tex
+\input tunicode.tex
 \input tbitmap.tex
 \input tdialog.tex
 \input tfont.tex
--- a/docs/latex/wx/tunicode.tex
+++ b/docs/latex/wx/tunicode.tex
@@ -47,6 +47,7 @@ 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 '*'})
@@ -125,6 +126,7 @@ 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
@@ -154,3 +156,5 @@ 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. Windows only. }
+for this style. }
 \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.}
+\twocolitem{\windowstyle{wxRAISED\_BORDER}}{Displays a raised border. GTK only. }
 \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/latex/wx/wxPython.tex
+++ b/docs/latex/wx/wxPython.tex
@@ -365,10 +365,11 @@ as possible to the C++ spec over time.
 \item \helpref{wxBitmapButton}{wxbitmapbutton}
 \item \helpref{wxBitmap}{wxbitmap}
 \item wxBMPHandler
-\item \helpref{wxBoxSizer}{wxBoxSizer}
+\item \helpref{wxBoxSizer}{wxboxsizer}
 \item \helpref{wxBrush}{wxbrush}
 \item \helpref{wxButton}{wxbutton}
 \item \helpref{wxCalculateLayoutEvent}{wxcalculatelayoutevent}
+\item wxCaret
 \item \helpref{wxCheckBox}{wxcheckbox}
 \item \helpref{wxCheckListBox}{wxchecklistbox}
 \item \helpref{wxChoice}{wxchoice}
@@ -401,14 +402,14 @@ as possible to the C++ spec over time.
 \item wxGridCell
 \item wxGridEvent
 \item \helpref{wxGrid}{wxgrid}
-\item \helpref{wxHtmlCell}{wxHtmlCell}
-\item \helpref{wxHtmlContainerCell}{wxHtmlContainerCell}
-\item \helpref{wxHtmlParser}{wxHtmlParser}
-\item \helpref{wxHtmlTagHandler}{wxHtmlTagHandler}
-\item \helpref{wxHtmlTag}{wxHtmlTag}
-\item \helpref{wxHtmlWinParser}{wxHtmlWinParser}
-\item \helpref{wxHtmlWinTagHandler}{wxHtmlWinTagHandler}
-\item \helpref{wxHtmlWindow}{wxHtmlWindow}
+\item \helpref{wxHtmlCell}{wxhtmlcell}
+\item \helpref{wxHtmlContainerCell}{wxhtmlcontainercell}
+\item \helpref{wxHtmlParser}{wxhtmlparser}
+\item \helpref{wxHtmlTagHandler}{wxhtmltaghandler}
+\item \helpref{wxHtmlTag}{wxhtmltag}
+\item \helpref{wxHtmlWinParser}{wxhtmlwinparser}
+\item \helpref{wxHtmlWinTagHandler}{wxhtmlwintaghandler}
+\item \helpref{wxHtmlWindow}{wxhtmlwindow}
 \item wxIconizeEvent
 \item \helpref{wxIcon}{wxicon}
 \item \helpref{wxIdleEvent}{wxidleevent}
@@ -480,7 +481,7 @@ as possible to the C++ spec over time.
 \item \helpref{wxSingleChoiceDialog}{wxsinglechoicedialog}
 \item \helpref{wxSizeEvent}{wxsizeevent}
 \item \helpref{wxSize}{wxsize}
-\item \helpref{wxSizer}{wxSizer}
+\item \helpref{wxSizer}{wxsizer}
 \item wxSizerItem
 \item \helpref{wxSlider}{wxslider}
 \item \helpref{wxSpinButton}{wxspinbutton}
@@ -488,7 +489,7 @@ as possible to the C++ spec over time.
 \item \helpref{wxSplitterWindow}{wxsplitterwindow}
 \item \helpref{wxStaticBitmap}{wxstaticbitmap}
 \item \helpref{wxStaticBox}{wxstaticbox}
-\item \helpref{wxStaticBoxSizer}{wxStaticBoxSizer}
+\item \helpref{wxStaticBoxSizer}{wxstaticboxsizer}
 \item wxStaticLine
 \item \helpref{wxStaticText}{wxstatictext}
 \item \helpref{wxStatusBar}{wxstatusbar}
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -92,7 +92,12 @@ 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. Open a sample project file, choose a configuration, and compile.
+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.
   The project files don't use precompiled headers, to save
   space, but you can switch PCH compiling on for greater speed.

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

   to make the wxWindows core library without debug information
   (wx\lib\wx.lib).
-
-3. Change directory to wx\samples and type 'nmake -f makefile.vc'
+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'
   to make all the samples. You can also make them individually.

 Notes:
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -37,7 +37,9 @@

 #include "wx/event.h"       // for the base class

-#include "wx/window.h"      // for wxTopLevelWindows
+#if wxUSE_GUI
+    #include "wx/window.h"      // for wxTopLevelWindows
+#endif // wxUSE_GUI

 #if wxUSE_LOG
    #include "wx/log.h"
@@ -64,22 +66,33 @@ public:
        // prevents the program from continuing - it's a good place to create
        // the top level program window and return TRUE.
        //
-        // Override: always.
+        // Override: always in GUI application, rarely in console ones.
+#if wxUSE_GUI
    virtual bool OnInit() { return FALSE; };
+#else // !GUI
+    virtual bool OnInit() { return TRUE; };
+#endif // wxUSE_GUI

+#if wxUSE_GUI
        // a platform-dependent version of OnInit(): the code here is likely to
        // depend on the toolkit. default version does nothing.
        //
        // Override: rarely.
    virtual bool OnInitGui() { return TRUE; }
+#endif // wxUSE_GUI

        // called to start program execution - the default version just enters
        // the main GUI loop in which events are received and processed until
        // the last window is not deleted (if GetExitOnFrameDelete) or
-        // ExitMainLoop() is called.
+        // ExitMainLoop() is called. In console mode programs, the execution
+        // of the program really starts here
        //
-        // Override: rarely.
+        // Override: rarely in GUI applications, always in console ones.
+#if wxUSE_GUI
    virtual int OnRun() { return MainLoop(); };
+#else // !GUI
+    virtual int OnRun() = 0;
+#endif // wxUSE_GUI

        // called after the main loop termination. This is a good place for
        // cleaning up (it may be too late in dtor) and is also useful if you
@@ -102,6 +115,7 @@ public:
    // the worker functions - usually not used directly by the user code
    // -----------------------------------------------------------------

+#if wxUSE_GUI
        // execute the main GUI loop, the function returns when the loop ends
    virtual int MainLoop() = 0;

@@ -118,6 +132,7 @@ public:
        // process the first event in the event queue (blocks until an event
        // apperas if there are none currently)
    virtual void Dispatch() = 0;
+#endif // wxUSE_GUI

    // application info: name, description, vendor
    // -------------------------------------------
@@ -144,6 +159,7 @@ public:
    const wxString& GetVendorName() const { return m_vendorName; }
    void SetVendorName(const wxString& name) { m_vendorName = name; }

+#if wxUSE_GUI
    // top level window functions
    // --------------------------

@@ -171,6 +187,8 @@ public:
    void SetExitOnFrameDelete(bool flag) { m_exitOnFrameDelete = flag; }
    bool GetExitOnFrameDelete() const { return m_exitOnFrameDelete; }

+#endif // wxUSE_GUI
+
    // miscellaneous customization functions
    // -------------------------------------

@@ -179,10 +197,15 @@ public:
        // user-defined class (default implementation creates a wxLogGui
        // object) - this log object is used by default by all wxLogXXX()
        // functions.
-    virtual wxLog *CreateLogTarget() { return new wxLogGui; }
+    virtual wxLog *CreateLogTarget()
+#if wxUSE_GUI
+        { return new wxLogGui; }
+#else // !GUI
+        { return new wxLogStderr; }
+#endif // wxUSE_GUI
 #endif // wxUSE_LOG

-
+#if wxUSE_GUI
        // get the standard icon used by wxWin dialogs - this allows the user
        // to customize the standard dialogs. The 'which' parameter is one of
        // wxICON_XXX values
@@ -198,6 +221,7 @@ public:
        // printing.
    virtual void SetPrintMode(int WXUNUSED(mode)) { }
    int GetPrintMode() const { return wxPRINT_POSTSCRIPT; }
+#endif // wxUSE_GUI

    // implementation only from now on
    // -------------------------------
@@ -228,29 +252,35 @@ protected:
    // TRUE if the application wants to get debug output
    bool m_wantDebugOutput;

+#if wxUSE_GUI
    // the main top level window - may be NULL
    wxWindow *m_topWindow;
+#endif // wxUSE_GUI
 };

 // ----------------------------------------------------------------------------
 // now include the declaration of the real class
 // ----------------------------------------------------------------------------

-#if defined(__WXMSW__)
-    #include "wx/msw/app.h"
-#elif defined(__WXMOTIF__)
-    #include "wx/motif/app.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/app.h"
-#elif defined(__WXGTK__)
-    #include "wx/gtk/app.h"
-#elif defined(__WXMAC__)
-    #include "wx/mac/app.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/app.h"
-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/app.h"
-#endif
+#if wxUSE_GUI
+    #if defined(__WXMSW__)
+        #include "wx/msw/app.h"
+    #elif defined(__WXMOTIF__)
+        #include "wx/motif/app.h"
+    #elif defined(__WXQT__)
+        #include "wx/qt/app.h"
+    #elif defined(__WXGTK__)
+        #include "wx/gtk/app.h"
+    #elif defined(__WXMAC__)
+        #include "wx/mac/app.h"
+    #elif defined(__WXPM__)
+        #include "wx/os2/app.h"
+    #elif defined(__WXSTUBS__)
+        #include "wx/stubs/app.h"
+    #endif
+#else // !GUI
+    typedef wxAppBase wxApp;
+#endif // GUI/!GUI

 // ----------------------------------------------------------------------------
 // the global data
@@ -266,11 +296,34 @@ WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
 // global functions
 // ----------------------------------------------------------------------------

+// event loop related functions only work in GUI programs
+// ------------------------------------------------------
+
+#if wxUSE_GUI
+
 // Force an exit from main loop
-void WXDLLEXPORT wxExit();
+extern void WXDLLEXPORT wxExit();

 // Yield to other apps/messages
-bool WXDLLEXPORT wxYield();
+extern bool WXDLLEXPORT wxYield();
+
+#endif // wxUSE_GUI
+
+// console applications may avoid using DECLARE_APP and IMPLEMENT_APP macros
+// and call these functions instead at the program startup and termination
+// -------------------------------------------------------------------------
+
+#if wxUSE_NOGUI
+
+// initialize the library (may be called as many times as needed, but each
+// call to wxInitialize() must be matched by wxUninitialize())
+extern bool WXDLLEXPORT wxInitialize();
+
+// clean up - the library can't be used any more after the last call to
+// wxUninitialize()
+extern void WXDLLEXPORT wxUninitialize();
+
+#endif // wxUSE_NOGUI

 // ----------------------------------------------------------------------------
 // macros for dynamic creation of the application object
--- a/include/wx/arrimpl.cpp
+++ b/include/wx/arrimpl.cpp
@@ -2,7 +2,7 @@
 // Name:        listimpl.cpp
 // Purpose:     helper file for implementation of dynamic lists
 // Author:      Vadim Zeitlin
-// Modified by: 
+// Modified by:
 // Created:     16.10.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
@@ -20,6 +20,9 @@
 *          4) WX_DEFINE_OBJARRAY                                            *
 *****************************************************************************/

+// needed to resolve the conflict between global T and macro parameter T
+#define _WX_ERROR_REMOVE2(x)     wxT("bad index in " #x "::Remove()")
+
 // macro implements remaining (not inline) methods of template list
 // (it's private to this file)
 #undef  _DEFINE_OBJARRAY
@@ -58,7 +61,7 @@ void name::Empty()                                                            \
                                                                              \
 void name::Remove(size_t uiIndex)                                             \
 {                                                                             \
-  wxCHECK_RET( uiIndex < Count(), _T("bad index in " #name "::Remove()") );   \
+  wxCHECK_RET( uiIndex < Count(), _WX_ERROR_REMOVE2(name) );                  \
                                                                              \
  delete (T*)wxBaseArray::Item(uiIndex);                                      \
                                                                              \
@@ -99,8 +102,8 @@ int name::Index(const T& Item, bool bFromEnd) const                           \
    }                                                                         \
  }                                                                           \
                                                                              \
-  return wxNOT_FOUND;                                                           \
-}                                                                             
+  return wxNOT_FOUND;                                                         \
+}

 // redefine the macro so that now it will generate the class implementation
 // old value would provoke a compile-time error if this file is not included
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -15,6 +15,7 @@
 #define _WX_BUFFER_H

 #include "wx/wxchar.h"
+
 #include <string.h> // strdup

 // ----------------------------------------------------------------------------
@@ -27,14 +28,14 @@ class wxCharBuffer
 public:
    wxCharBuffer(const char *str)
    {
-        wxASSERT_MSG( str, _T("NULL string in wxCharBuffer") );
+        wxASSERT_MSG( str, wxT("NULL string in wxCharBuffer") );

        m_str = str ? strdup(str) : (char *)NULL;
    }
    wxCharBuffer(size_t len)
    {
        m_str = (char *)malloc(len+1);
-	m_str[len] = '\0';
+        m_str[len] = '\0';
    }
    // no need to check for NULL, free() does it
   ~wxCharBuffer() { free(m_str); }
@@ -66,7 +67,7 @@ class wxWCharBuffer
 public:
    wxWCharBuffer(const wchar_t *wcs)
    {
-        wxASSERT_MSG( wcs, _T("NULL string in wxWCharBuffer") );
+        wxASSERT_MSG( wcs, wxT("NULL string in wxWCharBuffer") );

        if (wcs) {
          size_t siz = (wcslen(wcs)+1)*sizeof(wchar_t);
@@ -78,7 +79,7 @@ public:
    wxWCharBuffer(size_t len)
    {
        m_wcs = (wchar_t *)malloc((len+1)*sizeof(wchar_t));
-	m_wcs[len] = L'\0';
+        m_wcs[len] = L'\0';
    }

    // no need to check for NULL, free() does it
@@ -100,23 +101,23 @@ public:

   operator const wchar_t *() const { return m_wcs; }
   wchar_t operator[](size_t n) const { return m_wcs[n]; }
-          
+
 private:
   wchar_t *m_wcs;
 };
 #endif

 #if wxUSE_UNICODE
-#define wxMB2WXbuf wxWCharBuffer
-#define wxWX2MBbuf wxCharBuffer
-#define wxWC2WXbuf wxChar*
-#define wxWX2WCbuf wxChar*
-#else
-#define wxMB2WXbuf wxChar*
-#define wxWX2MBbuf wxChar*
-#define wxWC2WXbuf wxCharBuffer
-#define wxWX2WCbuf wxWCharBuffer
-#endif
+    #define wxMB2WXbuf wxWCharBuffer
+    #define wxWX2MBbuf wxCharBuffer
+    #define wxWC2WXbuf wxChar*
+    #define wxWX2WCbuf wxChar*
+#else // ANSI
+    #define wxMB2WXbuf wxChar*
+    #define wxWX2MBbuf wxChar*
+    #define wxWC2WXbuf wxCharBuffer
+    #define wxWX2WCbuf wxWCharBuffer
+#endif // Unicode/ANSI

 // ----------------------------------------------------------------------------
 // template class for any kind of data
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -5,13 +5,20 @@
 //              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
+// 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
+//
 // 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
@@ -30,54 +37,85 @@

 #ifndef DB_DOT_H
 #define DB_DOT_H
- 
-#ifdef __GNUG__
-#pragma interface "db.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
 #endif

-#if defined(__WXMSW__) || defined(WIN32)
+#if defined(wx_msw) || 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 __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>
-
+#ifdef __UNIX__
+#   ifndef strnicmp 
+#      define strnicmp strncasecmp 
+#   endif 
+#   ifndef stricmp 
+#      define stricmp strcasecmp 
+#   endif 
+#else 
+#   include <io.h> 
 #endif

 enum		enumDummy		{enumDum1};

-#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
+#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;

 // 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;
@@ -92,14 +130,7 @@ 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_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_WHERE_MATCHING					= 2;

 const int DB_GRANT_SELECT						= 1;
 const int DB_GRANT_INSERT						= 2;
@@ -110,8 +141,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'
@@ -207,9 +238,15 @@ enum ODBC_ERRORS
 struct DbStuff
 {
 	HENV Henv;
-	char Dsn[SQL_MAX_DSN_LENGTH+1];	// Data Source Name
-	char Uid[20];							// User ID
-	char AuthStr[20];						// Authorization string (password)
+	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
 };

 typedef struct
@@ -236,6 +273,30 @@ 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:
@@ -261,7 +322,7 @@ public:
 	struct
 	{
 		char   dbmsName[40];								// Name of the dbms product
-		char   dbmsVer[40];								// Version # of the dbms product
+		char   dbmsVer[64];								// 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
@@ -308,6 +369,9 @@ 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
@@ -324,24 +388,28 @@ 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		 CreateView(char *viewName, char *colList, char *pSqlStmt, bool attemptDrop=TRUE);
+	bool		 DropView(char *viewName);
 	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[]);
+	CcolInf	*GetColumns(char *tableName[], char *userID=NULL);
 	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);  // Table name can refer to a table, view, alias or synonym
+	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
 	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

@@ -359,6 +427,18 @@ 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.
@@ -368,6 +448,9 @@ 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:        table.h
+// Name:        dbtable.h
 // Purpose:     Declaration of the wxTable class.
 // Author:      Doug Card
 // Modified by:
@@ -23,16 +23,30 @@
 // SYNOPSIS STOP
 */

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

-#ifdef __GNUG__
-#pragma interface "dbtable.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
 #endif

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

-const int ROWID_LEN = 24;  // 18 is the max, 24 is in case it gets larger
+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;

 // The following class is used to define a column of a table.
 // The wxTable constructor will dynamically allocate as many of
@@ -46,7 +60,7 @@ const int ROWID_LEN = 24;  // 18 is the max, 24 is in case it gets larger
 class WXDLLEXPORT CcolDef
 {
 public:
-	char    ColName[DB_MAX_COLUMN_NAME_LEN+1];	// Column Name  glt 4/19/97 added one for the null terminator
+	char    ColName[DB_MAX_COLUMN_NAME_LEN+1];	// Column Name
 	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
@@ -56,13 +70,14 @@ 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];	// Column Name  glt 4/19/97 added one for the null terminator
+	char ColName[DB_MAX_COLUMN_NAME_LEN+1];
 	bool Ascending;
 };  // CidxDef

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

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

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

 	// 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
@@ -109,17 +129,20 @@ 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 Ctable::Query().  Format: ",tbl,tbl..."
+	char *from;				// Allows for joins in a wxTable::Query().  Format: ",tbl,tbl..."

 	// Flags
 	bool selectForUpdate;

 	// Public member functions
-	wxTable(wxDB *pwxDB, const char *tblName, const int nCols, const char *qryTblName = 0);
+	wxTable(wxDB *pwxDB, const char *tblName, const int nCols,
+		const char *qryTblName = 0, bool qryOnly = !QUERY_ONLY, char *tblPath=NULL);
 	virtual ~wxTable();
 	bool	Open(void);
-	bool	CreateTable(void);
-	bool	CreateIndex(char * idxName, bool unique, int noIdxCols, CidxDef *pIdxDefs);
+	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	CloseCursor(HSTMT cursor);
 	int   Insert(void);
 	bool	Update(void);
@@ -154,11 +177,19 @@ 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);
-	bool	SetCursor(int cursorNo = DB_CURSOR0);
-	int	GetCursor(void) { return(currCursorNo); }
+	HSTMT *NewCursor(bool setCursor = FALSE, bool bindColumns = TRUE);
+	bool	DeleteCursor(HSTMT *hstmtDel);
+	void	SetCursor(HSTMT *hstmtActivate = (void **) DEFAULT_CURSOR);
+	HSTMT GetCursor(void) { return(hstmt); }
 	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/debug.h
+++ b/include/wx/debug.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        debug.h
+// Name:        wx/debug.h
 // Purpose:     Misc debug functions and macros
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

 #ifndef   _WX_DEBUG_H_
@@ -16,24 +16,19 @@

 #include  "wx/wxchar.h"

-#ifndef __TFILE__
-#define __XFILE__(x) _T(x)
-#define __TFILE__ __XFILE__(__FILE__)
-#endif
-
 // ----------------------------------------------------------------------------
-/** 
-  @name Debugging macros 
+/**
+  @name Debugging macros

  All debugging macros rely on ASSERT() which in turn calls user-defined
  OnAssert() function. To keep things simple, it's called even when the
  expression is TRUE (i.e. everything is ok) and by default does nothing: just
  returns the same value back. But if you redefine it to do something more sexy
-  (popping up a message box in your favourite GUI, sending you e-mail or 
+  (popping up a message box in your favourite GUI, sending you e-mail or
  whatever) it will affect all ASSERTs, FAILs and CHECKs in your code.
  <BR>
  <BR>
-  <b>Warning</b>: if you don't like advices on programming style, don't read 
+  <b>Warning</b>: if you don't like advices on programming style, don't read
  further! ;-)
  <BR>
  <BR>
@@ -94,13 +89,13 @@

 // NB: these macros work also in release mode!

-/** 
+/**
  These macros must be used only in invalid situation: for example, an
  invalid parameter (NULL pointer) is passed to a function. Instead of
  dereferencing it and causing core dump the function might try using
  CHECK( p != NULL ) or CHECK( p != NULL, return LogError("p is NULL!!") )

-  @name Macros which remain even in 'release' mode 
+  @name Macros which remain even in 'release' mode
 */
 //@{
  /// check that expression is true, "return" if not (also FAILs in debug mode)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -47,10 +47,6 @@
        #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__)
@@ -115,13 +111,11 @@
 #   pragma suppress 571             // Virtual function hiding
 #endif // __SALFORDC__

-#ifdef __VISUALC__
-#ifndef WIN32
-// VC1.5 does not have LPTSTR type
-#define LPTSTR LPSTR
-#define LPCTSTR LPCSTR
-#endif
-#endif
+#if defined(__VISUALC__) && !defined(WIN32)
+    // VC1.5 does not have LPTSTR type
+    #define LPTSTR LPSTR
+    #define LPCTSTR LPCSTR
+#endif // VC++ 1.5

 // Digital Unix C++ compiler only defines this symbol for .cxx and .hxx files,
 // so define it ourselves
@@ -190,8 +184,9 @@
 // Make sure the environment is set correctly
 #if defined(__WXMSW__) && defined(__X__)
    #error "Target can't be both X and Windows"
-#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXPM__) && \
-      !defined(__WXMAC__) && !defined(__X__) && !defined(__WXQT__) && !defined(__WXSTUBS__)
+#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
+      !defined(__WXPM__) && !defined(__WXMAC__) && !defined(__X__) && \
+      !defined(__WXQT__) && !defined(__WXSTUBS__) && wxUSE_GUI
    #error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__WXMAC__|__WXQT__|__WXPM__|__WXSTUBS__]"
 #endif

@@ -207,6 +202,12 @@
 #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__)
@@ -215,6 +216,17 @@

 #include "wx/version.h"

+// ----------------------------------------------------------------------------
+// compatibility defines
+// ----------------------------------------------------------------------------
+
+// possibility to build non GUI apps is new, so don't burden ourselves with
+// compatibility code
+#if !wxUSE_GUI
+    #undef WXWIN_COMPATIBILITY_2
+    #define WXWIN_COMPATIBILITY_2 0
+#endif // !GUI
+
 // ============================================================================
 // non portable C++ features
 // ============================================================================
@@ -223,21 +235,14 @@
 // check for native bool type and TRUE/FALSE constants
 // ----------------------------------------------------------------------------

-#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__) || defined(__WXPM__) || defined(__WXSTUBS__)
-    // Bool is now obsolete, use bool instead
-    // typedef int Bool;
+// define boolean constants if not done yet
+#ifndef TRUE
+    #define TRUE  1
+#endif

-    #ifndef TRUE
-        #define TRUE  1
-        #define FALSE 0
-        #define Bool_DEFINED
-    #endif
-#elif defined(__WXMSW__)
-    #ifndef TRUE
-        #define TRUE  1
-        #define FALSE 0
-    #endif
-#endif // TRUE/FALSE
+#ifndef FALSE
+    #define FALSE 0
+#endif

 // Add more tests here for Windows compilers that already define bool
 // (under Unix, configure tests for this)
@@ -870,11 +875,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          0x0010
+#define wxGA_SMOOTH          0x0020

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

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

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

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

 // ----------------------------------------------------------------------------
 // A class which groups functions dealing with connecting to the network from a
@@ -65,8 +67,17 @@ 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
@@ -78,7 +89,7 @@ public:
                      bool async = TRUE) = 0;

    // returns TRUE if (async) dialing is in progress
-    virtual bool IsDialling() const = 0;
+    virtual bool IsDialing() const = 0;

    // cancel dialing the number initiated with Dial(async = TRUE)
    // NB: this won't result in DISCONNECTED event being sent
@@ -90,6 +101,14 @@ 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
@@ -129,8 +148,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 = _T("/usr/bin/pon"),
-                      const wxString& commandHangup = _T("/usr/bin/poff")) = 0;
+    SetConnectCommand(const wxString& commandDial = wxT("/usr/bin/pon"),
+                      const wxString& commandHangup = wxT("/usr/bin/poff")) = 0;
 };

 // ----------------------------------------------------------------------------
@@ -164,6 +183,7 @@ 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,6 +151,11 @@ 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")
+
 // ----------------------------------------------------------------------------
 // This macro generates a new array class. It is intended for storage of simple
 // types of sizeof()<=sizeof(long) or pointers if sizeof(pointer)<=sizeof(long)
@@ -170,7 +175,7 @@ public:                                                             \
    size_t type = sizeof(T);                                        \
    size_t sizelong = sizeof(long);                                 \
    if ( type > sizelong )                                          \
-      { wxFAIL_MSG( _T("illegal use of DEFINE_ARRAY") ); }          \
+      { wxFAIL_MSG( _WX_ERROR_SIZEOF ); }                           \
  }                                                                 \
                                                                    \
  name& operator=(const name& src)                                  \
@@ -197,7 +202,7 @@ public:                                                             \
  void Remove(T Item)                                               \
    { int iIndex = Index(Item);                                     \
      wxCHECK2_MSG( iIndex != wxNOT_FOUND, return,                  \
-        _T("removing inexisting element in wxArray::Remove") );     \
+         _WX_ERROR_REMOVE);                                         \
      wxBaseArray::Remove((size_t)iIndex); }                        \
                                                                    \
  void Sort(CMPFUNC##T fCmp) { wxBaseArray::Sort((CMPFUNC)fCmp); }  \
@@ -232,7 +237,7 @@ public:                                                             \
  { size_t type = sizeof(T);                                        \
    size_t sizelong = sizeof(long);                                 \
    if ( type > sizelong )                                          \
-      { wxFAIL_MSG( _T("illegal use of DEFINE_ARRAY") ); }          \
+      { wxFAIL_MSG( _WX_ERROR_SIZEOF ); }                           \
    m_fnCompare = fn;                                               \
  }                                                                 \
                                                                    \
@@ -259,7 +264,7 @@ public:                                                             \
  void Remove(T Item)                                               \
    { int iIndex = Index(Item);                                     \
      wxCHECK2_MSG( iIndex != wxNOT_FOUND, return,                  \
-        _T("removing inexisting element in wxArray::Remove") );     \
+        _WX_ERROR_REMOVE );                                         \
      wxBaseArray::Remove((size_t)iIndex); }                        \
                                                                    \
 private:                                                            \
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -18,16 +18,31 @@

 #include "wx/defs.h"
 #include "wx/object.h"
-#include "wx/gdicmn.h"
+
+#if wxUSE_GUI
+    #include "wx/gdicmn.h"
+#endif

 #if wxUSE_THREADS
    #include "wx/thread.h"
 #endif

-/*
- * Event types
- *
- */
+// ----------------------------------------------------------------------------
+// forward declarations
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxList;
+
+#if wxUSE_GUI
+    class WXDLLEXPORT wxClientData;
+    class WXDLLEXPORT wxDC;
+    class WXDLLEXPORT wxMenu;
+    class WXDLLEXPORT wxWindow;
+#endif // wxUSE_GUI
+
+// ----------------------------------------------------------------------------
+// Event types
+// ----------------------------------------------------------------------------

 typedef int wxEventType;

@@ -336,6 +351,8 @@ public:
    bool              m_isCommandEvent;
 };

+#if wxUSE_GUI
+
 // Item or menu event class
 /*
 wxEVT_COMMAND_BUTTON_CLICKED
@@ -354,8 +371,6 @@ public:
 wxEVT_COMMAND_COMBOBOX_SELECTED
 */

-class WXDLLEXPORT wxClientData;
-
 class WXDLLEXPORT wxCommandEvent : public wxEvent
 {
    DECLARE_DYNAMIC_CLASS(wxCommandEvent)
@@ -523,7 +538,6 @@ public:
 wxEVT_NC_RIGHT_DCLICK,
 */

-class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxMouseEvent : public wxEvent
 {
    DECLARE_DYNAMIC_CLASS(wxMouseEvent)
@@ -764,7 +778,6 @@ public:
 wxEVT_ERASE_BACKGROUND
 */

-class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxEraseEvent : public wxEvent
 {
    DECLARE_DYNAMIC_CLASS(wxEraseEvent)
@@ -884,7 +897,7 @@ public:
    {
        // GetVeto() will return FALSE anyhow...
        wxCHECK_RET( m_canVeto,
-                     _T("call to Veto() ignored (can't veto this event)") );
+                     wxT("call to Veto() ignored (can't veto this event)") );

        m_veto = veto;
    }
@@ -1069,36 +1082,11 @@ public:
    void CopyObject(wxObject& obj) const;
 };

-// Idle event
-/*
- wxEVT_IDLE
- */
-
-class WXDLLEXPORT wxIdleEvent : public wxEvent
-{
-    DECLARE_DYNAMIC_CLASS(wxIdleEvent)
-
-public:
-    wxIdleEvent()
-        { m_eventType = wxEVT_IDLE; m_requestMore = FALSE; }
-
-    void RequestMore(bool needMore = TRUE) { m_requestMore = needMore; }
-    bool MoreRequested() const { return m_requestMore; }
-
-    void CopyObject(wxObject& obj) const;
-
-protected:
-    bool m_requestMore;
-};
-
 // Update UI event
 /*
 wxEVT_UPDATE_UI
 */

-class WXDLLEXPORT wxMenu;
-class WXDLLEXPORT wxWindow;
-
 class WXDLLEXPORT wxUpdateUIEvent : public wxCommandEvent
 {
    DECLARE_DYNAMIC_CLASS(wxUpdateUIEvent)
@@ -1256,6 +1244,30 @@ public:
    wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); }
 };

+#endif // wxUSE_GUI
+
+// Idle event
+/*
+ wxEVT_IDLE
+ */
+
+class WXDLLEXPORT wxIdleEvent : public wxEvent
+{
+    DECLARE_DYNAMIC_CLASS(wxIdleEvent)
+
+public:
+    wxIdleEvent()
+        { m_eventType = wxEVT_IDLE; m_requestMore = FALSE; }
+
+    void RequestMore(bool needMore = TRUE) { m_requestMore = needMore; }
+    bool MoreRequested() const { return m_requestMore; }
+
+    void CopyObject(wxObject& obj) const;
+
+protected:
+    bool m_requestMore;
+};
+
 /* TODO
 wxEVT_POWER,
 wxEVT_MOUSE_CAPTURE_CHANGED,
@@ -1267,11 +1279,6 @@ public:
 wxEVT_COMPARE_ITEM
 */

-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxControl;
-
-// struct WXDLLEXPORT wxEventTableEntry;
-
 typedef void (wxObject::*wxObjectEventFunction)(wxEvent&);

 struct WXDLLEXPORT wxEventTableEntry
@@ -1312,7 +1319,7 @@ public:
    virtual void OnCommand(wxWindow& WXUNUSED(win),
                           wxCommandEvent& WXUNUSED(event))
    {
-        wxFAIL_MSG(_T("shouldn't be called any more"));
+        wxFAIL_MSG(wxT("shouldn't be called any more"));
    }

    // Called if child control has no callback function
@@ -1373,6 +1380,7 @@ protected:
 };

 typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&);
+#if wxUSE_GUI
 typedef void (wxEvtHandler::*wxCommandEventFunction)(wxCommandEvent&);
 typedef void (wxEvtHandler::*wxScrollEventFunction)(wxScrollEvent&);
 typedef void (wxEvtHandler::*wxScrollWinEventFunction)(wxScrollWinEvent&);
@@ -1398,6 +1406,7 @@ typedef void (wxEvtHandler::*wxMaximizeEventFunction)(wxShowEvent&);
 typedef void (wxEvtHandler::*wxNavigationKeyEventFunction)(wxNavigationKeyEvent&);
 typedef void (wxEvtHandler::*wxPaletteChangedEventFunction)(wxPaletteChangedEvent&);
 typedef void (wxEvtHandler::*wxQueryNewPaletteEventFunction)(wxQueryNewPaletteEvent&);
+#endif // wxUSE_GUI

 // N.B. In GNU-WIN32, you *have* to take the address of a member function
 // (use &) or the compiler crashes...
@@ -1603,13 +1612,17 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \
 #define EVT_UPDATE_UI(id, func) \
 { wxEVT_UPDATE_UI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxUpdateUIEventFunction) & func, (wxObject *) NULL },\

-/*
- * Helper functions
- */
+// ----------------------------------------------------------------------------
+// Helper functions
+// ----------------------------------------------------------------------------
+
+#if wxUSE_GUI

 // Find a window with the focus, that is also a descendant of the given window.
 // This is used to determine the window to initially send commands to.
 wxWindow* wxFindFocusDescendant(wxWindow* ancestor);

+#endif // wxUSE_GUI
+
 #endif
        // _WX_EVENTH__
--- 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 = _T(""))
+  void Attach(FILE *fp, const wxString& name = wxT(""))
    { 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 = _T(""),
-               const wxString& localFilename = _T(""),
-               const wxString& globalFilename = _T(""),
+               const wxString& vendorName = wxT(""),
+               const wxString& localFilename = wxT(""),
+               const wxString& globalFilename = wxT(""),
               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        _T('.')
-#define wxFILE_SEP_DSK        _T(':')
-#define wxFILE_SEP_PATH_DOS   _T('\\')
-#define wxFILE_SEP_PATH_UNIX  _T('/')
+#define wxFILE_SEP_EXT        wxT('.')
+#define wxFILE_SEP_DSK        wxT(':')
+#define wxFILE_SEP_PATH_DOS   wxT('\\')
+#define wxFILE_SEP_PATH_UNIX  wxT('/')

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

 // platform independent versions
 #ifdef  __UNIX__
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -195,10 +195,7 @@ 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,9 +18,7 @@
 #   define wxFontDialog wxGenericFontDialog
 #   define sm_classwxFontDialog sm_classwxGenericFontDialog
 #elif defined(__WXPM__)
-#include "wx/generic/fontdlgg.h"
-#   define wxFontDialog wxGenericFontDialog
-#   define sm_classwxFontDialog sm_classwxGenericFontDialog
+#include "wx/os2/fontdlg.h"
 #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 = _T(""));
+    virtual bool EnumerateEncodings(const wxString& family = wxT(""));

    // 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 = _T("filelist") );
+                const wxString &name = wxT("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,6 +352,12 @@ 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 = _T(""));
+   bool Update(int value = -1, const wxString& newmsg = wxT(""));

   /* 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,11 +281,7 @@ public:
    }

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

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

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

 #endif
    // _WX_GRID_H_BASE_
--- a/include/wx/gtk/accel.h
+++ b/include/wx/gtk/accel.h
@@ -56,8 +56,7 @@ 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,6 +80,7 @@ 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,56 +43,57 @@ 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;   
+    bool         m_hasFocus;
+    bool         m_isSelected;
+    wxBitmap     m_bitmap; 
+    wxBitmap     m_disabled;
+    wxBitmap     m_focus;
+    wxBitmap     m_selected;   
+  
+private:
+    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 };

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

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

    void Unshare();

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

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

-
 #ifndef __GTKBUTTONH__
 #define __GTKBUTTONH__

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

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

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

-
 #ifndef __GTKCHECKBOXH__
 #define __GTKCHECKBOXH__

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

 class wxCheckBox: public wxControl
 {
-DECLARE_DYNAMIC_CLASS(wxCheckBox)
-
 public:
    wxCheckBox();
    wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label,
@@ -73,6 +70,9 @@ 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,8 +36,6 @@ class wxCheckListBox;

 class wxCheckListBox : public wxListBox
 {
-DECLARE_DYNAMIC_CLASS(wxCheckListBox)
-
 public:
    wxCheckListBox();
    wxCheckListBox(wxWindow *parent, wxWindowID id,
@@ -53,6 +51,9 @@ 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,8 +38,6 @@ extern const wxChar *wxChoiceNameStr;

 class wxChoice : public wxControl
 {
-    DECLARE_DYNAMIC_CLASS(wxChoice)
-
 public:
    wxChoice();
    wxChoice( wxWindow *parent, wxWindowID id,
@@ -97,6 +95,9 @@ 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,8 +44,6 @@ extern wxClipboard* wxTheClipboard;

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

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

 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,12 +42,9 @@ 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,
@@ -55,11 +52,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,
@@ -68,63 +65,65 @@ 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 );
  
-  void OnSize( wxSizeEvent &event );
-  void OnChar( wxKeyEvent &event );
-  
-// implementation
+    // implementation
    
-  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();
+    void OnSize( wxSizeEvent &event );
+    void OnChar( wxKeyEvent &event );
  
-  DECLARE_EVENT_TABLE()
+    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()
 };

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

 class wxControl : public wxWindow
 {
-    DECLARE_DYNAMIC_CLASS(wxControl)
-
 public:
    wxControl();
    wxControl( wxWindow *parent,
@@ -50,6 +48,9 @@ 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 = _T("statusBar"));
+            const wxString& name = wxT("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) { m_frameToolBar = toolbar; }
+    void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR

    virtual void SetMenuBar( wxMenuBar *menuBar );
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -121,8 +121,12 @@ class wxMDIChildFrame: public wxFrame
    
 #if wxUSE_STATUSBAR
    // no status bars
-  virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number)=1, long WXUNUSED(style)=1, 
-    wxWindowID WXUNUSED(id)=1, const wxString& WXUNUSED(name)=WXSTRINGCAST NULL ) {return (wxStatusBar*)NULL; }
+  virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number) = 1,
+                                        long WXUNUSED(style) = 1, 
+                                        wxWindowID WXUNUSED(id) = 1,
+                                        const wxString& WXUNUSED(name) = wxEmptyString)
+    { return (wxStatusBar*)NULL; }
+
  virtual wxStatusBar *GetStatusBar() const { return (wxStatusBar*)NULL; }
  virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number)=0 ) {}
  virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -128,11 +128,11 @@ public:

    ~wxMenu();

-    // operations
-        // title
+    // 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,6 +141,9 @@ 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,6 +40,7 @@ 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(void);
-    ~wxRegion(void);
+    wxRegion();
+    ~wxRegion();

    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);
+    void Clear();

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

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

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

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

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

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

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

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

-    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(); }
+    long GetX() const;
+    long GetY() const;
+    long GetW() const;
+    long GetWidth() const { return GetW(); }
+    long GetH() const;
+    long GetHeight() const { return GetH(); }
    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }

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


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

-#ifndef __GTKSPINPUTTH__
+#ifndef __GTKSPINBUTTH__
 #define __GTKSPINBUTTH__

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

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

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

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

 #endif
--- a/include/wx/gtk/spinctrl.h
+++ b/include/wx/gtk/spinctrl.h
@@ -0,0 +1,62 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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,66 +36,74 @@ 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;
-#endif
+  
+  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;
 };

 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);
-#endif
+					
+void       gtk_my_fixed_set_clear      (GtkMyFixed     *myfixed,
+                                        gboolean        clear);		
+					
+void       gtk_myfixed_scroll          	(GtkMyFixed     *myfixed,	
+                                         gint         dx,
+                                         gint         dy);
+					
 void       gtk_myfixed_put             (GtkMyFixed     *myfixed,
                                        GtkWidget      *widget,
-                                        gint16         x,
-                                        gint16         y,
-					gint16         width,
-					gint16         height);
+                                        gint         x,
+                                        gint         y,
+					gint         width,
+					gint         height);

 void       gtk_myfixed_move            (GtkMyFixed     *myfixed,
                                        GtkWidget      *widget,
-                                        gint16         x,
-                                        gint16         y );
+                                        gint         x,
+                                        gint         y );
 					
 void       gtk_myfixed_resize          (GtkMyFixed     *myfixed,
                                        GtkWidget      *widget,
-                                        gint16         width,
-                                        gint16         height );
+                                        gint         width,
+                                        gint         height );
 					
 void       gtk_myfixed_set_size        (GtkMyFixed     *myfixed,
                                        GtkWidget      *widget,
-                                        gint16         x,
-                                        gint16         y,
-                                        gint16         width,
-                                        gint16         height);
+                                        gint         x,
+                                        gint         y,
+                                        gint         width,
+                                        gint         height);
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -172,14 +172,9 @@ 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;
@@ -188,7 +183,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;  /* ! wxStaticBox etc.  */
+    bool                 m_acceptsFocus:1;  /* not wxStaticBox, not wxStaticBitmap 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
@@ -196,13 +191,7 @@ 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,8 +56,7 @@ 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,6 +80,7 @@ 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,56 +43,57 @@ 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;   
+    bool         m_hasFocus;
+    bool         m_isSelected;
+    wxBitmap     m_bitmap; 
+    wxBitmap     m_disabled;
+    wxBitmap     m_focus;
+    wxBitmap     m_selected;   
+  
+private:
+    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 };

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

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

    void Unshare();

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

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

-
 #ifndef __GTKBUTTONH__
 #define __GTKBUTTONH__

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

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

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

-
 #ifndef __GTKCHECKBOXH__
 #define __GTKCHECKBOXH__

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

 class wxCheckBox: public wxControl
 {
-DECLARE_DYNAMIC_CLASS(wxCheckBox)
-
 public:
    wxCheckBox();
    wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label,
@@ -73,6 +70,9 @@ 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,8 +36,6 @@ class wxCheckListBox;

 class wxCheckListBox : public wxListBox
 {
-DECLARE_DYNAMIC_CLASS(wxCheckListBox)
-
 public:
    wxCheckListBox();
    wxCheckListBox(wxWindow *parent, wxWindowID id,
@@ -53,6 +51,9 @@ 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,8 +38,6 @@ extern const wxChar *wxChoiceNameStr;

 class wxChoice : public wxControl
 {
-    DECLARE_DYNAMIC_CLASS(wxChoice)
-
 public:
    wxChoice();
    wxChoice( wxWindow *parent, wxWindowID id,
@@ -97,6 +95,9 @@ 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,8 +44,6 @@ extern wxClipboard* wxTheClipboard;

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

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

 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,12 +42,9 @@ 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,
@@ -55,11 +52,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,
@@ -68,63 +65,65 @@ 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 );
  
-  void OnSize( wxSizeEvent &event );
-  void OnChar( wxKeyEvent &event );
-  
-// implementation
+    // implementation
    
-  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();
+    void OnSize( wxSizeEvent &event );
+    void OnChar( wxKeyEvent &event );
  
-  DECLARE_EVENT_TABLE()
+    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()
 };

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

 class wxControl : public wxWindow
 {
-    DECLARE_DYNAMIC_CLASS(wxControl)
-
 public:
    wxControl();
    wxControl( wxWindow *parent,
@@ -50,6 +48,9 @@ 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 = _T("statusBar"));
+            const wxString& name = wxT("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) { m_frameToolBar = toolbar; }
+    void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR

    virtual void SetMenuBar( wxMenuBar *menuBar );
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -121,8 +121,12 @@ class wxMDIChildFrame: public wxFrame
    
 #if wxUSE_STATUSBAR
    // no status bars
-  virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number)=1, long WXUNUSED(style)=1, 
-    wxWindowID WXUNUSED(id)=1, const wxString& WXUNUSED(name)=WXSTRINGCAST NULL ) {return (wxStatusBar*)NULL; }
+  virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number) = 1,
+                                        long WXUNUSED(style) = 1, 
+                                        wxWindowID WXUNUSED(id) = 1,
+                                        const wxString& WXUNUSED(name) = wxEmptyString)
+    { return (wxStatusBar*)NULL; }
+
  virtual wxStatusBar *GetStatusBar() const { return (wxStatusBar*)NULL; }
  virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number)=0 ) {}
  virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -128,11 +128,11 @@ public:

    ~wxMenu();

-    // operations
-        // title
+    // 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,6 +141,9 @@ 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,6 +40,7 @@ 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(void);
-    ~wxRegion(void);
+    wxRegion();
+    ~wxRegion();

    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);
+    void Clear();

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

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

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

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

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

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

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

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

-    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(); }
+    long GetX() const;
+    long GetY() const;
+    long GetW() const;
+    long GetWidth() const { return GetW(); }
+    long GetH() const;
+    long GetHeight() const { return GetH(); }
    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }

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


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

-#ifndef __GTKSPINPUTTH__
+#ifndef __GTKSPINBUTTH__
 #define __GTKSPINBUTTH__

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

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

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

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

 #endif
--- a/include/wx/gtk1/spinctrl.h
+++ b/include/wx/gtk1/spinctrl.h
@@ -0,0 +1,62 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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,66 +36,74 @@ 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;
-#endif
+  
+  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;
 };

 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);
-#endif
+					
+void       gtk_my_fixed_set_clear      (GtkMyFixed     *myfixed,
+                                        gboolean        clear);		
+					
+void       gtk_myfixed_scroll          	(GtkMyFixed     *myfixed,	
+                                         gint         dx,
+                                         gint         dy);
+					
 void       gtk_myfixed_put             (GtkMyFixed     *myfixed,
                                        GtkWidget      *widget,
-                                        gint16         x,
-                                        gint16         y,
-					gint16         width,
-					gint16         height);
+                                        gint         x,
+                                        gint         y,
+					gint         width,
+					gint         height);

 void       gtk_myfixed_move            (GtkMyFixed     *myfixed,
                                        GtkWidget      *widget,
-                                        gint16         x,
-                                        gint16         y );
+                                        gint         x,
+                                        gint         y );
 					
 void       gtk_myfixed_resize          (GtkMyFixed     *myfixed,
                                        GtkWidget      *widget,
-                                        gint16         width,
-                                        gint16         height );
+                                        gint         width,
+                                        gint         height );
 					
 void       gtk_myfixed_set_size        (GtkMyFixed     *myfixed,
                                        GtkWidget      *widget,
-                                        gint16         x,
-                                        gint16         y,
-                                        gint16         width,
-                                        gint16         height);
+                                        gint         x,
+                                        gint         y,
+                                        gint         width,
+                                        gint         height);
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -172,14 +172,9 @@ 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;
@@ -188,7 +183,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;  /* ! wxStaticBox etc.  */
+    bool                 m_acceptsFocus:1;  /* not wxStaticBox, not wxStaticBitmap 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
@@ -196,13 +191,7 @@ 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;};
+        wxHtmlCell() : wxObject() {m_Next = NULL; m_Parent = NULL; m_Width = m_Height = m_Descent = 0; m_CanLiveOnPagebreak = TRUE;}
        virtual ~wxHtmlCell() {if (m_Next) delete m_Next;};

        void SetParent(wxHtmlContainerCell *p) {m_Parent = p;}
@@ -94,6 +94,20 @@ 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:
@@ -108,6 +122,8 @@ 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

 };

@@ -175,6 +191,7 @@ 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 mod_image.cpp)
-
+	// (used exclusively by m_image.cpp)
+	
 #define HTML_COND_USER              10000
        // User-defined conditions should start from this number

@@ -94,6 +94,8 @@
    /* 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,25 +70,6 @@ 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,
@@ -188,6 +169,7 @@ 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.
@@ -215,6 +197,27 @@ 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 wxInitAllImageHandlers();
+extern void WXDLLEXPORT 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(_T(str))
+    #define   _(str)  wxGetTranslation(wxT(str))
 #endif

 // ----------------------------------------------------------------------------
--- a/include/wx/ipcbase.h
+++ b/include/wx/ipcbase.h
@@ -53,8 +53,8 @@ class WXDLLEXPORT wxConnectionBase: public wxObject
  inline ~wxConnectionBase(void) {}

  // Calls that CLIENT can make
-  virtual bool Execute(wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT ) = 0;
-  virtual bool Execute(const wxString& str) { return Execute(WXSTRINGCAST str, -1, wxIPC_TEXT); }
+  virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT ) = 0;
+  virtual bool Execute(const wxString& str) { return Execute(str, -1, wxIPC_TEXT); }
  virtual char *Request(const wxString& item, int *size = (int *) NULL, wxIPCFormat format = wxIPC_TEXT) = 0;
  virtual bool Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT) = 0;
  virtual bool StartAdvise(const wxString& item) = 0;
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -132,6 +132,13 @@ 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();
@@ -245,7 +252,7 @@ protected:
 // GUI part (andnot just the base one) of the library, they're implemented in
 // src/generic/logg.cpp *and not src/common/log.cpp unlike all the rest)

-#ifndef wxUSE_NOGUI
+#if wxUSE_GUI

 // log everything to a text window (GUI only of course)
 class WXDLLEXPORT wxLogTextCtrl : public wxLog
@@ -338,7 +345,7 @@ private:
    wxLogFrame *m_pLogFrame;      // the log frame
 };

-#endif // wxUSE_NOGUI
+#endif // wxUSE_GUI

 // ----------------------------------------------------------------------------
 // /dev/null log target: suppress logging until this object goes out of scope
@@ -464,7 +471,7 @@ DECLARE_LOG_FUNCTION2(SysError, long lErrCode);
 // ----------------------------------------------------------------------------

 #ifndef __TFILE__
-    #define __XFILE__(x) _T(x)
+    #define __XFILE__(x) Tx)
    #define __TFILE__ __XFILE__(__FILE__)
 #endif

@@ -473,12 +480,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(_T("%s(%d): '%s' failed with error 0x%08lx (%s)."),          \
+        wxLogDebug(wxT("%s(%d): '%s' failed with error 0x%08lx (%s)."),          \
                   __TFILE__, __LINE__, api,                                    \
                   rc, wxSysErrorMsg(rc))
 #else // !VC++
    #define wxLogApiError(api, rc)                                              \
-        wxLogDebug(_T("In file %s at line %d: '%s' failed with "                \
+        wxLogDebug(wxT("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,4 +1056,3 @@ __END_DECLS
 		long nothing ;
 	} ;

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

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

 public:
    // An object of this class must be passed to Get{Open|Print}Command. The
--- a/include/wx/msw/curicop.h
+++ b/include/wx/msw/curicop.h
@@ -3,7 +3,7 @@
 // Header signatures for various resources
 #define BFT_ICON   0x4349   /* 'IC' */
 #define BFT_BITMAP 0x4d42   /* 'BM' */
-#define BFT_CURSOR 0x5450   /* 'PT' */
+#define BFT_CURSOR 0x5450   /* 'PT(' */

 // This WIDTHBYTES macro determines the number of BYTES per scan line.
 #define WIDTHBYTES( i)   ((i + 31) / 32 * 4)
--- a/include/wx/msw/dde.h
+++ b/include/wx/msw/dde.h
@@ -54,8 +54,8 @@ public:
  ~wxDDEConnection(void);

  // Calls that CLIENT can make
-  virtual bool Execute(wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
-  virtual bool Execute(const wxString& str) { return Execute(WXSTRINGCAST str, -1, wxIPC_TEXT); }
+  virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
+  virtual bool Execute(const wxString& str) { return Execute(str, -1, wxIPC_TEXT); }
  virtual char *Request(const wxString& item, int *size = NULL, wxIPCFormat format = wxIPC_TEXT);
  virtual bool Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
  virtual bool StartAdvise(const wxString& item);
--- 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     _T("STATIC")
+#define STATIC_CLASS     wxT("STATIC")
 #define STATIC_FLAGS     (SS_LEFT|WS_CHILD|WS_VISIBLE)
-#define CHECK_CLASS      _T("BUTTON")
+#define CHECK_CLASS      wxT("BUTTON")
 #define CHECK_FLAGS      (BS_AUTOCHECKBOX|WS_TABSTOP|WS_CHILD)
 #define CHECK_IS_FAFA   FALSE
-#define RADIO_CLASS      _T("BUTTON")
+#define RADIO_CLASS      wxT("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      _T("BUTTON")
+#define GROUP_CLASS      wxT("BUTTON")
 #define GROUP_FLAGS      (BS_GROUPBOX|WS_CHILD|WS_VISIBLE)

 /*
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -12,13 +12,12 @@
 #ifndef _WX_SETUP_H_
 #define _WX_SETUP_H_

-/*
- * General features
- *
- */
+// ----------------------------------------------------------------------------
+// global settings
+// ----------------------------------------------------------------------------

-#define wxUSE_CONFIG           1
-                                // Use wxConfig, with CreateConfig in wxApp
+// define this to 0 when building wxBase library
+#define wxUSE_GUI            1

 #define WXWIN_COMPATIBILITY  0
                                // Compatibility with 1.68 API.
@@ -27,6 +26,13 @@
                                // the compatibility code is now very minimal so there
                                // is little advantage to setting it to 1.

+// ----------------------------------------------------------------------------
+// General features
+// ----------------------------------------------------------------------------
+
+#define wxUSE_CONFIG           1
+                                // Use wxConfig, with CreateConfig in wxApp
+
 #define wxUSE_POSTSCRIPT  0
                                // 0 for no PostScript device context
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
@@ -97,6 +103,11 @@

 #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/Show More
+++ b/Show More