Updated distribtion and docs.

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

diff --git a/distrib/gtk/copy_src b/distrib/gtk/copy_src
index 9e74b0c90820bb84c394f52f06a7e68bff596591..60d7dc35f4742a98eaf33023500370734334594c 100755 (executable)
--- a/distrib/gtk/copy_src
+++ b/distrib/gtk/copy_src
@@ -15,6 +15,7 @@ echo Base dir..
 
 cd ../..
 cp wxGTK.spec ~/wxgtk_dist/wxGTK
+cp Makefile.am ~/wxgtk_dist/wxGTK
 cp Makefile.in ~/wxgtk_dist/wxGTK
 cp configure ~/wxgtk_dist/wxGTK
 cp config.sub ~/wxgtk_dist/wxGTK
@@ -43,23 +44,27 @@ echo Include dir..
 
 mkdir ~/wxgtk_dist/wxGTK/include
 cd include
+cp Makefile.am ~/wxgtk_dist/wxGTK/include
 cp Makefile.in ~/wxgtk_dist/wxGTK/include
 
 mkdir ~/wxgtk_dist/wxGTK/include/wx
 cd wx
 cp *.h ~/wxgtk_dist/wxGTK/include/wx
 cp *.cpp ~/wxgtk_dist/wxGTK/include/wx
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx
 cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx
 
 mkdir ~/wxgtk_dist/wxGTK/include/wx/generic
 cd generic
 cp *.h ~/wxgtk_dist/wxGTK/include/wx/generic
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/generic
 cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/generic
 cd ..
 
 mkdir ~/wxgtk_dist/wxGTK/include/wx/unix
 cd unix
 cp *.h ~/wxgtk_dist/wxGTK/include/wx/unix
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/unix
 cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/unix
 cd ..
 
@@ -67,35 +72,60 @@ mkdir ~/wxgtk_dist/wxGTK/include/wx/gtk
 cd gtk
 cp *.h ~/wxgtk_dist/wxGTK/include/wx/gtk
 rm ~/wxgtk_dist/wxGTK/include/wx/gtk/setup.h
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/gtk
 cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/gtk
 cd ..
 
+mkdir ~/wxgtk_dist/wxGTK/include/wx/motif
+cd motif
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/motif
+cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/motif
+cd ..
+
+mkdir ~/wxgtk_dist/wxGTK/include/wx/msw
+cd msw
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/msw
+cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/msw
+cd ..
+
 mkdir ~/wxgtk_dist/wxGTK/include/wx/protocol
 cd protocol
 cp *.h ~/wxgtk_dist/wxGTK/include/wx/protocol
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/protocol
 cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/protocol
 cd ..
 
-cd ..
-cd ..
+cd ../..
 
 echo Misc dir..
 
 mkdir ~/wxgtk_dist/wxGTK/misc
+cd misc
+cp Makefile.am ~/wxgtk_dist/wxGTK/misc
+cp Makefile.in ~/wxgtk_dist/wxGTK/misc
 mkdir ~/wxgtk_dist/wxGTK/misc/afm
+cd afm
+cp *.afm ~/wxgtk_dist/wxGTK/misc/afm
+cp Makefile.am ~/wxgtk_dist/wxGTK/misc/afm
+cp Makefile.in ~/wxgtk_dist/wxGTK/misc/afm
+cd ..
 mkdir ~/wxgtk_dist/wxGTK/misc/gs_afm
