From f53561f1f0860024afcc44cdf581e57080d457bf Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Wed, 16 Jun 1999 16:34:31 +0000
Subject: [PATCH]  wxWINE things.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 acconfig.h                 |   3 -
 autogen.sh                 |   5 +
 configure.in               |   6 +-
 distrib/wine/copy_src      | 659 +++++++++++++++++++++++++++++++++++++
 docs/latex/wx/clientdc.tex |   1 +
 docs/latex/wx/function.tex |   4 +-
 docs/latex/wx/paintdc.tex  |   1 +
 docs/wine/COPYING.LIB      | 481 +++++++++++++++++++++++++++
 docs/wine/changes.txt      |  12 +
 docs/wine/install.txt      | 338 +++++++++++++++++++
 docs/wine/licence.txt      |  56 ++++
 docs/wine/readme.txt       |  45 +++
 docs/wine/todo.txt         |  10 +
 include/wx/defs.h          |   8 +
 wxWINE.spec                |  58 ++++
 15 files changed, 1682 insertions(+), 5 deletions(-)
 create mode 100755 autogen.sh
 create mode 100755 distrib/wine/copy_src
 create mode 100644 docs/wine/COPYING.LIB
 create mode 100644 docs/wine/changes.txt
 create mode 100644 docs/wine/install.txt
 create mode 100644 docs/wine/licence.txt
 create mode 100644 docs/wine/readme.txt
 create mode 100644 docs/wine/todo.txt
 create mode 100644 wxWINE.spec

diff --git a/acconfig.h b/acconfig.h
index 4625ab0c8f..8a6cd9cff9 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -583,7 +583,4 @@
 
 @BOTTOM@
 
-#undef PACKAGE
-#undef VERSION
-
 #endif /* __GTKSETUPH__ */
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000000..352bee8c23
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+aclocal -I .
+autoheader
+automake --verbose
+autoconf
diff --git a/configure.in b/configure.in
index d67c3e3a3c..655e2deffb 100644
--- a/configure.in
+++ b/configure.in
@@ -1864,7 +1864,11 @@ if test "$wxUSE_STATBOX" = "yes"; then
 fi
 
 if test "$wxUSE_STATLINE" = "yes"; then
-    AC_DEFINE(wxUSE_STATLINE)
+    if test "$wxUSE_WINE" = 1 ; then
+        AC_MSG_WARN([wxStaticLine is not supported under WINE])
+    else
+        AC_DEFINE(wxUSE_STATLINE)
+    fi
 fi
 
 if test "$wxUSE_STATUSBAR" = "yes"; then
