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

Various distrib related changes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-02-15 12:56:16 +00:00
parent 310df81bd8
commit cc977e5fde
9 changed files with 350 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.in
View File

@@ -570,9 +570,11 @@ MSW_DIST: ALL_GUI_DIST
DEMOS_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/demos
cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
cp $(DEMODIR)/configure $(DISTDIR)/samples
cp $(DEMODIR)/configure.in $(DISTDIR)/samples
cp $(DEMODIR)/configure $(DISTDIR)/demos
cp $(DEMODIR)/configure.in $(DISTDIR)/demos
cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
mkdir $(DISTDIR)/demos/bombs
cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs

608
configure vendored
View File

File diff suppressed because it is too large Load Diff

10
configure.in
View File

@@ -409,7 +409,7 @@ dnl WX_INTERFACE_AGE = 0
WX_MAJOR_VERSION_NUMBER=2
WX_MINOR_VERSION_NUMBER=1
WX_RELEASE_NUMBER=13
WX_RELEASE_NUMBER=14
WX_INTERFACE_AGE=0
WX_BINARY_AGE=0
@@ -826,7 +826,7 @@ else
DEFAULT_wxUSE_COMBOBOX=yes
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_GRID=yes
DEFAULT_wxUSE_NEW_GRID=no
DEFAULT_wxUSE_NEW_GRID=yes
DEFAULT_wxUSE_IMAGLIST=yes
DEFAULT_wxUSE_LISTBOX=yes
DEFAULT_wxUSE_LISTCTRL=yes
@@ -1044,7 +1044,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
DEFAULT_wxUSE_CHOICE=yes
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_GRID=yes
DEFAULT_wxUSE_NEW_GRID=no
DEFAULT_wxUSE_NEW_GRID=yes
DEFAULT_wxUSE_IMAGLIST=yes
DEFAULT_wxUSE_LISTBOX=yes
DEFAULT_wxUSE_LISTCTRL=yes
@@ -1837,7 +1837,9 @@ fi
dnl ODBC objects are Unix only
if test "$TOOLKIT" != "MSW"; then
ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
if test "$wxUSE_ODBC" = "yes" ; then
ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
fi
fi
if test "$wxUSE_LIBJPEG" = "yes" ; then

2
docs/gtk/changes.txt
View File

@@ -1,5 +1,5 @@
12th January '2000: wxWindows 2.1.14 released
20th February '2000: wxWindows 2.1.14 released
Minor changes to socket code.

22
docs/gtk/install.txt
View File

@@ -240,9 +240,6 @@ 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).
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
@@ -286,7 +283,7 @@ The following options handle the kind of library you want to build.
--enable-permissive Enable compilation without creation of
giving erros as soon as you compile with
Solaris' ANSI-defying headers...
Solaris' ANSI-defying headers.
--enable-mem_tracing Add built-in memory tracing.
@@ -295,7 +292,7 @@ The following options handle the kind of library you want to build.
--enable-debug_info Add debug info to object files and
executables for use with debuggers
such as gdb (or its many frontends).
such as gdb (or its many frontends).
--enable-debug_flag Define __DEBUG__ and __WXDEBUG__ when
compiling. This enable wxWindows' very
@@ -308,27 +305,28 @@ The following options handle the kind of library you want to build.
* 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
--with-odbc Enables ODBC code. This is disabled
by default because iODBC is under the
L-GPL license.
--without-libpng Disables PNG image format code.
--without-libjpeg Disables JPEG image format code.
--without-libtiff Disables TIFF image format code.
--disable-pnm Disables PNM image format code.
--disable-gif Disables GIF image format code.
--disable-pcx Disables PCX image format code.
--without-odbc Disables ODBC code.
--disable-resources Disables the use of *.wxr type
resources.
@@ -401,12 +399,12 @@ in the various directories will do the work for you.
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
gcc myfoo.cpp `wx-config --cflags --libs` -o myfoo
Using this way, a make file for the minimal sample would look
like this
CC = g++
CC = gcc
minimal: minimal.o
$(CC) -o minimal minimal.o `wx-config --libs`

12
docs/gtk/readme.txt
View File

@@ -1,5 +1,5 @@
Welcome to wxWindows/Gtk 2.1.13
Welcome to wxWindows/Gtk 2.1.14
you have downloaded a beta version of the GTK+ 1.2 port of
the wxWindows GUI library. Although this is not yet the
@@ -7,12 +7,12 @@ final stable release wxGTK 2.2, the current version has
been tested carefully on many systems and has been found
to work better than any other previous version.
Nonetheless, beware that minor changes can happen before
a final release.
This is the last beta release. wxWindows is now in a code
freeze and only bugs will be corrected.
wxWindows no longer supports GTK 1.0 (as did some early
snapshots) so that you will need GTK 1.2 when using it.
GTK 1.2.6 is recommended although many programs will work
GTK 1.2.6 is recommended although somw programs will work
with GTK 1.2.3 onwards.
More information is available from my homepage at:
@@ -23,7 +23,7 @@ and about the wxWindows project as a whole (and the MSW
and Motif ports in particular) can be found at Julian's
homepage at:
http://web.ukonline.co.uk/julian.smart/wxwin
http://www.wxwindows.org
Information on how to install can be found in the file
INSTALL.txt, but if you cannot wait, this should work on
@@ -44,7 +44,7 @@ VERSION OF GTK, WXGTK, 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_gtk.a (static) and libwx_gtk-2.1.so.13.0.0 (shared) so
libwx_gtk.a (static) and libwx_gtk-2.1.so.14.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.

2
docs/gtk/todo.txt
View File

@@ -1,8 +1,6 @@
-------------------- High priority ---------------------
Finish and extend wxPlotWindow.
Improve, update translations. Install *.mo files somewehere.
-------------------- Medium priority ---------------------

8
samples/image/image.cpp
View File

@@ -142,14 +142,16 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
wxImage image( bitmap );
#if wxUSE_LIBPNG
image.LoadFile( dir + wxString("test.png") );
my_square = new wxBitmap( image.ConvertToBitmap() );
if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ) )
wxLogError("Can't save file");
image = wxImage( 100, 100 );
image.LoadFile( dir + wxString("test.png") );
my_square = new wxBitmap( image.ConvertToBitmap() );
image = wxImage( 100, 100 );
if ( !image.LoadFile( dir + wxString("horse.png"), wxBITMAP_TYPE_PNG ) )
wxLogError("Can't load PNG image");
else

2
wxGTK.spec
View File

@@ -34,7 +34,7 @@ Header files for the wxGTK, the GTK+ 1.2 port of the wxWindows library.
%prep
%setup -n wxGTK
./configure --prefix=%{pref} --enable-threads --disable-std_iostreams --disable-newgrid
./configure --prefix=%{pref} --enable-threads --disable-std_iostreams --with-odbc
%build
if [ "$SMP" != "" ]; then