Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Distrib changes.

Browse Source 
Augmented version to 2.1.12.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-11-14 19:25:07 +00:00
parent 5b0d48b32a
commit ba0e7d4111
6 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.in
View File

@@ -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:

2
configure vendored
View File

@@ -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

2
configure.in
View File

@@ -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

9
distrib/msw/tmake/unx.t
View File

@@ -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:

9
docs/gtk/changes.txt
View File

@@ -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

4
include/wx/version.h
View File

@@ -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)