Distrib changes.

  Augmented version to 2.1.12.

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

diff --git a/Makefile.in b/Makefile.in
index f28036562ee38b969d947330057a034634cc54a5..3bfd64545971aa3ad37fd3e966a5a84838dbe5a1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 15:47, 1999/11/11
+# This file was automatically generated by tmake at 19:49, 1999/11/14
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -123,6 +123,7 @@ DOCDIR = $(WXDIR)/docs
 ########################## Archive name ###############################
 
 WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
 DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 
 ############################## Files ##################################
@@ -2288,6 +2289,7 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
        mkdir $(DISTDIR)/samples/bombs
        cp $(SAMPDIR)/bombs/Makefile.in $(DISTDIR)/samples/bombs
+       cp $(SAMPDIR)/bombs/Makefile $(DISTDIR)/samples/bombs
        cp $(SAMPDIR)/bombs/*.cpp $(DISTDIR)/samples/bombs
        cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs
        cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs
@@ -2302,6 +2304,7 @@ SAMPLES_DIST:
        mkdir $(DISTDIR)/samples/controls
        mkdir $(DISTDIR)/samples/controls/icons
        cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls
+       cp $(SAMPDIR)/controls/Makefile $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons
@@ -2475,6 +2478,10 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/*.h $(DISTDIR)/samples/proplist
+       mkdir $(DISTDIR)/samples/propsize
+       cp $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize
+       cp $(SAMPDIR)/propsize/*.cpp $(DISTDIR)/samples/propsize
+       cp $(SAMPDIR)/propsize/*.xpm $(DISTDIR)/samples/propsize
        mkdir $(DISTDIR)/samples/sashtest
        cp $(SAMPDIR)/sashtest/Makefile.in $(DISTDIR)/samples/sashtest
        cp $(SAMPDIR)/sashtest/*.cpp $(DISTDIR)/samples/sashtest
@@ -2570,6 +2577,8 @@ MISC_DIST:
        
 dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
        cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
+       mv _dist_dir/wx$(TOOLKIT)/samples _dist_dir/wx$(TOOLKIT)/wxSamples
+       cd _dist_dir/wx$(TOOLKIT); tar ch wxSamples | gzip -f9 > $(WXSAMPLES); mv $(WXSAMPLES) ../..
        $(RM) -r _dist_dir
 
 clean:

diff --git a/configure b/configure
index 3fa8919d71de540334cd28ed193091debfd2e9a6..b01057b1b39ae0786804c47c3ae63d7c740ccc0d 100755 (executable)
--- a/configure
+++ b/configure
@@ -887,7 +887,7 @@ test "$host_alias" != "$target_alias" &&
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=1
-WX_RELEASE_NUMBER=11
+WX_RELEASE_NUMBER=12
 
 WX_INTERFACE_AGE=0
 WX_BINARY_AGE=0

diff --git a/configure.in b/configure.in
index 8c0a196828d5d5c8fe9399fe589b3e0df2c5fd9c..c9b71236fda1a783bf91975e121b1fb4b2cd92a9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -401,7 +401,7 @@ dnl WX_INTERFACE_AGE = 0
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=1
-WX_RELEASE_NUMBER=11
+WX_RELEASE_NUMBER=12
 
 WX_INTERFACE_AGE=0
 WX_BINARY_AGE=0

diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t
index 3d05cfaad7d9647427ffb3234fa383e74dfec619..49f4a19076c80ae9fd9ab4b0726a9a4c7a5c3863 100644 (file)
--- a/distrib/msw/tmake/unx.t
+++ b/distrib/msw/tmake/unx.t
@@ -303,6 +303,7 @@ DOCDIR = $(WXDIR)/docs
 ########################## Archive name ###############################
 
 WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
 DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 
 ############################## Files ##################################
@@ -779,6 +780,7 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
        mkdir $(DISTDIR)/samples/bombs
        cp $(SAMPDIR)/bombs/Makefile.in $(DISTDIR)/samples/bombs
+       cp $(SAMPDIR)/bombs/Makefile $(DISTDIR)/samples/bombs
        cp $(SAMPDIR)/bombs/*.cpp $(DISTDIR)/samples/bombs
        cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs
        cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs
@@ -793,6 +795,7 @@ SAMPLES_DIST:
        mkdir $(DISTDIR)/samples/controls
        mkdir $(DISTDIR)/samples/controls/icons
        cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls
+       cp $(SAMPDIR)/controls/Makefile $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons
@@ -966,6 +969,10 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/*.h $(DISTDIR)/samples/proplist
+       mkdir $(DISTDIR)/samples/propsize
+       cp $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize
+       cp $(SAMPDIR)/propsize/*.cpp $(DISTDIR)/samples/propsize
+       cp $(SAMPDIR)/propsize/*.xpm $(DISTDIR)/samples/propsize
        mkdir $(DISTDIR)/samples/sashtest
        cp $(SAMPDIR)/sashtest/Makefile.in $(DISTDIR)/samples/sashtest
        cp $(SAMPDIR)/sashtest/*.cpp $(DISTDIR)/samples/sashtest
@@ -1061,6 +1068,8 @@ MISC_DIST:
        
 dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
        cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
+       mv _dist_dir/wx$(TOOLKIT)/samples _dist_dir/wx$(TOOLKIT)/wxSamples
+       cd _dist_dir/wx$(TOOLKIT); tar ch wxSamples | gzip -f9 > $(WXSAMPLES); mv $(WXSAMPLES) ../..
        $(RM) -r _dist_dir
 
 clean:

diff --git a/docs/gtk/changes.txt b/docs/gtk/changes.txt
index 1271169a23228c238b47fedc2ce92a48f03c6167..206975d67dd3966745725f7d56b7dd2c0990730e 100644 (file)
--- a/docs/gtk/changes.txt
+++ b/docs/gtk/changes.txt
@@ -1,4 +1,13 @@
 
+20th November '99: wxWindows 2.1.12 released
+
+Minor compile and build fixes for different architectures.
+
+Added more flags to wxSizer for proportional sizing and
+centering and alignment combination.
+
+Added controls to wxToolBars (e.g. combobox).
+
 7st November '99: wxWindows 2.1.11 released
 
 There is still an unresolved problem with bitmap to image

diff --git a/include/wx/version.h b/include/wx/version.h
index f0145306dea8e6a6f5fbfbda54c6299458fd4e8c..66db0313116037625cee554fffafd72f10228074 100644 (file)
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -15,8 +15,8 @@
 /* Bump-up with each new version */
 #define wxMAJOR_VERSION    2
 #define wxMINOR_VERSION    1
-#define wxRELEASE_NUMBER   11
-#define wxVERSION_STRING "wxWindows 2.1.11"
+#define wxRELEASE_NUMBER   12
+#define wxVERSION_STRING "wxWindows 2.1.12"
 #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
 #define wxBETA_NUMBER      0
 #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)