More makefiles, distrib things,

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

diff --git a/Makefile.in b/Makefile.in
index c21bd0fca0350e51609f4d928111c6c0dea332ae..f667aa8a0a3876861d62fe31925a936535d5f149 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 09:29, 1999/10/11
+# This file was automatically generated by tmake at 10:20, 1999/10/12
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -121,7 +121,7 @@ DOCDIR = $(WXDIR)/docs
 
 ########################## Archive name ###############################
 
-WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)-b9.tgz
+WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
 DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 
 ############################## Files ##################################
@@ -2155,9 +2155,7 @@ ALL_DIST:
        cp $(COMMDIR)/*.y $(DISTDIR)/src/common
        cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
        cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
-       cp $(HTMLDIR)/*.h $(DISTDIR)/src/html
        cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
-       cp $(UNIXDIR)/*.h $(DISTDIR)/src/unix
        cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix
        cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
        cp $(PNGDIR)/*.h $(DISTDIR)/src/png
@@ -2233,6 +2231,11 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
+       mkdir $(DISTDIR)/samples/db
+       cp $(SAMPDIR)/db/Makefile.in $(DISTDIR)/samples/db
+       cp $(SAMPDIR)/db/*.cpp $(DISTDIR)/samples/db
+       cp $(SAMPDIR)/db/*.h $(DISTDIR)/samples/db
+       cp $(SAMPDIR)/db/*.xpm $(DISTDIR)/samples/db
        mkdir $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
@@ -2261,6 +2264,14 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/dynamic/Makefile.in $(DISTDIR)/samples/dynamic
        cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
        cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
+       mkdir $(DISTDIR)/samples/forty
+       cp $(SAMPDIR)/forty/Makefile.in $(DISTDIR)/samples/forty
+       cp $(SAMPDIR)/forty/*.cpp $(DISTDIR)/samples/forty
+       cp $(SAMPDIR)/forty/*.xpm $(DISTDIR)/samples/forty
+       cp $(SAMPDIR)/forty/*.xbm $(DISTDIR)/samples/forty
+       mkdir $(DISTDIR)/samples/fractal
+       cp $(SAMPDIR)/fractal/Makefile.in $(DISTDIR)/samples/fractal
+       cp $(SAMPDIR)/fractal/*.cpp $(DISTDIR)/samples/fractal
        mkdir $(DISTDIR)/samples/html
        cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html
        mkdir $(DISTDIR)/samples/html/about
@@ -2340,6 +2351,11 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
        cp $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook
        cp $(SAMPDIR)/notebook/*.h $(DISTDIR)/samples/notebook
+       mkdir $(DISTDIR)/samples/png
+       cp $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png
+       cp $(SAMPDIR)/png/*.cpp $(DISTDIR)/samples/png
+       cp $(SAMPDIR)/png/*.h $(DISTDIR)/samples/png
+       cp $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png
        mkdir $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist

diff --git a/configure.in b/configure.in
index 271915df937c2d0f8e5ad29a48a4244eb4f5a286..e654c9f09e1db501561878b5401b0b904abb5906 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1526,10 +1526,7 @@ fi
 if test "$wxUSE_GTK" = 1; then
     dnl avoid calling AM_PATH_GTK twice, so check first for the newer version and
     dnl only then, if it wasn't found, for an older one
-    AM_PATH_GTK(1.2.0, WXGTK12=1)
-    if test "$WXGTK12" != 1; then
-       AM_PATH_GTK(1.0.0, , AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.X or 1.0.X?))
-    fi
+    AM_PATH_GTK(1.2.1, WXGTK12=1, AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.1 or above?))
 
     TOOLKIT_INCLUDE="$GTK_CFLAGS"
     GUI_TK_LIBRARY="$GTK_LIBS"
@@ -2940,7 +2937,8 @@ AC_OUTPUT([
             samples/docvwmdi/Makefile
             samples/dnd/Makefile
             samples/drawing/Makefile
-            samples/dynamic/Makefile
+            samples/forty/Makefile
+            samples/fractal/Makefile
             samples/image/Makefile
             samples/internat/Makefile
             samples/layout/Makefile
@@ -2951,6 +2949,7 @@ AC_OUTPUT([
             samples/nettest/Makefile
             samples/newgrid/Makefile
             samples/notebook/Makefile
+            samples/png/Makefile
             samples/printing/Makefile
            samples/proplist/Makefile
             samples/richedit/Makefile

diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t
index c0edcfa59e1870d0927e161010d16c885eab4b89..4dbd27a39b5ae11283c529a6a7e45f615bbfc870 100644 (file)
--- a/distrib/msw/tmake/unx.t
+++ b/distrib/msw/tmake/unx.t
@@ -294,7 +294,7 @@ DOCDIR = $(WXDIR)/docs
 
 ########################## Archive name ###############################
 
-WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)-b9.tgz
+WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
 DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 
 ############################## Files ##################################
@@ -712,9 +712,7 @@ ALL_DIST:
        cp $(COMMDIR)/*.y $(DISTDIR)/src/common
        cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
        cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
-       cp $(HTMLDIR)/*.h $(DISTDIR)/src/html
        cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
-       cp $(UNIXDIR)/*.h $(DISTDIR)/src/unix
        cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix
        cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
        cp $(PNGDIR)/*.h $(DISTDIR)/src/png
@@ -790,6 +788,11 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
+       mkdir $(DISTDIR)/samples/db
+       cp $(SAMPDIR)/db/Makefile.in $(DISTDIR)/samples/db
+       cp $(SAMPDIR)/db/*.cpp $(DISTDIR)/samples/db
+       cp $(SAMPDIR)/db/*.h $(DISTDIR)/samples/db
+       cp $(SAMPDIR)/db/*.xpm $(DISTDIR)/samples/db
        mkdir $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
@@ -818,6 +821,14 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/dynamic/Makefile.in $(DISTDIR)/samples/dynamic
        cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
        cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
+       mkdir $(DISTDIR)/samples/forty
+       cp $(SAMPDIR)/forty/Makefile.in $(DISTDIR)/samples/forty
+       cp $(SAMPDIR)/forty/*.cpp $(DISTDIR)/samples/forty
+       cp $(SAMPDIR)/forty/*.xpm $(DISTDIR)/samples/forty
+       cp $(SAMPDIR)/forty/*.xbm $(DISTDIR)/samples/forty
+       mkdir $(DISTDIR)/samples/fractal
+       cp $(SAMPDIR)/fractal/Makefile.in $(DISTDIR)/samples/fractal
+       cp $(SAMPDIR)/fractal/*.cpp $(DISTDIR)/samples/fractal
        mkdir $(DISTDIR)/samples/html
        cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html
        mkdir $(DISTDIR)/samples/html/about
@@ -897,6 +908,11 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
        cp $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook
        cp $(SAMPDIR)/notebook/*.h $(DISTDIR)/samples/notebook
+       mkdir $(DISTDIR)/samples/png
+       cp $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png
+       cp $(SAMPDIR)/png/*.cpp $(DISTDIR)/samples/png
+       cp $(SAMPDIR)/png/*.h $(DISTDIR)/samples/png
+       cp $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png
        mkdir $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist

diff --git a/docs/gtk/changes.txt b/docs/gtk/changes.txt
index 23fb6c6fbeea7fd763b7122ba1a5c7e1b559e18d..ec839030b853ea7fa6441976b7320664a3ac6cab 100644 (file)
--- a/docs/gtk/changes.txt
+++ b/docs/gtk/changes.txt
@@ -2,7 +2,7 @@
 25th October '99: My birthday, wxWindows 2.1.10 released
 
 Enlightment has struck the majority of the developers and
-they have chosen ti use the Linux kernel numbering scheme
+they have chosen to use the Linux kernel numbering scheme
 for wxWindows from now on. This means that the next stable
 release will be called wxWindows 2.2.X, development snapshots
 will be called 2.1.X.
@@ -35,7 +35,7 @@ can now use wxODBC from wxMSW and wxGTK.
 
 Several printing things fixed.
 
-HTML widget and its wxWindows' help system based upon
+HTML widget and the wxWindows' help system based upon
 it have been reorganized and improved for easier use
 from Python and C++.
 

diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt
index 2c482a12e76d9f98352d8dd5ec6c68a8eb77f008..ff425b052967de5826f1ec82d595b81980a84633 100644 (file)
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -65,7 +65,7 @@ cd ..
 * The most simple errors
 ------------------------
 
-configure reports, that you don't have GTK 1.X installed although you are 
+configure reports, that you don't have GTK 1.2 installed although you are 
 very sure you have. Well, you have installed it, but you also have another 
 version of the GTK installed, which you may need to remove including other 
 versions of glib (and its headers). Also, look for the PATH variable and check 
@@ -111,15 +111,13 @@ YOU USE AND WHAT ERROR WAS REPORTED. I know 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 in connection 
-with wxWindows, albeit without Drag'n'Drop. wxWindows does work with the 1.1.X 
-versions of the GTK+ library.
+be a stable version, preferebly version 1.2.3.
 
 You can get the newest version of the GTK+ from the GTK homepage at:
 
   http://www.gtk.org
   
-We also mirror GTK+ 1.0.6 at my ftp site. You'll find information about downloading 
+We also mirror GTK+ 1.2.3 at my ftp site. You'll find information about downloading 
 at my homepage.
   
 * Additional libraries
@@ -402,20 +400,9 @@ 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 :-)
+GNU autoconf version 2.14 and add an entry to your Makefile.in
+to the bottom of the configure.in script and run autoconf
+and configure before you can type make.
 
 ----------------------
 

diff --git a/docs/motif2/install.txt b/docs/motif2/install.txt
index 542741170a4ca90ec69056bbb6d0b0acb47506d6..dda2ab9444e015bc013fb180eddce8aeec08a1f8 100644 (file)
--- a/docs/motif2/install.txt
+++ b/docs/motif2/install.txt
@@ -366,20 +366,10 @@ 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 autoconf version 2.14 and add an entry to your Makefile.in
+to the bottom of the configure.in script and run autoconf
+and configure before you can type make.
 
-GNU automake version 1.4
-GNU autoheader version 2.14
-GNU autoconf version 2.14
-GNU libtool version 1.2 (1.3 seems broken)
-
-and quite possibly 
-
-GNU make
-GNU C++
-
-and if you have all this then you probably know enough to
-go ahead yourself :-)
 
 ----------------------
 

diff --git a/samples/db/.cvsignore b/samples/db/.cvsignore
index b97957c729ffdf390362f4dc95852f593cb7d599..a7103b41ccf778c48b670dafddb317e4839aea62 100644 (file)
--- a/samples/db/.cvsignore
+++ b/samples/db/.cvsignore
@@ -1,3 +1,2 @@
-Makefile.in
 database.cfg
 

diff --git a/samples/db/Makefile.am b/samples/db/Makefile.am
deleted file mode 100644 (file)
index 43359f6..0000000
--- a/samples/db/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = 1.3 no-dependencies
-
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = database
-
-database_SOURCES = dbtest.cpp listdb.cpp

diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in
new file mode 100644 (file)
index 0000000..5a55424
--- /dev/null
+++ b/samples/db/Makefile.in
@@ -0,0 +1,21 @@
+#
+# File:                makefile.unx
+# Author:      Julian Smart
+# Created:     1998
+# Updated:     
+# Copyright:   (c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for dialogs example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+program_dir = samples/db
+
+PROGRAM=dbtest
+
+OBJECTS=$(PROGRAM).o listdb.o
+
+include ../../src/makeprog.env
+

diff --git a/samples/db/makefile.unx b/samples/db/makefile.unx
deleted file mode 100644 (file)
index 2c8bf75..0000000
--- a/samples/db/makefile.unx
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-# Copyright:   (c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for dbtest example (UNIX).
-
-PROGRAM=dbtest
-
-OBJECTS=$(PROGRAM).o listdb.o
-
-include ../../src/makeprog.env
-

diff --git a/samples/forty/.cvsignore b/samples/forty/.cvsignore
index f5eaa1a85937ad3c039965403e248ee9192db378..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/samples/forty/.cvsignore
+++ b/samples/forty/.cvsignore
@@ -1,2 +1 @@
-Makefile.in
 

diff --git a/samples/forty/Makefile.am b/samples/forty/Makefile.am
deleted file mode 100644 (file)
index 5498126..0000000
--- a/samples/forty/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-AUTOMAKE_OPTIONS = 1.3 no-dependencies
-
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = forty
-
-forty_SOURCES = \
- forty.cpp canvas.cpp card.cpp game.cpp pile.cpp playerdg.cpp scoredg.cpp \
- scorefil.cpp

diff --git a/samples/forty/Makefile.in b/samples/forty/Makefile.in
new file mode 100644 (file)
index 0000000..9398b93
--- /dev/null
+++ b/samples/forty/Makefile.in
@@ -0,0 +1,21 @@
+#
+# File:                Makefile.in
+# Author:      Julian Smart
+# Created:     1998
+# Updated:     
+# Copyright:   (c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for forty example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+program_dir = samples/forty
+
+PROGRAM=forty
+
+OBJECTS=$(PROGRAM).o canvas.o card.o game.o pile.o playerdg.o scoredg.o scorefil.o
+
+include ../../src/makeprog.env
+

diff --git a/samples/fractal/.cvsignore b/samples/fractal/.cvsignore
index f5eaa1a85937ad3c039965403e248ee9192db378..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/samples/fractal/.cvsignore
+++ b/samples/fractal/.cvsignore
@@ -1,2 +1 @@
-Makefile.in
 

diff --git a/samples/fractal/Makefile.am b/samples/fractal/Makefile.am
deleted file mode 100644 (file)
index a646546..0000000
--- a/samples/fractal/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = 1.3 no-dependencies
-
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = fractal
-
-fractal_SOURCES = fractal.cpp

diff --git a/samples/fractal/Makefile.in b/samples/fractal/Makefile.in
new file mode 100644 (file)
index 0000000..28486d1
--- /dev/null
+++ b/samples/fractal/Makefile.in
@@ -0,0 +1,21 @@
+#
+# File:                Makefile.in
+# Author:      Julian Smart
+# Created:     1998
+# Updated:     
+# Copyright:   (c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for fractal example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+program_dir = samples/fractal
+
+PROGRAM=fractal
+
+OBJECTS=$(PROGRAM).o
+
+include ../../src/makeprog.env
+

diff --git a/samples/fractal/makefile.unx b/samples/fractal/makefile.unx
deleted file mode 100644 (file)
index ff70837..0000000
--- a/samples/fractal/makefile.unx
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-# Copyright:   (c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for fractal example (UNIX).
-
-PROGRAM=fractal
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

diff --git a/samples/png/.cvsignore b/samples/png/.cvsignore
index f5eaa1a85937ad3c039965403e248ee9192db378..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/samples/png/.cvsignore
+++ b/samples/png/.cvsignore
@@ -1,2 +1 @@
-Makefile.in
 

diff --git a/samples/png/Makefile.am b/samples/png/Makefile.am
deleted file mode 100644 (file)
index d10b94b..0000000
--- a/samples/png/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = 1.3 no-dependencies
-
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = pngdemo
-
-pngdemo_SOURCES = pngdemo.cpp

diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in
new file mode 100644 (file)
index 0000000..ac72e6d
--- /dev/null
+++ b/samples/png/Makefile.in
@@ -0,0 +1,23 @@
+#
+# File:                makefile.unx
+# Author:      Julian Smart
+# Created:     1998
+# Updated:     
+# Copyright:   (c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for PNG example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+program_dir = samples/png
+
+DATAFILES = julian.png paint16.png paint.png
+
+PROGRAM=pngdemo
+
+OBJECTS=$(PROGRAM).o
+
+include ../../src/makeprog.env
+

diff --git a/samples/png/pngdemo.cpp b/samples/png/pngdemo.cpp
index da50f96d5daa893d50e6738948bde2ee40836694..c3ef8185092926c22c9036d27387ff4d0dff9978 100644 (file)
--- a/samples/png/pngdemo.cpp
+++ b/samples/png/pngdemo.cpp
@@ -21,8 +21,10 @@
 #endif
 
 #ifdef __WXMSW__
-#include <wx/pnghand.h>
-// #include <wx/xpmhand.h>
+#include "wx/pnghand.h"
+#endif
+#ifdef __WXGTK__
+#include "wx/image.h"
 #endif
 
 #include "pngdemo.h"
@@ -40,8 +42,9 @@ bool MyApp::OnInit(void)
 {
 #ifdef __WXMSW__
   wxBitmap::AddHandler(new wxPNGFileHandler);
-//  wxBitmap::AddHandler(new wxXPMFileHandler);
-//  wxBitmap::AddHandler(new wxXPMDataHandler);
+#endif
+#ifdef __WXGTK__
+  wxImage::AddHandler(new wxPNGHandler);
 #endif
 
   // Create the main frame window

diff --git a/wx-config.in b/wx-config.in
index a93c4af969a65a2e358cf99b1b6ab2caf5b0628a..6c0f4262a83177b3a32f693d58cc65912d4feb59 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -36,7 +36,7 @@ while test $# -gt 0; do
       echo $exec_prefix
       ;;
     --version)
-      echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@ snapshot 9
+      echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@
       ;;
     --cflags)
       if test @includedir@ != /usr/include ; then