diff --git a/distrib/wine/copy_src b/distrib/wine/copy_src
new file mode 100755
index 0000000000..228dc9a92d
--- /dev/null
+++ b/distrib/wine/copy_src
@@ -0,0 +1,659 @@
+#! /bin/sh
+#
+# This script is creates a dir tree in ~/wxwine_dist which
+# can then be packed into an archive
+
+echo                               --------
+echo    This script will copy the wxWINE release files into ~/wxwine_dist
+echo                               --------
+echo
+
+mkdir ~/wxwine_dist
+mkdir ~/wxwine_dist/wxWINE
+
+echo Base dir..
+
+cd ../..
+cp wxWINE.spec ~/wxwine_dist/wxWINE
+cp Makefile.am ~/wxwine_dist/wxWINE
+cp acconfig.h ~/wxwine_dist/wxWINE
+cp acinclude.m4 ~/wxwine_dist/wxWINE
+cp aclocal.m4 ~/wxwine_dist/wxWINE
+cp configure.in ~/wxwine_dist/wxWINE
+cp configure ~/wxwine_dist/wxWINE
+cp config.sub ~/wxwine_dist/wxWINE
+cp config.guess ~/wxwine_dist/wxWINE
+cp install-sh ~/wxwine_dist/wxWINE
+cp ltconfig ~/wxwine_dist/wxWINE
+cp ltmain.sh ~/wxwine_dist/wxWINE
+cp missing ~/wxwine_dist/wxWINE
+cp mkinstalldirs ~/wxwine_dist/wxWINE
+cp wx-config.in ~/wxwine_dist/wxWINE
+cp setup.h.in ~/wxwine_dist/wxWINE
+cp stamp-h.in ~/wxwine_dist/wxWINE
+cp Makefile.in ~/wxwine_dist/wxWINE
+
+echo Docs..
+
+cd docs/wine
+cp COPYING.LIB ~/wxwine_dist/wxWINE
+cp install.txt ~/wxwine_dist/wxWINE/INSTALL.txt
+cp changes.txt ~/wxwine_dist/wxWINE/CHANGES.txt
+cp licence.txt ~/wxwine_dist/wxWINE/LICENCE.txt
+cp readme.txt ~/wxwine_dist/wxWINE/README.txt
+cp todo.txt ~/wxwine_dist/wxWINE/TODO.txt
+cd ..
+cp symbols.txt ~/wxwine_dist/wxWINE/SYMBOLS.txt
+cd ..
+
+echo Include dir..
+
+mkdir ~/wxwine_dist/wxWINE/include
+cd include
+cp Makefile.am ~/wxwine_dist/wxWINE/include
+cp Makefile.in ~/wxwine_dist/wxWINE/include
+
+mkdir ~/wxwine_dist/wxWINE/include/wx
+cd wx
+cp *.h ~/wxwine_dist/wxWINE/include/wx
+cp *.cpp ~/wxwine_dist/wxWINE/include/wx
+cp Makefile.am ~/wxwine_dist/wxWINE/include/wx
+cp Makefile.in ~/wxwine_dist/wxWINE/include/wx
+
+mkdir ~/wxwine_dist/wxWINE/include/wx/generic
+cd generic
+cp *.h ~/wxwine_dist/wxWINE/include/wx/generic
+cp *.xpm ~/wxwine_dist/wxWINE/include/wx/generic
+cp Makefile.am ~/wxwine_dist/wxWINE/include/wx/generic
+cp Makefile.in ~/wxwine_dist/wxWINE/include/wx/generic
+cd ..
+
+mkdir ~/wxwine_dist/wxWINE/include/wx/unix
+cd unix
+cp *.h ~/wxwine_dist/wxWINE/include/wx/unix
+cp Makefile.am ~/wxwine_dist/wxWINE/include/wx/unix
+cp Makefile.in ~/wxwine_dist/wxWINE/include/wx/unix
+cd ..
+
+mkdir ~/wxwine_dist/wxWINE/include/wx/msw
+cd msw
+cp *.h ~/wxwine_dist/wxWINE/include/wx/msw
+rm ~/wxwine_dist/wxWINE/include/wx/msw/setup.h
+cp Makefile.am ~/wxwine_dist/wxWINE/include/wx/msw
+cp Makefile.in ~/wxwine_dist/wxWINE/include/wx/msw
+cd ..
+
+mkdir ~/wxwine_dist/wxWINE/include/wx/motif
+cd motif
+cp Makefile.am ~/wxwine_dist/wxWINE/include/wx/motif
+cp Makefile.in ~/wxwine_dist/wxWINE/include/wx/motif
+cd ..
+
+mkdir ~/wxwine_dist/wxWINE/include/wx/gtk
+cd gtk
+cp Makefile.am ~/wxwine_dist/wxWINE/include/wx/gtk
+cp Makefile.in ~/wxwine_dist/wxWINE/include/wx/gtk
+cd ..
+
+mkdir ~/wxwine_dist/wxWINE/include/wx/protocol
+cd protocol
+cp *.h ~/wxwine_dist/wxWINE/include/wx/protocol
+cp Makefile.am ~/wxwine_dist/wxWINE/include/wx/protocol
+cp Makefile.in ~/wxwine_dist/wxWINE/include/wx/protocol
+cd ..
+
+cd ../..
+
+echo Misc dir..
+
+mkdir ~/wxwine_dist/wxWINE/misc
+cd misc
+cp Makefile.am ~/wxwine_dist/wxWINE/misc
+cp Makefile.in ~/wxwine_dist/wxWINE/misc
+mkdir ~/wxwine_dist/wxWINE/misc/afm
+cd afm
+cp *.afm ~/wxwine_dist/wxWINE/misc/afm
+cp Makefile.am ~/wxwine_dist/wxWINE/misc/afm
+cp Makefile.in ~/wxwine_dist/wxWINE/misc/afm
+cd ..
+mkdir ~/wxwine_dist/wxWINE/misc/gs_afm
+cd gs_afm
+cp *.afm ~/wxwine_dist/wxWINE/misc/gs_afm
+cp Makefile.am ~/wxwine_dist/wxWINE/misc/gs_afm
+cp Makefile.in ~/wxwine_dist/wxWINE/misc/gs_afm
+cd ../..
+
+echo Src dir..
+
+cd src
+mkdir ~/wxwine_dist/wxWINE/src
+cp Makefile.am ~/wxwine_dist/wxWINE/src
+cp Makefile.in ~/wxwine_dist/wxWINE/src
+
+cd msw
+mkdir ~/wxwine_dist/wxWINE/src/msw
+cp Makefile.am ~/wxwine_dist/wxWINE/src/msw
+cp Makefile.in ~/wxwine_dist/wxWINE/src/msw
+cp *.xbm ~/wxwine_dist/wxWINE/src/msw
+cp *.c ~/wxwine_dist/wxWINE/src/msw
+cp *.inc ~/wxwine_dist/wxWINE/src/msw
+cp *.cpp ~/wxwine_dist/wxWINE/src/msw
+cd ..
+
+cd common
+mkdir ~/wxwine_dist/wxWINE/src/common
+cp glob.inc ~/wxwine_dist/wxWINE/src/common
+cp lexer.l ~/wxwine_dist/wxWINE/src/common
+cp parser.y ~/wxwine_dist/wxWINE/src/common
+cp extended.c ~/wxwine_dist/wxWINE/src/common
+cp *.cpp ~/wxwine_dist/wxWINE/src/common
+cd ..
+
+cd unix
+mkdir ~/wxwine_dist/wxWINE/src/unix
+cp *.cpp ~/wxwine_dist/wxWINE/src/unix
+cd ..
+
+cd generic
+mkdir ~/wxwine_dist/wxWINE/src/generic
+cp *.cpp ~/wxwine_dist/wxWINE/src/generic
+cd ..
+
+cd iodbc
+mkdir ~/wxwine_dist/wxWINE/src/iodbc
+cp * ~/wxwine_dist/wxWINE/src/iodbc
+cd ..
+
+cd zlib
+mkdir ~/wxwine_dist/wxWINE/src/zlib
+cp * ~/wxwine_dist/wxWINE/src/zlib
+cd ..
+
+cd png
+mkdir ~/wxwine_dist/wxWINE/src/png
+cp * ~/wxwine_dist/wxWINE/src/png
+cd ..
+
+cd jpeg
+mkdir ~/wxwine_dist/wxWINE/src/jpeg
+cp * ~/wxwine_dist/wxWINE/src/jpeg
+cd ..
+
+cd ..
+
+echo Utils dir..
+
+cd utils
+mkdir ~/wxwine_dist/wxWINE/utils
+cp Makefile.am ~/wxwine_dist/wxWINE/utils
+cp Makefile.in ~/wxwine_dist/wxWINE/utils
+cd ..
+
+echo Samples dir..
+
+cd samples
+mkdir ~/wxwine_dist/wxWINE/samples
+cp Makefile.am ~/wxwine_dist/wxWINE/samples
+cp Makefile.in ~/wxwine_dist/wxWINE/samples
+
+echo Minimal sample..
+
+cd minimal
+mkdir ~/wxwine_dist/wxWINE/samples/minimal
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/minimal
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/minimal
+cp minimal.cpp ~/wxwine_dist/wxWINE/samples/minimal
+cp mondrian.xpm ~/wxwine_dist/wxWINE/samples/minimal
+cd ..
+
+echo Bombs sample..
+
+cd bombs
+mkdir ~/wxwine_dist/wxWINE/samples/bombs
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/bombs
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/bombs
+cp *.cpp ~/wxwine_dist/wxWINE/samples/bombs
+cp *.h ~/wxwine_dist/wxWINE/samples/bombs
+cp *.xpm ~/wxwine_dist/wxWINE/samples/bombs
+cd ..
+
+echo Caret sample..
+
+cd caret
+mkdir ~/wxwine_dist/wxWINE/samples/caret
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/caret
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/caret
+cp *.cpp ~/wxwine_dist/wxWINE/samples/caret
+cp *.xpm ~/wxwine_dist/wxWINE/samples/caret
+cd ..
+
+echo Checklst sample..
+
+cd checklst
+mkdir ~/wxwine_dist/wxWINE/samples/checklst
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/checklst
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/checklst
+cp *.cpp ~/wxwine_dist/wxWINE/samples/checklst
+cp *.xpm ~/wxwine_dist/wxWINE/samples/checklst
+cd ..
+
+echo Config sample..
+
+cd config
+mkdir ~/wxwine_dist/wxWINE/samples/config
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/config
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/config
+cp *.cpp ~/wxwine_dist/wxWINE/samples/config
+cd ..
+
+echo Controls sample..
+
+cd controls
+mkdir ~/wxwine_dist/wxWINE/samples/controls
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/controls
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/controls
+cp *.cpp ~/wxwine_dist/wxWINE/samples/controls
+cp *.xpm ~/wxwine_dist/wxWINE/samples/controls
+cd icons
+mkdir ~/wxwine_dist/wxWINE/samples/controls/icons
+cp *.xpm ~/wxwine_dist/wxWINE/samples/controls/icons
+cd ../..
+
+echo Db sample..
+
+cd db
+mkdir ~/wxwine_dist/wxWINE/samples/db
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/db
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/db
+cp *.cpp ~/wxwine_dist/wxWINE/samples/db
+cp *.h ~/wxwine_dist/wxWINE/samples/db
+cp *.xpm ~/wxwine_dist/wxWINE/samples/db
+cd ..
+
+echo DDE sample..
+
+cd dde
+mkdir ~/wxwine_dist/wxWINE/samples/dde
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/dde
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/dde
+cp *.cpp ~/wxwine_dist/wxWINE/samples/dde
+cp *.h ~/wxwine_dist/wxWINE/samples/dde
+cp *.xpm ~/wxwine_dist/wxWINE/samples/dde
+cd ..
+
+echo Dialogs sample..
+
+cd dialogs
+mkdir ~/wxwine_dist/wxWINE/samples/dialogs
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/dialogs
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/dialogs
+cp *.cpp ~/wxwine_dist/wxWINE/samples/dialogs
+cp *.h ~/wxwine_dist/wxWINE/samples/dialogs
+cd ..
+
+echo DnD sample..
+
+cd dnd
+mkdir ~/wxwine_dist/wxWINE/samples/dnd
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/dnd
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/dnd
+cp *.cpp ~/wxwine_dist/wxWINE/samples/dnd
+cp *.xpm ~/wxwine_dist/wxWINE/samples/dnd
+cd ..
+
+echo Docview sample..
+
+cd docview
+mkdir ~/wxwine_dist/wxWINE/samples/docview
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/docview
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/docview
+cp *.cpp ~/wxwine_dist/wxWINE/samples/docview
+cp *.h ~/wxwine_dist/wxWINE/samples/docview
+cp *.xpm ~/wxwine_dist/wxWINE/samples/docview
+cd ..
+
+echo DocvwMDI sample..
+
+cd docvwmdi
+mkdir ~/wxwine_dist/wxWINE/samples/docvwmdi
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/docvwmdi
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/docvwmdi
+cp *.cpp ~/wxwine_dist/wxWINE/samples/docvwmdi
+cp *.h ~/wxwine_dist/wxWINE/samples/docvwmdi
+cd ..
+
+echo Dynamic sample..
+
+cd dynamic
+mkdir ~/wxwine_dist/wxWINE/samples/dynamic
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/dynamic
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/dynamic
+cp *.cpp ~/wxwine_dist/wxWINE/samples/dynamic
+cp *.xpm ~/wxwine_dist/wxWINE/samples/dynamic
+cd ..
+
+echo Drawing sample..
+
+cd drawing
+mkdir ~/wxwine_dist/wxWINE/samples/drawing
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/drawing
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/drawing
+cp *.cpp ~/wxwine_dist/wxWINE/samples/drawing
+cp *.xpm ~/wxwine_dist/wxWINE/samples/drawing
+cd ..
+
+echo Forty sample..
+
+cd forty
+mkdir ~/wxwine_dist/wxWINE/samples/forty
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/forty
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/forty
+cp *.cpp ~/wxwine_dist/wxWINE/samples/forty
+cp *.h ~/wxwine_dist/wxWINE/samples/forty
+cp *.xpm ~/wxwine_dist/wxWINE/samples/forty
+cp *.xbm ~/wxwine_dist/wxWINE/samples/forty
+cd ..
+
+echo Fractal sample..
+
+cd fractal
+mkdir ~/wxwine_dist/wxWINE/samples/fractal
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/fractal
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/fractal
+cp *.cpp ~/wxwine_dist/wxWINE/samples/fractal
+cd ..
+
+echo Grid sample..
+
+cd grid
+mkdir ~/wxwine_dist/wxWINE/samples/grid
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/grid
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/grid
+cp *.cpp ~/wxwine_dist/wxWINE/samples/grid
+cd ..
+
+echo Help sample..
+
+cd help
+mkdir ~/wxwine_dist/wxWINE/samples/help
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/help
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/help
+cp *.cpp ~/wxwine_dist/wxWINE/samples/help
+cp *.xpm ~/wxwine_dist/wxWINE/samples/help
+cd doc
+mkdir ~/wxwine_dist/wxWINE/samples/help/doc
+cp * ~/wxwine_dist/wxWINE/samples/help/doc
+cd ../..
+
+echo Image sample..
+
+cd image
+mkdir ~/wxwine_dist/wxWINE/samples/image
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/image
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/image
+cp *.cpp ~/wxwine_dist/wxWINE/samples/image
+cp horse.png ~/wxwine_dist/wxWINE/samples/image
+cp horse.gif ~/wxwine_dist/wxWINE/samples/image
+cp horse.jpg ~/wxwine_dist/wxWINE/samples/image
+cd ..
+
+echo Internat sample..
+
+cd internat
+mkdir ~/wxwine_dist/wxWINE/samples/internat
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/internat
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/internat
+cp *.cpp ~/wxwine_dist/wxWINE/samples/internat
+cp *.xpm ~/wxwine_dist/wxWINE/samples/internat
+cp readme.txt ~/wxwine_dist/wxWINE/samples/internat
+cp wxstd.po ~/wxwine_dist/wxWINE/samples/internat
+cd fr
+mkdir ~/wxwine_dist/wxWINE/samples/internat/fr
+cp *.?o ~/wxwine_dist/wxWINE/samples/internat/fr
+cd ../..
+
+echo Layout sample..
+
+cd layout
+mkdir ~/wxwine_dist/wxWINE/samples/layout
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/layout
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/layout
+cp *.cpp ~/wxwine_dist/wxWINE/samples/layout
+cp *.h ~/wxwine_dist/wxWINE/samples/layout
+cd ..
+
+echo Listctrl sample..
+
+cd listctrl
+mkdir ~/wxwine_dist/wxWINE/samples/listctrl
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/listctrl
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/listctrl
+cp *.cpp ~/wxwine_dist/wxWINE/samples/listctrl
+cp *.h ~/wxwine_dist/wxWINE/samples/listctrl
+cp *.xpm ~/wxwine_dist/wxWINE/samples/listctrl
+cd bitmaps
+mkdir ~/wxwine_dist/wxWINE/samples/listctrl/bitmaps
+cp *.xpm ~/wxwine_dist/wxWINE/samples/listctrl/bitmaps
+cd ../..
+
+echo MDI sample..
+
+cd mdi
+mkdir ~/wxwine_dist/wxWINE/samples/mdi
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/mdi
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/mdi
+cp *.cpp ~/wxwine_dist/wxWINE/samples/mdi
+cp *.h ~/wxwine_dist/wxWINE/samples/mdi
+cp *.xpm ~/wxwine_dist/wxWINE/samples/mdi
+cd bitmaps
+mkdir ~/wxwine_dist/wxWINE/samples/mdi/bitmaps
+cp *.xpm ~/wxwine_dist/wxWINE/samples/mdi/bitmaps
+cd ../..
+
+echo Memcheck sample..
+
+cd memcheck
+mkdir ~/wxwine_dist/wxWINE/samples/memcheck
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/memcheck
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/memcheck
+cp *.cpp ~/wxwine_dist/wxWINE/samples/memcheck
+cp *.xpm ~/wxwine_dist/wxWINE/samples/memcheck
+cd ..
+
+echo Minifram sample..
+
+cd minifram
+mkdir ~/wxwine_dist/wxWINE/samples/minifram
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/minifram
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/minifram
+cp *.cpp ~/wxwine_dist/wxWINE/samples/minifram
+cp *.h ~/wxwine_dist/wxWINE/samples/minifram
+cp *.xpm ~/wxwine_dist/wxWINE/samples/minifram
+cd bitmaps
+mkdir ~/wxwine_dist/wxWINE/samples/minifram/bitmaps
+cp *.xpm ~/wxwine_dist/wxWINE/samples/minifram/bitmaps
+cd ../..
+
+echo Notebook sample..
+
+cd notebook
+mkdir ~/wxwine_dist/wxWINE/samples/notebook
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/notebook
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/notebook
+cp *.cpp ~/wxwine_dist/wxWINE/samples/notebook
+cp *.h ~/wxwine_dist/wxWINE/samples/notebook
+cd ..
+
+echo PNG sample..
+
+cd png
+mkdir ~/wxwine_dist/wxWINE/samples/png
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/png
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/png
+cp *.cpp ~/wxwine_dist/wxWINE/samples/png
+cp *.h ~/wxwine_dist/wxWINE/samples/png
+cp *.png ~/wxwine_dist/wxWINE/samples/png
+cd ..
+
+echo Printing sample..
+
+cd printing
+mkdir ~/wxwine_dist/wxWINE/samples/printing
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/printing
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/printing
+cp *.cpp ~/wxwine_dist/wxWINE/samples/printing
+cp *.h ~/wxwine_dist/wxWINE/samples/printing
+cp *.xpm ~/wxwine_dist/wxWINE/samples/printing
+cd ..
+
+echo Proplist sample..
+
+cd proplist
+mkdir ~/wxwine_dist/wxWINE/samples/proplist
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/proplist
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/proplist
+cp *.cpp ~/wxwine_dist/wxWINE/samples/proplist
+cp *.h ~/wxwine_dist/wxWINE/samples/proplist
+cd ..
+
+echo Resource sample..
+
+cd resource
+mkdir ~/wxwine_dist/wxWINE/samples/resource
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/resource
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/resource
+cp *.cpp ~/wxwine_dist/wxWINE/samples/resource
+cp *.h ~/wxwine_dist/wxWINE/samples/resource
+cp *.wxr ~/wxwine_dist/wxWINE/samples/resource
+cd ..
+
+echo Sashtest sample..
+
+cd sashtest
+mkdir ~/wxwine_dist/wxWINE/samples/sashtest
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/sashtest
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/sashtest
+cp *.cpp ~/wxwine_dist/wxWINE/samples/sashtest
+cp *.h ~/wxwine_dist/wxWINE/samples/sashtest
+cd ..
+
+echo Scroll sample..
+
+cd sashtest
+mkdir ~/wxwine_dist/wxWINE/samples/scroll
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/scroll
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/scroll
+cp *.cpp ~/wxwine_dist/wxWINE/samples/scroll
+cp *.h ~/wxwine_dist/wxWINE/samples/scroll
+cd ..
+
+echo Splitter sample..
+
+cd splitter
+mkdir ~/wxwine_dist/wxWINE/samples/splitter
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/splitter
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/splitter
+cp *.cpp ~/wxwine_dist/wxWINE/samples/splitter
+cd ..
+
+echo Tab sample..
+
+cd tab
+mkdir ~/wxwine_dist/wxWINE/samples/tab
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/tab
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/tab
+cp *.cpp ~/wxwine_dist/wxWINE/samples/tab
+cp *.h ~/wxwine_dist/wxWINE/samples/tab
+cd ..
+
+echo Text sample..
+
+cd text
+mkdir ~/wxwine_dist/wxWINE/samples/text
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/text
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/text
+cp *.cpp ~/wxwine_dist/wxWINE/samples/text
+cd ..
+
+echo Thread sample..
+
+cd thread
+mkdir ~/wxwine_dist/wxWINE/samples/thread
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/thread
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/thread
+cp *.cpp ~/wxwine_dist/wxWINE/samples/thread
+cd ..
+
+echo Toolbar sample..
+
+cd toolbar
+mkdir ~/wxwine_dist/wxWINE/samples/toolbar
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/toolbar
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/toolbar
+cp *.cpp ~/wxwine_dist/wxWINE/samples/toolbar
+cp *.h ~/wxwine_dist/wxWINE/samples/toolbar
+cp *.xpm ~/wxwine_dist/wxWINE/samples/toolbar
+cd bitmaps
+mkdir ~/wxwine_dist/wxWINE/samples/toolbar/bitmaps
+cp *.xpm ~/wxwine_dist/wxWINE/samples/toolbar/bitmaps
+cd ../..
+
+echo TreeCtrl sample..
+
+cd treectrl
+mkdir ~/wxwine_dist/wxWINE/samples/treectrl
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/treectrl
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/treectrl
+cp *.cpp ~/wxwine_dist/wxWINE/samples/treectrl
+cp *.h ~/wxwine_dist/wxWINE/samples/treectrl
+cp *.xpm ~/wxwine_dist/wxWINE/samples/treectrl
+cd ..
+
+echo typetest sample..
+
+cd typetest
+mkdir ~/wxwine_dist/wxWINE/samples/typetest
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/typetest
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/typetest
+cp *.cpp ~/wxwine_dist/wxWINE/samples/typetest
+cp *.h ~/wxwine_dist/wxWINE/samples/typetest
+cp *.xpm ~/wxwine_dist/wxWINE/samples/typetest
+cd ..
+
+echo Validate sample..
+
+cd validate
+mkdir ~/wxwine_dist/wxWINE/samples/validate
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/validate
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/validate
+cp *.cpp ~/wxwine_dist/wxWINE/samples/validate
+cp *.h ~/wxwine_dist/wxWINE/samples/validate
+cp *.xpm ~/wxwine_dist/wxWINE/samples/validate
+cd ..
+
+echo wxPoem sample..
+
+cd wxpoem
+mkdir ~/wxwine_dist/wxWINE/samples/wxpoem
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/wxpoem
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/wxpoem
+cp *.cpp ~/wxwine_dist/wxWINE/samples/wxpoem
+cp *.h ~/wxwine_dist/wxWINE/samples/wxpoem
+cp *.xpm ~/wxwine_dist/wxWINE/samples/wxpoem
+cp wxpoem.dat ~/wxwine_dist/wxWINE/samples/wxpoem
+cp wxpoem.txt ~/wxwine_dist/wxWINE/samples/wxpoem
+cp wxpoem.idx ~/wxwine_dist/wxWINE/samples/wxpoem
+cd ..
+
+echo wxSocket sample..
+
+cd wxsocket
+mkdir ~/wxwine_dist/wxWINE/samples/wxsocket
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/wxsocket
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/wxsocket
+cp *.cpp ~/wxwine_dist/wxWINE/samples/wxsocket
+cp *.xpm ~/wxwine_dist/wxWINE/samples/wxsocket
+cd ../..
+
+cd ~/wxwine_dist
+tar ch wxWINE | gzip -f9 > wxWINE-2.1.0-b6.tgz
diff --git a/docs/latex/wx/clientdc.tex b/docs/latex/wx/clientdc.tex
index 5cd36a8f7b..79ae9e0630 100644
--- a/docs/latex/wx/clientdc.tex
+++ b/docs/latex/wx/clientdc.tex
@@ -12,6 +12,7 @@ To draw on the whole window including decorations, construct a \helpref{wxWindow
 
 \wxheading{Derived from}
 
+\helpref{wxWindowDC}{wxwindowdc}\\
 \helpref{wxDC}{wxdc}
 
 \wxheading{Include files}
diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index bb08c1b42d..28ebd10b29 100644
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -637,11 +637,13 @@ This function is only available under Windows.
 
 \func{void}{wxSetCursor}{\param{wxCursor *}{cursor}}
 
-Globally sets the cursor; only has an effect in MS Windows.
+Globally sets the cursor; only has an effect in Windows and GTK.
 See also \helpref{wxCursor}{wxcursor}, \helpref{wxWindow::SetCursor}{wxwindowsetcursor}.
 
 \section{Printer settings}\label{printersettings}
 
+These routines are obsolete and should no longer be used!
+
 The following functions are used to control PostScript printing. Under
 Windows, PostScript output can only be sent to a file.
 
diff --git a/docs/latex/wx/paintdc.tex b/docs/latex/wx/paintdc.tex
index c56a76832e..c9c88d03e9 100644
--- a/docs/latex/wx/paintdc.tex
+++ b/docs/latex/wx/paintdc.tex
@@ -17,6 +17,7 @@ To draw on the whole window including decorations, construct a \helpref{wxWindow
 
 \wxheading{Derived from}
 
+\helpref{wxWindowDC}{wxwindowdc}\\
 \helpref{wxDC}{wxdc}
 
 \wxheading{Include files}
diff --git a/docs/wine/COPYING.LIB b/docs/wine/COPYING.LIB
new file mode 100644
index 0000000000..eb685a5ec9
--- /dev/null
+++ b/docs/wine/COPYING.LIB
@@ -0,0 +1,481 @@
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+                    675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    c) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    d) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+     Appendix: How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/docs/wine/changes.txt b/docs/wine/changes.txt
new file mode 100644
index 0000000000..4190bf6018
--- /dev/null
+++ b/docs/wine/changes.txt
@@ -0,0 +1,12 @@
+
+20th June '99: wxWINE 2.1 snapshot 6 released
+
+The numbering is just in synch with the wxGTK numbering as this
+is actually the first ever release of wxWINE.
+
+This snapshot just demonstrates that the complete build environment
+for wxWINE is in place and that all that has to be done to get
+wxWINE running is to make WINE work as Win32. No joke intended.
+
+  Robert Roebling
+  
diff --git a/docs/wine/install.txt b/docs/wine/install.txt
new file mode 100644
index 0000000000..bd923a3d50
--- /dev/null
+++ b/docs/wine/install.txt
@@ -0,0 +1,338 @@
+
+  !!! When sending bug reports tell us what version of wxWindows you are 
+      using (including the beta) and what compiler on what system. One 
+      example: wxWINE 2.1 snapshot 6, egcs 1.1.1, Redhat 5.0 !!!
+
+* Preparing WINE
+----------------
+
+Most C++ compilers cannot compile the WINE sources yet (this includes
+all versions of g++ and ecgs) so you have to make a minimal change
+and recompile all of WINE in order to get anywhere.
+
+This change has do be applied to the /include/windef.h file, line 59
+in the section "Calling convention defintions", where the sources
+reads:
+
+#if __i386__
+
+which has to be changed into
+
+#if 0
+
+After this change, you'll have to recompile all of WINE without
+forgetting to install it. The direct consequence of this change
+is that the Win32 binary emulator won't work anymore, as the
+change disables the Windows native calling convention.
+
+* The most simple case
+-----------------------
+
+If you compile wxWindows on Unix for the first time and don't like to read 
+install instructions just do (in the base dir):
+
+./configure --with-wine
+make
+su <type root password>
+make install
+ldconfig
+exit
+
+If you want to remove wxWindows on Unix you can do this:
+
+su <type root password>
+make uninstall
+ldconfig
+exit
+
+* The expert case
+-----------------
+
+If you want to do some more serious cross-platform programming with wxWindows, 
+such as for GTK and Motif, you can now build two complete libraries and use 
+them concurretly. For this end, you have to create a directory for each build 
+of wxWindows - you may also want to create different versions of wxWindows
+and test them concurrently. Most typically, this would be a version configured 
+with --enable-debug_flag and one without. Note, that only one build can currently 
+be installed, so you'd have to use local version of the library for that purpose.
+For building three versions (one GTK, one WINE and a debug version of the WINE 
+source) you'd do this:
+
+md buildmotif
+cd buildmotif
+../configure --with-motif
+make
+cd ..
+
+md buildwine
+cd buildwine
+../configure --with-wine
+make
+cd ..
+
+md buildwined
+cd buildwined
+../configure --with-wine --enable-debug_flag
+make
+cd ..
+
+* The most simple errors
+------------------------
+
+wxWINE doesn't work yet as WINE isn't really up to the task yet. 
+
+You get errors during compilation: The reason is that you probably have a broken 
+compiler, which includes almost everything that is called gcc. If you use gcc 2.8 
+you have to disable optimsation as the compiler will give up with an internal 
+compiler error.
+
+If there is just any way for you to use egcs, use egcs. We cannot fix gcc.
+
+You get immediate segfault when starting any sample or application: This is either 
+due to having compiled the library with different flags or options than your program - 
+typically you might have the __WXDEBUG__ option set for the library but not for your 
+program - or due to using a broken compiler (and its optimisation) such as GCC 2.8.
+
+* The most simple program
+-------------------------
+
+Now create your super-application myfoo.app and compile anywhere with
+
+g++ myfoo.cpp `wx-config --libs --cflags` -o myfoo
+
+* General
+-----------------------
+
+The Unix variants of wxWindows use GNU configure. If you have problems with your 
+make use GNU make instead.
+
+If you have general problems with installation, read my homepage at 
+
+  http://wesley.informatik.uni-freiburg.de/~wxxt
+  
+for newest information. If you still don't have any success, please send a bug 
+report to one of our mailing lists (see my homepage) INCLUDING A DESCRIPTION OF 
+YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR VERSION OF WINE, WXWINE, WHAT DISTRIBUTION 
+YOU USE AND WHAT ERROR WAS REPORTED. I know this has no effect, but I tried...
+
+* GUI libraries
+-----------------------
+
+wxWindows/WINE requires the WINE library to be installed on your system. 
+
+You can get the newest version of the WINE from the WINE homepage at:
+
+  http://www.winehq.com
+  
+* Create your configuration
+-----------------------------
+
+Usage:
+	./configure options
+
+If you want to use system's C and C++ compiler,
+set environment variables CC and CCC as
+
+	% setenv CC cc
+	% setenv CCC CC
+	% ./configure options
+
+to see all the options please use:
+
+	./configure --help
+
+The basic philosophy is that if you want to use different
+configurations, like a debug and a release version, 
+or use the same source tree on different systems,
+you have only to change the environment variable OSTYPE.
+(Sadly this variable is not set by default on some systems
+in some shells - on SGI's for example). So you will have to 
+set it there. This variable HAS to be set before starting 
+configure, so that it knows which system it tries to 
+configure for.
+
+Configure will complain if the system variable OSTYPE has 
+not been defined. And Make in some circumstances as well...
+
+
+* General options
+-------------------
+
+Given below are the commands to change the default behaviour,
+i.e. if it says "--disable-threads" it means that threads
+are enabled by default.
+
+Many of the confiugre options have been thoroughly tested
+in wxWindows snapshot 6, but not yet all (ODBC not).
+
+You must do this by running configure with either of:
+
+        --with-wine              Use the WINE library
+	
+The following options handle the kind of library you want to build.
+
+	--enable-threads        Compile without thread support. Threads
+	                        support is also required for the
+				socket code to work.
+
+	--disable-shared        Do not create shared libraries.
+
+	--disable-optimise	Do not optimise the code. Can
+	                        sometimes be useful for debugging
+				and is required on some architectures
+				such as Sun with gcc 2.8.X which
+				would otherwise produce segvs.
+
+	--enable-profile        Add profiling info to the object 
+				files. Currently broken, I think.
+				
+	--enable-mem_tracing    Add built-in memory tracing. 
+				
+	--enable-dmalloc        Use the dmalloc memory debugger.
+	                        Read more at www.letters.com/dmalloc/
+				
+	--enable-debug_info	Add debug info to object files and
+	                        executables for use with debuggers
+				such as gdb (or its many frontends).
+
+	--enable-debug_flag	Define __DEBUG__ and __WXDEBUG__ when
+	                        compiling. This enable wxWindows' very
+				useful internal debugging tricks (such
+				as automatically reporting illegal calls)
+				to work. Note that program and library
+				must be compiled with the same debug 
+				options.
+
+* Feature Options
+-------------------
+
+Many of the confiugre options have been thoroughly tested
+in wxWindows snapshot 6, but not yet all (ODBC not).
+
+When producing an executable that is linked statically with wxGTK
+you'll be surprised at its immense size. This can sometimes be
+drastically reduced by removing features from wxWindows that 
+are not used in your program. The most relevant such features
+are
+
+	--without-libpng	Disables PNG image format code.
+	
+	--without-libjpeg	Disables JPEG image format code.
+	
+{	--without-odbc          Disables ODBC code. Not yet. }
+	
+        --disable-resources     Disables the use of *.wxr type
+	                        resources.
+		
+	--disable-threads       Disables threads. Will also
+	                        disable sockets.
+
+	--disable-sockets       Disables sockets.
+
+	--disable-dnd           Disables Drag'n'Drop.
+	
+	--disable-clipboard     Disables Clipboard.
+	
+	--disable-serial        Disables object instance serialiasation.
+	
+	--disable-streams       Disables the wxStream classes.
+	
+	--disable-file          Disables the wxFile class.
+	
+	--disable-textfile      Disables the wxTextFile class.
+	
+	--disable-intl          Disables the internationalisation.
+	
+	--disable-validators    Disables validators.
+	
+	--disable-accel         Disables accel.
+	
+Apart from disabling certain features you can very often "strip"
+the program of its debugging information resulting in a significant
+reduction in size.
+
+* Compiling
+-------------
+
+The following must be done in the base directory (e.g. ~/wxGTK
+or ~/wxWin or whatever)
+
+Now the makefiles are created (by configure) and you can compile 
+the library by typing:
+
+	make
+
+make yourself some coffee, as it will take some time. On an old
+386SX possibly two weeks. During compilation, you'll get a few 
+warning messages depending in your compiler.
+
+If you want to be more selective, you can change into a specific
+directiry and type "make" there.
+
+Then you may install the library and it's header files under
+/usr/local/include/wx and /usr/local/lib respectively. You
+have to log in as root (i.e. run "su" and enter the root
+password) and type
+
+        make install	
+
+You can remove any traces of wxWindows by typing
+
+        make uninstall
+	
+If you want to save disk space by removing unnecessary
+object-files:
+
+	 make clean
+
+in the various directories will do the work for you.
+
+* Creating a new Project
+--------------------------
+
+1) The first way uses the installed libraries and header files
+automatically using wx-config
+
+g++ myfoo.cpp `wx-config --libs` `wx-config --cflags` -o myfoo
+
+Using this way, a make file for the minimal sample would look
+like this
+
+CC = g++
+
+minimal: minimal.o
+    $(CC) -o minimal minimal.o `wx-config --libs` 
+
+minimal.o: minimal.cpp mondrian.xpm
+    $(CC) `wx-config --cflags` -c minimal.cpp -o minimal.o
+
+clean: 
+	rm -f *.o minimal
+
+This is certain to become the standard way unless we decide
+to sitch to tmake.
+
+2) The other way creates a project within the source code 
+directories of wxWindows. For this endeavour, you'll need
+the usual number of GNU tools, at least
+
+GNU automake version 1.4
+GNU autoheader version 2.14
+GNU autoconf version 2.14
+GNU libtool version 1.3
+
+and quite possibly 
+
+GNU make
+GNU C++
+
+and if you have all this then you probably know enough to
+go ahead yourself :-)
+
+----------------------
+
+In the hope that it will be useful,
+
+        Robert Roebling <roebling@sun2.ruf.uni-freiburg.de>
+	
+	
diff --git a/docs/wine/licence.txt b/docs/wine/licence.txt
new file mode 100644
index 0000000000..e6dcfbd25c
--- /dev/null
+++ b/docs/wine/licence.txt
@@ -0,0 +1,56 @@
+
+
+wxWindows Library License, Version 3
+====================================
+     
+  Copyright (C) 1998 Julian Smart, Robert Roebling et al. 
+
+  Everyone is permitted to copy and distribute verbatim copies
+  of this license document, but changing it is not allowed. 
+ 
+                          WXWINDOWS LIBRARY LICENSE 
+     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 
+ 
+  This library is free software; you can redistribute it and/or modify it 
+  under the terms of the GNU Library General Public License as published by 
+  the Free Software Foundation; either version 2 of the License, or (at 
+  your option) any later version. 
+   
+  This library is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN- 
+  TABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library 
+  General Public License for more details. 
+ 
+  You should have received a copy of the GNU Library General Public License 
+  along with this software, usually in a file named COPYING.LIB.  If not,   
+  write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,  
+  Boston, MA 02111-1307 USA. 
+ 
+  EXCEPTION NOTICE 
+ 
+  1. As a special exception, the copyright holders of this library give 
+  permission for additional uses of the text contained in this release of 
+  the library as licensed under the wxWindows Library License, applying 
+  either version 3 of the License, or (at your option) any later version of 
+  the License as published by the copyright holders of version 3 of the 
+  License document. 
+ 
+  2. The exception is that you may create binary object code versions of any 
+  works using this library or based on this library, and use, copy, modify, 
+  link and distribute such binary object code files unrestricted under terms 
+  of your choice. 
+ 
+  3. If you copy code from files distributed under the terms of the GNU 
+  General Public License or the GNU Library General Public License into a 
+  copy of this library, as this license permits, the exception does not   
+  apply to the code that you add in this way.  To avoid misleading anyone as 
+  to the status of such modified files, you must delete this exception 
+  notice from such code and/or adjust the licensing conditions notice  
+  accordingly. 
+ 
+  4. If you write modifications of your own for this library, it is your 
+  choice whether to permit this exception to apply to your modifications. 
+  If you do not wish that, you must delete the exception notice from such 
+  code and/or adjust the licensing conditions notice accordingly. 
+
+  
diff --git a/docs/wine/readme.txt b/docs/wine/readme.txt
new file mode 100644
index 0000000000..2aefaf4ca9
--- /dev/null
+++ b/docs/wine/readme.txt
@@ -0,0 +1,45 @@
+
+  Welcome to wxWindows/Wine 2.1 snapshot 6,
+
+you have downloaded version 2.1 of the WINE port of 
+the wxWindows GUI library. This is a developers release
+and is it not suited for production development. Beware
+that major changes can happen before a final release.
+
+More information is available from my homepage at:
+
+  http://wesley.informatik.uni-freiburg.de/~wxxt
+  
+and about the wxWindows project as a whole (and the
+Windows and Motif ports in particular) can be found
+at Julian Smart's homepage at:
+
+  http://web.ukonline.co.uk/julian.smart/wxwin
+  
+Information on how to install can be found in the file
+INSTALL.txt.
+
+When you run into problems, please read the INSTALL.txt and
+follow those instructions. If you still don't have any success,
+please send a bug report to one of our mailing lists (see
+my homepage) INCLUDING A DESCRIPTION OF YOUR SYSTEM AND 
+YOUR PROBLEM, SUCH AS YOUR VERSION OF THE WINE SOURCES, WHAT
+DISTRIBUTION YOU USE AND WHAT ERROR WAS REPORTED. I know 
+this has no effect, but I tried...
+
+The library produced by the install process will be called 
+libwx_mse.a (static) and libwx_msw-2.1.so.0.0.0 (shared) so that 
+once a binary incompatible version of wxWindows/Gtk comes out 
+we'll augment the library version number to avoid linking problems.
+
+Please send problems concerning installation, feature requests, 
+bug reports or comments to the wxWindows users list. Information 
+on how to subscribe is available from my homepage.
+
+wxWindows/Wine doesn't come with any guarantee whatsoever. It might 
+crash your harddisk or destroy your monitor. It doesn't claim to be
+suitable for any special or general purpose.
+
+  Regards,
+
+    Robert Roebling
diff --git a/docs/wine/todo.txt b/docs/wine/todo.txt
new file mode 100644
index 0000000000..188d0fabe4
--- /dev/null
+++ b/docs/wine/todo.txt
@@ -0,0 +1,10 @@
+
+-------------------- High priority ---------------------
+
+Finish WINE.
+
+-------------------- Medium priority ---------------------
+
+  
+-------------------- Low priority ---------------------
+    
diff --git a/include/wx/defs.h b/include/wx/defs.h
index 1e17c22014..ae8cc520a5 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -19,6 +19,14 @@
 #include <stddef.h>
 
 #include "wx/setup.h"