-
-cp ./misc/afm/*.afm ~/wxgtk_dist/wxGTK/misc/afm
-cp ./misc/gs_afm/*.afm ~/wxgtk_dist/wxGTK/misc/gs_afm
+cd gs_afm
+cp *.afm ~/wxgtk_dist/wxGTK/misc/gs_afm
+cp Makefile.am ~/wxgtk_dist/wxGTK/misc/gs_afm
+cp Makefile.in ~/wxgtk_dist/wxGTK/misc/gs_afm
+cd ../..
 
 echo Src dir..
 
 cd src
 mkdir ~/wxgtk_dist/wxGTK/src
+cp Makefile.am ~/wxgtk_dist/wxGTK/src
 cp Makefile.in ~/wxgtk_dist/wxGTK/src
 
 cd gtk
 mkdir ~/wxgtk_dist/wxGTK/src/gtk
+cp Makefile.am ~/wxgtk_dist/wxGTK/src/gtk
 cp Makefile.in ~/wxgtk_dist/wxGTK/src/gtk
 cp *.xbm ~/wxgtk_dist/wxGTK/src/gtk
 cp *.c ~/wxgtk_dist/wxGTK/src/gtk
@@ -148,6 +178,7 @@ echo Utils dir..
 
 cd utils
 mkdir ~/wxgtk_dist/wxGTK/utils
+cp Makefile.am ~/wxgtk_dist/wxGTK/utils
 cp Makefile.in ~/wxgtk_dist/wxGTK/utils
 
 echo wxGLCanvas..
@@ -267,12 +298,14 @@ echo Samples dir..
 
 cd samples
 mkdir ~/wxgtk_dist/wxGTK/samples
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples
 
 echo Minimal sample..
 
 cd minimal
 mkdir ~/wxgtk_dist/wxGTK/samples/minimal
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/minimal
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/minimal
 cp minimal.cpp ~/wxgtk_dist/wxGTK/samples/minimal
 cp mondrian.xpm ~/wxgtk_dist/wxGTK/samples/minimal
@@ -282,6 +315,7 @@ echo Bombs sample..
 
 cd bombs
 mkdir ~/wxgtk_dist/wxGTK/samples/bombs
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/bombs
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/bombs
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/bombs
 cp *.h ~/wxgtk_dist/wxGTK/samples/bombs
@@ -292,6 +326,7 @@ echo Checklst sample..
 
 cd checklst
 mkdir ~/wxgtk_dist/wxGTK/samples/checklst
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/checklst
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/checklst
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/checklst
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/checklst
@@ -301,6 +336,7 @@ echo Config sample..
 
 cd config
 mkdir ~/wxgtk_dist/wxGTK/samples/config
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/config
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/config
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/config
 cd ..
@@ -309,6 +345,7 @@ echo Controls sample..
 
 cd controls
 mkdir ~/wxgtk_dist/wxGTK/samples/controls
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/controls
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/controls
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/controls
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/controls
@@ -321,6 +358,7 @@ echo Db sample..
 
 cd db
 mkdir ~/wxgtk_dist/wxGTK/samples/db
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/db
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/db
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/db
 cp *.h ~/wxgtk_dist/wxGTK/samples/db
@@ -331,6 +369,7 @@ echo DDE sample..
 
 cd dde
 mkdir ~/wxgtk_dist/wxGTK/samples/dde
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/dde
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dde
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/dde
 cp *.h ~/wxgtk_dist/wxGTK/samples/dde
@@ -341,6 +380,7 @@ echo Dialogs sample..
 
 cd dialogs
 mkdir ~/wxgtk_dist/wxGTK/samples/dialogs
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/dialogs
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dialogs
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/dialogs
 cp *.h ~/wxgtk_dist/wxGTK/samples/dialogs
@@ -350,6 +390,7 @@ echo DnD sample..
 
 cd dnd
 mkdir ~/wxgtk_dist/wxGTK/samples/dnd
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/dnd
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dnd
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/dnd
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/dnd
@@ -359,6 +400,7 @@ echo Docview sample..
 
 cd docview
 mkdir ~/wxgtk_dist/wxGTK/samples/docview
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/docview
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/docview
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/docview
 cp *.h ~/wxgtk_dist/wxGTK/samples/docview
@@ -369,6 +411,7 @@ echo DocvwMDI sample..
 
 cd docvwmdi
 mkdir ~/wxgtk_dist/wxGTK/samples/docvwmdi
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/docvwmdi
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/docvwmdi
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/docvwmdi
 cp *.h ~/wxgtk_dist/wxGTK/samples/docvwmdi
@@ -378,6 +421,7 @@ echo Dynamic sample..
 
 cd dynamic
 mkdir ~/wxgtk_dist/wxGTK/samples/dynamic
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/dynamic
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dynamic
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/dynamic
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/dynamic
@@ -387,6 +431,7 @@ echo Drawing sample..
 
 cd drawing
 mkdir ~/wxgtk_dist/wxGTK/samples/drawing
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/drawing
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/drawing
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/drawing
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/drawing
@@ -396,6 +441,7 @@ echo Forty sample..
 
 cd forty
 mkdir ~/wxgtk_dist/wxGTK/samples/forty
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/forty
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/forty
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/forty
 cp *.h ~/wxgtk_dist/wxGTK/samples/forty
@@ -407,6 +453,7 @@ echo Fractal sample..
 
 cd fractal
 mkdir ~/wxgtk_dist/wxGTK/samples/fractal
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/fractal
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/fractal
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/fractal
 cd ..
@@ -415,6 +462,7 @@ echo Grid sample..
 
 cd grid
 mkdir ~/wxgtk_dist/wxGTK/samples/grid
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/grid
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/grid
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/grid
 cd ..
@@ -423,6 +471,7 @@ echo Help sample..
 
 cd help
 mkdir ~/wxgtk_dist/wxGTK/samples/help
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/help
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/help
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/help
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/help
@@ -435,6 +484,7 @@ echo Image sample..
 
 cd image
 mkdir ~/wxgtk_dist/wxGTK/samples/image
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/image
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/image
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/image
 cp horse.png ~/wxgtk_dist/wxGTK/samples/image
@@ -446,6 +496,7 @@ echo Internat sample..
 
 cd internat
 mkdir ~/wxgtk_dist/wxGTK/samples/internat
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/internat
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/internat
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/internat
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/internat
@@ -460,6 +511,7 @@ echo Layout sample..
 
 cd layout
 mkdir ~/wxgtk_dist/wxGTK/samples/layout
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/layout
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/layout
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/layout
 cp *.h ~/wxgtk_dist/wxGTK/samples/layout
@@ -469,6 +521,7 @@ echo Listctrl sample..
 
 cd listctrl
 mkdir ~/wxgtk_dist/wxGTK/samples/listctrl
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/listctrl
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/listctrl
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/listctrl
 cp *.h ~/wxgtk_dist/wxGTK/samples/listctrl
@@ -482,6 +535,7 @@ echo MDI sample..
 
 cd mdi
 mkdir ~/wxgtk_dist/wxGTK/samples/mdi
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/mdi
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/mdi
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/mdi
 cp *.h ~/wxgtk_dist/wxGTK/samples/mdi
@@ -495,6 +549,7 @@ echo Memcheck sample..
 
 cd memcheck
 mkdir ~/wxgtk_dist/wxGTK/samples/memcheck
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/memcheck
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/memcheck
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/memcheck
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/memcheck
@@ -504,6 +559,7 @@ echo Minifram sample..
 
 cd minifram
 mkdir ~/wxgtk_dist/wxGTK/samples/minifram
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/minifram
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/minifram
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/minifram
 cp *.h ~/wxgtk_dist/wxGTK/samples/minifram
@@ -517,6 +573,7 @@ echo Notebook sample..
 
 cd notebook
 mkdir ~/wxgtk_dist/wxGTK/samples/notebook
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/notebook
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/notebook
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/notebook
 cp *.h ~/wxgtk_dist/wxGTK/samples/notebook
@@ -526,6 +583,7 @@ echo PNG sample..
 
 cd png
 mkdir ~/wxgtk_dist/wxGTK/samples/png
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/png
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/png
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/png
 cp *.h ~/wxgtk_dist/wxGTK/samples/png
@@ -536,6 +594,7 @@ echo Printing sample..
 
 cd printing
 mkdir ~/wxgtk_dist/wxGTK/samples/printing
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/printing
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/printing
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/printing
 cp *.h ~/wxgtk_dist/wxGTK/samples/printing
@@ -546,6 +605,7 @@ echo Proplist sample..
 
 cd proplist
 mkdir ~/wxgtk_dist/wxGTK/samples/proplist
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/proplist
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/proplist
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/proplist
 cp *.h ~/wxgtk_dist/wxGTK/samples/proplist
@@ -555,6 +615,7 @@ echo Resource sample..
 
 cd resource
 mkdir ~/wxgtk_dist/wxGTK/samples/resource
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/resource
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/resource
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/resource
 cp *.h ~/wxgtk_dist/wxGTK/samples/resource
@@ -565,6 +626,7 @@ echo Sashtest sample..
 
 cd sashtest
 mkdir ~/wxgtk_dist/wxGTK/samples/sashtest
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/sashtest
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/sashtest
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/sashtest
 cp *.h ~/wxgtk_dist/wxGTK/samples/sashtest
@@ -574,6 +636,7 @@ echo Scroll sample..
 
 cd sashtest
 mkdir ~/wxgtk_dist/wxGTK/samples/scroll
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/scroll
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/scroll
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/scroll
 cp *.h ~/wxgtk_dist/wxGTK/samples/scroll
@@ -583,6 +646,7 @@ echo Splitter sample..
 
 cd splitter
 mkdir ~/wxgtk_dist/wxGTK/samples/splitter
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/splitter
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/splitter
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/splitter
 cd ..
@@ -591,6 +655,7 @@ echo Tab sample..
 
 cd tab
 mkdir ~/wxgtk_dist/wxGTK/samples/tab
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/tab
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/tab
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/tab
 cp *.h ~/wxgtk_dist/wxGTK/samples/tab
@@ -600,6 +665,7 @@ echo Text sample..
 
 cd text
 mkdir ~/wxgtk_dist/wxGTK/samples/text
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/text
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/text
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/text
 cd ..
@@ -608,6 +674,7 @@ echo Thread sample..
 
 cd thread
 mkdir ~/wxgtk_dist/wxGTK/samples/thread
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/thread
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/thread
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/thread
 cd ..
@@ -616,6 +683,7 @@ echo Toolbar sample..
 
 cd toolbar
 mkdir ~/wxgtk_dist/wxGTK/samples/toolbar
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/toolbar
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/toolbar
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/toolbar
 cp *.h ~/wxgtk_dist/wxGTK/samples/toolbar
@@ -629,6 +697,7 @@ echo TreeCtrl sample..
 
 cd treectrl
 mkdir ~/wxgtk_dist/wxGTK/samples/treectrl
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/treectrl
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/treectrl
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/treectrl
 cp *.h ~/wxgtk_dist/wxGTK/samples/treectrl
@@ -639,6 +708,7 @@ echo typetest sample..
 
 cd typetest
 mkdir ~/wxgtk_dist/wxGTK/samples/typetest
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/typetest
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/typetest
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/typetest
 cp *.h ~/wxgtk_dist/wxGTK/samples/typetest
@@ -649,6 +719,7 @@ echo Validate sample..
 
 cd validate
 mkdir ~/wxgtk_dist/wxGTK/samples/validate
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/validate
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/validate
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/validate
 cp *.h ~/wxgtk_dist/wxGTK/samples/validate
@@ -659,6 +730,7 @@ echo wxPoem sample..
 
 cd wxpoem
 mkdir ~/wxgtk_dist/wxGTK/samples/wxpoem
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/wxpoem
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/wxpoem
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/wxpoem
 cp *.h ~/wxgtk_dist/wxGTK/samples/wxpoem
@@ -672,6 +744,7 @@ echo wxSocket sample..
 
 cd wxsocket
 mkdir ~/wxgtk_dist/wxGTK/samples/wxsocket
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/wxsocket
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/wxsocket
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/wxsocket
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/wxsocket

diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt
index 19674c17dfbe31978b47e3fd9d3bcd9255b138fd..cf349ac5c2c36f1307c1bbeba0871790472c67a2 100644 (file)
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -1,3 +1,9 @@
+
+  !!! When sending bug reports tell us what version of
+      wxWindows you are using (including the beta) and
+      what compiler on what system. One example:
+      wxGTK 2.1 beta 6, egcs 1.1.1, Redhat 5.0 !!!
+
 * The most simple case
 -----------------------
 
@@ -11,6 +17,12 @@ make install
 ldconfig
 exit
 
+If you want to remove wxWindows on Unix you can do this:
+
+su <type root password>
+make uninstall
+ldconfif
+exit
 
 * The most simple errors
 ------------------------
@@ -19,13 +31,27 @@ configure reports, that you don't have GTK 1.X installed
 although you are certainly sure you have. Well, you have
 installed it, but you also have another version of the
 GTK installed, which you may need to removed including
-other versions of glib (and its headers).
-
-You get errors during compilation. The reason is that you
+other versions of glib (and its headers). Also, look
+for the PATH variable and check if it includes the path
+to the correct gtk-config! The check your LDPATH if 
+it points to the correct library. There is no way to
+compile wxGTK if configure doesn't pass this test as
+all this test does is compile and link a GTK program.
+
+You get errors during compilation: The reason is that you
 probably have a broken compiler, which includes almost
-everything that is called gcc. If there is just any way
-for you to use egcs, use egcs. We are sorry, but we cannot
-fix gcc.
+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 are sorry, but we cannot fix gcc.
+
+You get immediate segfault when starting any sample
+or application: This is _always_ 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.
 
 * The most simple program
 -------------------------
@@ -33,7 +59,7 @@ fix gcc.
 Now create your super-application myfoo.app and compile anywhere 
 with
 
-g++ myfoo.cpp `wx-config --libs` `wx-config --cflags` -o myfoo
+g++ myfoo.cpp `wx-config --libs --cflags` -o myfoo
 
 * General
 -----------------------
@@ -58,9 +84,8 @@ this has no effect, but I tried...
 
 wxWindows/GTK requires the GTK+ library to be installed on your system.
 It has to be a stable version, preferebly version 1.2.3. You can use
-GTK 1.0.X in connection with wxWindows, but we don't support Drag'n'Drop
-for GTK 1.0.X so you have to "configure --without-dnd". wxWindows does 
-NOT work with the 1.1.X versions of the GTK+ library.
+GTK 1.0 in connection with wxWindows, but only without Drag'n'Drop.
+wxWindows does work with the 1.1.X versions of the GTK+ library.
 
 You can get the newest version of the GTK+ from the GTK homepage
 at
@@ -85,10 +110,9 @@ distributions have correct glibc 2 support:
  - DLD 6.0
  - SuSE 6.0
  
-You can enable thread support by running 
+You can disable thread support by running 
 
-./configure "--with-threads"
-make clean
+./configure "--disable-threads"
 make
 su <type root password>
 make install
@@ -148,6 +172,8 @@ not been defined. And Make in some circumstances as well...
 * General options
 -------------------
 
+         !!  DON'T USE YET !!
+
 Normally, you won't have to choose a toolkit, because when
 you download wxGTK, it will default to --with-gtk etc. But
 if you use all of our CVS repository you have to choose a 
@@ -195,6 +221,8 @@ The following options handle the kind of library you want to build.
 * Feature Options
 -------------------
 
+         !!  DON'T USE YET !!
+
 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 
@@ -242,11 +270,8 @@ make yourself some coffee, as it will take some time. On an old
 386SX possibly week. During compilation, you'll get a few 
 warning messages depending in your compiler.
 
-if you want to be more selective:
-
-       make            will build only the base libraries
-       make samples    will build the samples
-       make user       will build everything in user
+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
@@ -254,21 +279,11 @@ have to log in as root (i.e. run "su" and enter the root
 password) and type
 
         make install   
-       
-Depending on the configuration of some files, the libraries
-and binaries will be placed in different directories.
-The "global" binaries and libraries will be placed in:
 
-       bin/$(OSTYPE) and
-       lib/$(OSTYPE) respectively
-
-"local" binaries and libraries will be placed in:
-
-       (basedir of that application)/$(OSTYPE).
-
-This is also the place where all the object-files will go.
-(Currently there arent any global binaries).
+You can remove any traces of wxWindows by typing
 
+        make uninstall
+       
 If you want to save disk space by removing unnecessary
 object-files:
 
@@ -304,23 +319,20 @@ 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: In this case I propose to put 
-all contributed programs in the directory "/user", with a 
-directory of its own.
+directories of wxWindows. For this endeavour, you'll need
+the usual number of GNU tools, at least
 
-This directory then should include the following files:
+GNU automake version 1.4
+GNU autoheader version 2.14
+GNU autoconf version 2.14
 
-Makefile        (You can copy this one from any application in samples
-                 probably you will not need to edit this one. There is
-                 only one case where you might be interested in changing
-                 this file, but about that see later.)
-Makefile.in    (This is the base application-Makefile template, from
-                 which the actual Makefile for each system is created.
-                 More about this later)
+and quite possibly 
 
-put ALL your source code along with all the other stuff you need for
-your application in this directory (subdirectories are welcome).
+GNU make
+GNU cc
 
+and if you have all this then you probably know enough to
+go ahead yourself :-)
 
 ** Something about Makefiles
 ------------------------------

diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt
index c5553f36fb92dbef11b8292a229443dae5006f6b..5dd853ff8ee1cf0566a7612e7c55b309f98807b8 100644 (file)
--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -1,12 +1,17 @@
 
-  Welcome to wxWindows/Gtk 2.1 snapshot 5,
+  Welcome to wxWindows/Gtk 2.1 snapshot 6,
 
 you have downloaded version 2.1 of the GTK+ 1.2 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 -
-Particularly the makefile system will change entirly.
- 
+that major changes can happen before a final release.
+
+Beginning from snapshot 6 wxWindows uses a completely
+new make file system on Unix that uses GNU automake,
+GNU autoconf and GNU autoheader. You do not need these
+programs in order to use the library, but for taking
+part in its development, they are required.
+
 More information is available from my homepage at:
 
   http://wesley.informatik.uni-freiburg.de/~wxxt
@@ -28,17 +33,6 @@ make install
 ldconfig
 exit
 
-Type the following to make the samples
-
-make samples
-
-To start the samples, change into the directory that
-corresponds to the sample and your system, e.g on a
-linux-gnu machine the minimal sample would get started
-from the wxWindows base dir with
-
-./samples/minimal/linux-gnu/minimal
-
 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
@@ -48,7 +42,7 @@ 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_gtk2.a (static) and libwx_gtk2.so.1.0 (shared) so that 
+libwx_gtk.a (static) and libwx_gtk-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.
 

diff --git a/docs/latex/wx/splitter.tex b/docs/latex/wx/splitter.tex
index eacd07b5002b208cdf9f782e1acd6d2be14903d3..879dc1271402b8ce6532e2b57836f1bb23d95670 100644 (file)
--- a/docs/latex/wx/splitter.tex
+++ b/docs/latex/wx/splitter.tex
@@ -7,6 +7,7 @@ split into two programmatically (perhaps from a menu command), and unsplit
 either programmatically or via the wxSplitterWindow user interface.
 
 Appropriate 3D shading for the Windows 95 user interface is an option.
+This is also recommended for GTK.
 
 \wxheading{Window styles}
 
@@ -14,8 +15,9 @@ Appropriate 3D shading for the Windows 95 user interface is an option.
 \twocolitem{\windowstyle{wxSP\_3D}}{Draws a 3D effect border and sash.}
 \twocolitem{\windowstyle{wxSP\_BORDER}}{Draws a thin black border around the window, and a black sash.}
 \twocolitem{\windowstyle{wxSP\_NOBORDER}}{No border, and a black sash.}
-\twocolitem{\windowstyle{wxSP\_PERMIT\_UNSPLIT}}{The can always be
-unsplit, even if the minimum pane size is set to something other than zero.}
+\twocolitem{\windowstyle{wxSP\_PERMIT\_UNSPLIT}}{Always allow to
+unsplit, even with the minimum pane size other than zero.}
+\twocolitem{\windowstyle{wxSP\_LIVE\_UPDATE}}{Don't draw XOR line but resize the child windows immediately.}
 \end{twocollist}
 
 See also \helpref{window styles overview}{windowstyles}.

diff --git a/include/wx/version.h b/include/wx/version.h
index 28e04c540579310a60e66f78184466445227329a..93baaf6b8f0b49941b137eafcb7bdaca7186e27c 100644 (file)
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -18,7 +18,7 @@
 #define wxRELEASE_NUMBER   0
 #define wxVERSION_STRING "wxWindows 2.1.0"
 #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
-#define wxBETA_NUMBER      5
+#define wxBETA_NUMBER      6
 #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
 
 #endif

diff --git a/wxGTK.spec b/wxGTK.spec
index 768a961967747c7661155fc645b0f4953a9fc107..5729d3d0372489973ca415dddae37bcbcccb03af 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -1,7 +1,7 @@
 # Note that this is NOT a relocatable package
 %define pref /usr
 %define ver 2.1.0
-%define rel 5
+%define rel 6
 
 Summary: The GTK+ 1.2 port of the wxWindows library
 Name: wxGTK
@@ -9,7 +9,7 @@ Version: %{ver}
 Release: %{rel}
 Copyright: wxWindows Licence
 Group: X11/Libraries
-Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxGTK-2.1.0-b5.tgz
+Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxGTK-2.1.0-b6.tgz
 URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html
 Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
 Requires: gtk+ >= 1.2.1