+
+#ifdef PACKAGE
+  #undef PACKAGE
+#endif
+#ifdef VERSION
+  #undef VERSION
+#endif
+
 #include "wx/version.h"
 
 // ----------------------------------------------------------------------------
diff --git a/wxWINE.spec b/wxWINE.spec
new file mode 100644
index 0000000000..ea0fb4174a
--- /dev/null
+++ b/wxWINE.spec
@@ -0,0 +1,58 @@
+# Note that this is NOT a relocatable package
+%define pref /usr
+%define ver 2.1.0
+%define rel 6
+
+Summary: The WINE port of the wxWindows library
+Name: wxWINE
+Version: %{ver}
+Release: %{rel}
+Copyright: wxWindows Licence
+Group: X11/Libraries
+Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxWINE-2.1.0-b6.tgz
+URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html
+Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
+BuildRoot: /tmp/wxwine_root
+
+# all packages providing an implementation of wxWindows library (regardless of
+# the toolkit used) should provide the (virtual) wxwin package, this makes it
+# possible to require wxwin instead of requiring "wxgtk or wxmotif or wxqt..."
+Provides: wxwin
+
+%description
+wxWindows is a free C++ library for cross-platform GUI development.
+With wxWindows, you can create applications for different GUIs (GTK+,
+Motif/LessTif, MS Windows, Mac) from the same source code.
+
+%prep
+%setup -n wxWINE
+./configure --prefix=%{pref}
+
+%build
+cd src && make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make prefix=$RPM_BUILD_ROOT%{pref} install
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%files
+%defattr (644, root, root, 755)
+%doc COPYING.LIB INSTALL.txt LICENCE.txt README.txt SYMBOLS.txt TODO.txt
+%dir %{pref}/include/wx
+%{pref}/include/wx/*
+%dir %{pref}/lib/wx
+%{pref}/lib/wx/*
+%dir %{pref}/share/wx
+%{pref}/share/wx/*
+%attr(755, -, -) %{pref}/lib/libwx_msw*
+%attr(755, -, -) %{pref}/bin/wx-config
+
-- 
2.50.0

