]> git.saurik.com Git - wxWidgets.git/commitdiff
Various corrections to makefiles, RPMs etc.
authorRobert Roebling <robert@roebling.de>
Tue, 1 Feb 2000 16:37:28 +0000 (16:37 +0000)
committerRobert Roebling <robert@roebling.de>
Tue, 1 Feb 2000 16:37:28 +0000 (16:37 +0000)
  Corrected overoptimised window style and colour code.
  More best visual changes.
  Minor typos in docs.

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

17 files changed:
Makefile.in
distrib/msw/tmake/gtk.t
distrib/msw/tmake/unx.t [deleted file]
docs/gtk/changes.txt
docs/latex/wx/app.tex
docs/latex/wx/window.tex
samples/controls/controls.cpp
samples/help/doc/wxhelp.map
src/common/image.cpp
src/gtk/bitmap.cpp
src/gtk/files.lst
src/gtk/window.cpp
src/gtk1/bitmap.cpp
src/gtk1/files.lst
src/gtk1/window.cpp
wxBase.spec
wxGTK.spec

index 937ef769f1b2dfa0292d18bcd88bc4fc49d49da8..fae053300f4277caa78046ed96c1ff49050474b6 100644 (file)
@@ -266,7 +266,7 @@ TIFFOBJS    = \
                tif_write.o \
                tif_zip.o
 
-IODBC_OBJS = \
+IODBCOBJS = \
                catalog.o \
                connect.o \
                dlf.o \
@@ -282,6 +282,7 @@ IODBC_OBJS = \
                misc.o \
                prepare.o \
                result.o
+        
 ############################## Rules ##################################
 
 BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
index a9cbdbca5d903b4671d77630284f43b1b58fc725..53ddb455719fdb3a7cba60ed51755ec239bcd6a1 100644 (file)
@@ -127,8 +127,3 @@ HTMLOBJS = \
 HTMLDEPS = \
                #$ ExpandList("HTMLDEPS");
 
-IODBCOBJS = \
-               #$ ExpandList("IODBCOBJS");
-
-IODBCDEPS = \
-               #$ ExpandList("IODBCDEPS");
diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t
deleted file mode 100644 (file)
index 0c06749..0000000
+++ /dev/null
@@ -1,1327 +0,0 @@
-#!################################################################################
-#! File:    unx.t
-#! Purpose: tmake template file from which Makefile.in is generated by running
-#!          tmake -t unx wxwin.pro -o Makefile.in
-#! Author:  Vadim Zeitlin, Robert Roebling, Julian Smart
-#! Created: 14.07.99
-#! Version: $Id$
-#!################################################################################
-#${
-    #! include the code which parses filelist.txt file and initializes
-    #! %wxCommon, %wxGeneric, %wxHtml, %wxUnix, %wxGTK, %wxMOTIF and
-    #! %wxOS2PM hashes.
-    IncludeTemplate("filelist.t");
-
-    #! Generic
-
-    foreach $file (sort keys %wxGeneric) {
-        #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
-        #! so take the generic version
-        if ( $wxGeneric{$file} =~ /\b(PS|G|U|16)\b/ ) {
-            next unless $file =~ /^dirdlgg\./;
-        }
-
-        $file2 = $file;
-        $file =~ s/cp?p?$/\o/;
-        $file2 =~ s/cp?p?$/\d/;
-        $project{"WXMSW_GENERICOBJS"} .= $file . " ";
-        $project{"WXMSW_GENERICDEPS"} .= $file2 . " "
-    }
-
-    foreach $file (sort keys %wxGeneric) {
-        #! skip generic files not required for the wxGTK port
-        next if $wxGeneric{$file} =~ /\bR\b/;
-
-        $file2 = $file;
-        $file =~ s/cp?p?$/\o/;
-        $file2 =~ s/cp?p?$/\d/;
-        $project{"WXGTK_GENERICOBJS"} .= $file . " ";
-        $project{"WXGTK_GENERICDEPS"} .= $file2 . " "
-    }
-
-    foreach $file (sort keys %wxGeneric) {
-        #! skip generic files not required for the wxMotif port
-        next if $wxGeneric{$file} =~ /\bX\b/;
-
-        $file2 = $file;
-        $file =~ s/cp?p?$/\o/;
-        $file2 =~ s/cp?p?$/\d/;
-        $project{"WXMOTIF_GENERICOBJS"} .= $file . " ";
-        $project{"WXMOTIF_GENERICDEPS"} .= $file2 . " "
-    }
-
-    foreach $file (sort keys %wxGeneric) {
-        #! skip generic files not required for the wxPM port
-        next if $wxGeneric{$file} =~ /\bP\b/;
-
-        $file2 = $file;
-        $file =~ s/cp?p?$/\o/;
-        $file2 =~ s/cp?p?$/\d/;
-        $project{"WXOS2PM_GENERICOBJS"} .= $file . " ";
-        $project{"WXOS2PM_GENERICDEPS"} .= $file2 . " "
-    }
-
-    #! Base
-
-    foreach $file (sort keys %wxBase) {
-        ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
-
-        $project{"BASE_OBJS"} .= $fileobj . " ";
-        $project{"BASE_DEPS"} .= $filedep . " ";
-    }
-
-    #! Common
-
-    foreach $file (sort keys %wxCommon) {
-        ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
-
-        #! 'B' flag means that the file makes part of wxBase too
-        if ( $wxCommon{$file} =~ /\bB\b/ ) {
-            $project{"BASE_OBJS"} .= $fileobj . " ";
-            $project{"BASE_DEPS"} .= $filedep . " ";
-        }
-
-        if ( $wxCommon{$file} !~ /\bR\b/ ) {    #! unless not for GTK
-            $project{"WXGTK_COMMONOBJS"} .= $fileobj . " ";
-            $project{"WXGTK_COMMONDEPS"} .= $filedep . " "
-        }
-        if ( $wxCommon{$file} !~ /\bX\b/ ) {    #! unless not for Motif
-            $project{"WXMOTIF_COMMONOBJS"} .= $fileobj . " ";
-            $project{"WXMOTIF_COMMONDEPS"} .= $filedep . " "
-        }
-        if ( $wxCommon{$file} !~ /\bP\b/ ) {    #! unless not for OS2PM
-            $project{"WXOS2PM_COMMONOBJS"} .= $fileobj . " ";
-            $project{"WXOS2PM_COMMONDEPS"} .= $filedep . " ";
-        }
-
-        #! ODBC needs extra files (sql*.h) so not compiled by default.
-        if ( (file !~ /^odbc\./) && ($wxCommon{$file} !~ /\b(16)\b/) ) {
-            $project{"WXMSW_COMMONOBJS"} .= $fileobj . " ";
-            $project{"WXMSW_COMMONDEPS"} .= $filedep . " "
-        }
-    }
-
-    #! GUI
-
-    foreach $file (sort keys %wxMSW) {
-        #! Mingw32 doesn't have the OLE headers and has some troubles with
-        #! socket code
-        next if $wxMSW{$file} =~ /\b(O|16)\b/;
-
-        #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
-        next if $file =~ /^dirdlg\./;
-
-        $file2 = $file;
-        $file =~ s/cp?p?$/\o/;
-        $file2 =~ s/cp?p?$/\d/;
-        $project{"WXMSW_GUIOBJS"} .= $file . " ";
-        $project{"WXMSW_GUIDEPS"} .= $file2 . " "
-    }
-
-    foreach $file (sort keys %wxGTK) {
-        $file2 = $file;
-        $file =~ s/cp?p?$/\o/;
-        $file2 =~ s/cp?p?$/\d/;
-        $project{"WXGTK_GUIOBJS"} .= $file . " ";
-        $project{"WXGTK_GUIDEPS"} .= $file2 . " "
-    }
-
-    foreach $file (sort keys %wxMOTIF) {
-        $file2 = $file;
-        $file =~ s/cp?p?$/\o/;
-        $file2 =~ s/cp?p?$/\d/;
-        $project{"WXMOTIF_GUIOBJS"} .= $file . " ";
-        $project{"WXMOTIF_GUIDEPS"} .= $file2 . " "
-    }
-
-    foreach $file (sort keys %wxOS2PM) {
-        $file2 = $file;
-        $file =~ s/cp?p?$/\o/;
-        $file2 =~ s/cp?p?$/\d/;
-        $project{"WXOS2PM_GUIOBJS"} .= $file . " ";
-        $project{"WXOS2PM_GUIDEPS"} .= $file2 . " "
-    }
-
-    #! others
-    
-    foreach $file (sort keys %wxHTML) {
-        $file2 = $file;
-        $file =~ s/cp?p?$/\o/;
-        $file2 =~ s/cp?p?$/\d/;
-        $project{"WXHTMLOBJS"} .= $file . " ";
-        $project{"WXHTMLDEPS"} .= $file2 . " "
-    }
-
-    foreach $file (sort keys %wxUNIX) {
-        ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
-
-        #! 'B' flag means that the file makes part of wxBase too
-        if ( $wxUNIX{$file} =~ /\bB\b/ ) {
-            $project{"BASE_OBJS"} .= $fileobj . " ";
-            $project{"BASE_DEPS"} .= $filedep . " "
-        }
-
-        $project{"WXUNIX_OBJS"} .= $fileobj . " ";
-        $project{"WXUNIX_DEPS"} .= $filedep . " "
-    }
-    
-    #! headers
-    
-    foreach $file (sort keys %wxWXINCLUDE) {
-        $project{"WX_HEADERS"} .= $file . " ";
-        $project{"BASE_HEADERS"} .= $file . " " if $wxWXINCLUDE{$file} =~ /\bB\b/;
-    }
-    
-    foreach $file (sort keys %wxGENERICINCLUDE) {
-        $project{"WXGENERIC_HEADERS"} .= "generic/" . $file . " "
-    }
-    
-    foreach $file (sort keys %wxMOTIFINCLUDE) {
-        $project{"WXMOTIF_HEADERS"} .= "motif/" . $file . " "
-    }
-    
-    foreach $file (sort keys %wxGTKINCLUDE) {
-        $project{"WXGTK_HEADERS"} .= "gtk/" . $file . " "
-    }
-
-    foreach $file (sort keys %wxOS2PMINCLUDE) {
-        $project{"WXOS2PM_HEADERS"} .= "os2/" . $file . " "
-    }
-    
-    foreach $file (sort keys %wxMSWINCLUDE) {
-        $project{"WXMSW_HEADERS"} .= "msw/" . $file . " "
-    }
-
-    foreach $file (sort keys %wxHTMLINCLUDE) {
-        $project{"WXHTML_HEADERS"} .= "html/" . $file . " "
-    }
-    
-    foreach $file (sort keys %wxUNIXINCLUDE) {
-        $project{"WXUNIX_HEADERS"} .= "unix/" . $file . " "
-    }
-    
-    foreach $file (sort keys %wxPROTOCOLINCLUDE) {
-        $project{"WXPROTOCOL_HEADERS"} .= "protocol/" . $file . " "
-    }
-#$}
-#
-# This file was automatically generated by tmake at #$ Now()
-# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
-
-#
-# File:     makefile.unx
-# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
-# Created:  1993
-# Updated:  1999
-# Copyright:(c) 1993, AIAI, University of Edinburgh,
-# Copyright:(c) 1999, Vadim Zeitlin
-# Copyright:(c) 1999, Robert Roebling
-#
-# Makefile for libwx_gtk.a, libwx_motif.a and libwx_msw.a
-
-###################################################################
-
-include ./src/make.env
-
-############## override make.env for PIC ##########################
-
-# Clears all default suffixes
-.SUFFIXES:     .o .cpp .c .cxx
-
-.c.o :
-       $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $<
-
-.cpp.o :
-       $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
-
-.cxx.o :
-       $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
-
-########################### Paths #################################
-
-srcdir = @srcdir@
-
-VP1 = @top_srcdir@/src/common
-VP2 = @top_srcdir@/src/@TOOLKIT_DIR@
-VP3 = @top_srcdir@/src/motif/xmcombo
-VP4 = @top_srcdir@/src/generic
-VP5 = @top_srcdir@/src/unix
-VP6 = @top_srcdir@/src/html
-VP7 = @top_srcdir@/src/png
-VP8 = @top_srcdir@/src/jpeg
-VP9 = @top_srcdir@/src/tiff
-VP10 = @top_srcdir@/src/zlib
-VP11 = @top_srcdir@/src/iodbc
-
-# the comment at the end of the next line is needed because otherwise autoconf
-# would remove this line completely - it contains a built-in hack to remove
-# any VPATH assignment not containing ':'
-VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
-
-top_srcdir = @top_srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-# my autoconf doesn't set this
-#INSTALL_SCRIPT = @INSTALL_SCRIPT@
-# maybe do an additional chmod if needed?
-INSTALL_SCRIPT = @INSTALL@ 
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-
-USE_GUI=@USE_GUI@
-
-############################# Dirs #################################
-
-WXDIR = $(top_srcdir)
-
-# Subordinate library possibilities
-
-SRCDIR   = $(WXDIR)/src
-GENDIR   = $(WXDIR)/src/generic
-COMMDIR  = $(WXDIR)/src/common
-HTMLDIR  = $(WXDIR)/src/html
-UNIXDIR  = $(WXDIR)/src/unix
-PNGDIR   = $(WXDIR)/src/png
-JPEGDIR  = $(WXDIR)/src/jpeg
-TIFFDIR  = $(WXDIR)/src/tiff
-ZLIBDIR  = $(WXDIR)/src/zlib
-GTKDIR   = $(WXDIR)/src/gtk
-MOTIFDIR = $(WXDIR)/src/motif
-MSWDIR   = $(WXDIR)/src/msw
-PMDIR    = $(WXDIR)/src/os2
-ODBCDIR  = $(WXDIR)/src/iodbc
-INCDIR   = $(WXDIR)/include
-SAMPDIR  = $(WXDIR)/samples
-DEMODIR  = $(WXDIR)/demos
-UTILSDIR = $(WXDIR)/utils
-MISCDIR  = $(WXDIR)/misc
-
-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
-WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
-DISTDIR = ./_dist_dir/wx$(TOOLKIT)
-
-############################## Files ##################################
-
-BASE_HEADERS = \
-               #$ ExpandList("BASE_HEADERS");
-
-WX_HEADERS = \
-               #$ ExpandList("WX_HEADERS");
-
-GTK_HEADERS = \
-               #$ ExpandList("WXGTK_HEADERS");
-
-MOTIF_HEADERS = \
-               #$ ExpandList("WXMOTIF_HEADERS");
-
-MSW_HEADERS = \
-               #$ ExpandList("WXMSW_HEADERS");
-
-PM_HEADERS = \
-               #$ ExpandList("WXOS2PM_HEADERS");
-
-UNIX_HEADERS = \
-               #$ ExpandList("WXUNIX_HEADERS");
-
-GENERIC_HEADERS = \
-               #$ ExpandList("WXGENERIC_HEADERS");
-
-PROTOCOL_HEADERS = \
-               #$ ExpandList("WXPROTOCOL_HEADERS");
-
-HTML_HEADERS = \
-               #$ ExpandList("WXHTML_HEADERS");
-
-GTK_GENERICOBJS = \
-               #$ ExpandList("WXGTK_GENERICOBJS");
-
-GTK_GENERICDEPS = \
-               #$ ExpandList("WXGTK_GENERICDEPS");
-
-GTK_COMMONOBJS = \
-               parser.o \
-               #$ ExpandList("WXGTK_COMMONOBJS");
-
-GTK_COMMONDEPS = \
-               parser.d \
-               #$ ExpandList("WXGTK_COMMONDEPS");
-
-GTK_GUIOBJS = \
-               #$ ExpandList("WXGTK_GUIOBJS");
-
-GTK_GUIDEPS = \
-               #$ ExpandList("WXGTK_GUIDEPS");
-
-MOTIF_GENERICOBJS = \
-               #$ ExpandList("WXMOTIF_GENERICOBJS");
-
-MOTIF_GENERICDEPS = \
-               #$ ExpandList("WXMOTIF_GENERICDEPS");
-
-MOTIF_COMMONOBJS = \
-               parser.o \
-               #$ ExpandList("WXMOTIF_COMMONOBJS");
-
-MOTIF_COMMONDEPS = \
-               parser.d \
-               #$ ExpandList("WXMOTIF_COMMONDEPS");
-
-MOTIF_GUIOBJS = \
-               xmcombo.o \
-               #$ ExpandList("WXMOTIF_GUIOBJS");
-
-MOTIF_GUIDEPS = \
-               xmcombo.d \
-               #$ ExpandList("WXMOTIF_GUIDEPS");
-
-MSW_GENERICOBJS = \
-               #$ ExpandList("WXMSW_GENERICOBJS");
-
-MSW_GENERICDEPS = \
-               #$ ExpandList("WXMSW_GENERICDEPS");
-
-MSW_COMMONOBJS = \
-               parser.o \
-               #$ ExpandList("WXMSW_COMMONOBJS");
-
-MSW_COMMONDEPS = \
-               parser.d \
-               #$ ExpandList("WXMSW_COMMONDEPS");
-
-MSW_GUIOBJS = \
-               #$ ExpandList("WXMSW_GUIOBJS");
-
-MSW_GUIDEPS = \
-               #$ ExpandList("WXMSW_GUIDEPS");
-
-PM_GENERICOBJS = \
-               #$ ExpandList("WXOS2PM_GENERICOBJS");
-
-PM_GENERICDEPS = \
-               #$ ExpandList("WXOS2PM_GENERICDEPS");
-
-PM_COMMONOBJS = \
-               parser.o \
-               #$ ExpandList("WXOS2PM_COMMONOBJS");
-
-PM_COMMONDEPS = \
-               parser.d \
-               #$ ExpandList("WXOS2PM_COMMONDEPS");
-
-PM_GUIOBJS = \
-               #$ ExpandList("WXOS2PM_GUIOBJS");
-
-PM_GUIDEPS = \
-               #$ ExpandList("WXOS2PM_GUIDEPS");
-
-BASE_OBJS = \
-               #$ ExpandList("BASE_OBJS");
-
-BASE_DEPS = \
-               #$ ExpandList("BASE_DEPS");
-
-HTMLOBJS = \
-               #$ ExpandList("WXHTMLOBJS");
-
-HTMLDEPS = \
-               #$ ExpandList("WXHTMLDEPS");
-
-UNIX_OBJS = \
-               #$ ExpandList("WXUNIX_OBJS");
-
-UNIX_DEPS = \
-               #$ ExpandList("WXUNIX_DEPS");
-
-ZLIBOBJS    = \
-               adler32.o \
-               compress.o \
-               crc32.o \
-               gzio.o \
-               uncompr.o \
-               deflate.o \
-               trees.o \
-               zutil.o \
-               inflate.o \
-               infblock.o \
-               inftrees.o \
-               infcodes.o \
-               infutil.o \
-               inffast.o
-
-PNGOBJS     = \
-               png.o \
-               pngread.o \
-               pngrtran.o \
-               pngrutil.o \
-               pngpread.o \
-               pngtrans.o \
-               pngwrite.o \
-               pngwtran.o \
-               pngwutil.o \
-               pngerror.o \
-               pngmem.o \
-               pngwio.o \
-               pngrio.o \
-               pngget.o \
-               pngset.o
-
-
-JPEGOBJS    = \
-               jcomapi.o \
-               jutils.o \
-               jerror.o \
-               jmemmgr.o \
-               jmemnobs.o \
-               jcapimin.o \
-               jcapistd.o \
-               jctrans.o \
-               jcparam.o \
-               jdatadst.o \
-               jcinit.o \
-               jcmaster.o \
-               jcmarker.o \
-               jcmainct.o \
-               jcprepct.o \
-               jccoefct.o \
-               jccolor.o \
-               jcsample.o \
-               jchuff.o \
-               jcphuff.o \
-               jcdctmgr.o \
-               jfdctfst.o \
-               jfdctflt.o \
-               jfdctint.o \
-               jdapimin.o \
-               jdapistd.o \
-               jdtrans.o \
-               jdatasrc.o \
-               jdmaster.o \
-               jdinput.o \
-               jdmarker.o \
-               jdhuff.o \
-               jdphuff.o \
-               jdmainct.o \
-               jdcoefct.o \
-               jdpostct.o \
-               jddctmgr.o \
-               jidctfst.o \
-               jidctflt.o \
-               jidctint.o \
-               jidctred.o \
-               jdsample.o \
-               jdcolor.o \
-               jquant1.o \
-               jquant2.o \
-               jdmerge.o
-
-TIFFOBJS       = \
-               tif_aux.o \
-               tif_close.o \
-               tif_codec.o \
-               tif_compress.o \
-               tif_dir.o \
-               tif_dirinfo.o \
-               tif_dirread.o \
-               tif_dirwrite.o \
-               tif_dumpmode.o \
-               tif_error.o \
-               tif_fax3.o \
-               tif_fax3sm.o \
-               tif_getimage.o \
-               tif_jpeg.o \
-               tif_flush.o \
-               tif_lzw.o \
-               tif_luv.o \
-               tif_next.o \
-               tif_open.o \
-               tif_packbits.o \
-               tif_pixarlog.o \
-               tif_predict.o \
-               tif_print.o \
-               tif_read.o \
-               tif_swab.o \
-               tif_strip.o \
-               tif_thunder.o \
-               tif_tile.o \
-               tif_unix.o \
-               tif_version.o \
-               tif_warning.o \
-               tif_write.o \
-               tif_zip.o
-
-IODBC_OBJS = \
-               catalog.o \
-               connect.o \
-               dlf.o \
-               dlproc.o \
-               execute.o \
-               fetch.o \
-               hdbc.o \
-               henv.o \
-               herr.o \
-               hstmt.o \
-               info.o \
-               itrace.o \
-               misc.o \
-               prepare.o \
-               result.o
-
-GUIOBJS = @GUIOBJS@
-GUIDEPS = @GUIDEPS@
-GUIHEADERS = @GUIHEADERS@
-COMMONOBJS = @COMMONOBJS@
-COMMONDEPS = @COMMONDEPS@
-GENERICOBJS = @GENERICOBJS@
-GENERICDEPS = @GENERICDEPS@
-UNIXOBJS = @UNIXOBJS@
-UNIXDEPS = @UNIXDEPS@
-IODBCOBJS = @IODBCOBJS@
-
-OBJECTS = @ALL_OBJECTS@
-
-DEPFILES = @ALL_DEPFILES@
-
-HEADERS = @ALL_HEADERS@
-
-BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
-
-all: @WX_ALL@
-
-@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
-       @$(INSTALL) -d ./lib
-       $(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
-       $(RANLIB) ./lib/$@
-
-@WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
-       @$(INSTALL) -d ./lib
-       $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
-       
-CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
-       @$(RM) ./lib/@WX_LIBRARY_LINK1@
-       @$(RM) ./lib/@WX_LIBRARY_LINK2@
-       @$(RM) ./lib/@WX_LIBRARY_LINK3@
-       $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@
-       $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
-       $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
-       
-CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
-       $(RM) $(libdir)/@WX_LIBRARY_LINK1@
-       $(RM) $(libdir)/@WX_LIBRARY_LINK2@
-       $(RM) $(libdir)/@WX_LIBRARY_LINK3@
-       $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@
-       $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
-       $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@
-       
-$(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
-
-parser.o:    parser.c lexer.c
-       $(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c
-
-parser.c:      $(COMMDIR)/parser.y lexer.c
-       $(YACC) $(COMMDIR)/parser.y
-       @sed -e "s;$(COMMDIR)/y.tab.c;parser.y;g" < y.tab.c | \
-       sed -e "s/BUFSIZ/5000/g"            | \
-       sed -e "s/YYLMAX 200/YYLMAX 5000/g" | \
-       sed -e "s/yy/PROIO_yy/g"            | \
-       sed -e "s/input/PROIO_input/g"      | \
-       sed -e "s/unput/PROIO_unput/g"      > parser.c
-       @$(RM) y.tab.c
-
-lexer.c:       $(COMMDIR)/lexer.l
-       $(LEX) $(COMMDIR)/lexer.l
-       @sed -e "s;$(COMMDIR)/@LEX_STEM@.c;lexer.l;g" < @LEX_STEM@.c | \
-       sed -e "s/yy/PROIO_yy/g"            | \
-       sed -e "s/input/PROIO_input/g"      | \
-       sed -e "s/unput/PROIO_unput/g"      > lexer.c
-       @$(RM) @LEX_STEM@.c
-
--include $(DEPFILES)
-
-afminstall:
-       $(INSTALL) -d $(datadir)
-       $(INSTALL) -d $(datadir)/wx
-       $(INSTALL) -d $(datadir)/wx/afm
-       $(INSTALL) -d $(datadir)/wx/gs_afm
-       $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
-       $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
-       
-preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
-       @echo " "
-       @echo " Installing wxWindows..."
-       @echo " "
-
-       $(INSTALL) -d $(prefix)
-       $(INSTALL) -d $(bindir)
-       $(INSTALL) -d $(libdir)
-
-       $(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
-       $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
-
-       $(INSTALL) -d $(libdir)/wx
-       $(INSTALL) -d $(libdir)/wx/include
-       $(INSTALL) -d $(libdir)/wx/include/wx
-       $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
-       $(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
-       
-       $(INSTALL) -d $(includedir)/wx
-       @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
-       @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
-       @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/protocol; fi
-       @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/unix; fi
-       @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
-       @list='$(HEADERS)'; for p in $$list; do \
-         $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
-         echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
-       done
-
-write_message:
-       @echo " "
-       @echo " The installation of wxWindows is finished.  On certain"
-       @echo " platforms (e.g. Linux) you'll now have to run ldconfig"
-       @echo " if you installed a shared library."
-       @echo " "
-       @echo " wxWindows comes with  no guarantees  and doesn't claim"
-       @echo " to be suitable for any purpose."
-       @echo " "
-       @echo " Read the wxWindows Licence on licencing conditions."
-       @echo " "
-
-install: preinstall @AFMINSTALL@ @WX_ALL_INSTALLED@ write_message
-
-uninstall:
-       @echo " "
-       @echo " Uninstalling wxWindows..."
-       @echo " "
-       @echo " Removing library..."
-       @$(RM) $(libdir)/@WX_TARGET_LIBRARY@
-       @$(RM) $(libdir)/@WX_LIBRARY_LINK1@
-       @$(RM) $(libdir)/@WX_LIBRARY_LINK2@
-       @$(RM) $(libdir)/@WX_LIBRARY_LINK3@
-       @echo " Removing helper files..."
-       @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
-       @$(RM) $(bindir)/wx-config
-       @$(RM) $(datadir)/wx/afm/*
-       @$(RM) $(datadir)/wx/gs_afm/*
-       @rmdir $(datadir)/wx/gs_afm
-       @rmdir $(datadir)/wx/afm
-       @rmdir $(datadir)/wx
-       @echo " Removing headers..."
-       @list='$(HEADERS)'; for p in $$list; do \
-         $(RM) $(includedir)/wx/$$p; \
-       done
-       @echo " Removing directories..."
-       @if test -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_DIR@; fi
-       @if test -d $(libdir)/wx/include/wx; then rmdir $(libdir)/wx/include/wx; fi
-       @if test -d $(libdir)/wx/include; then rmdir $(libdir)/wx/include; fi
-       @if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi
-       @if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi
-       @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/motif; fi
-       @if test -d $(includedir)/wx/msw; then rmdir $(includedir)/wx/msw; fi
-       @if test -d $(includedir)/wx/html; then rmdir $(includedir)/wx/html; fi
-       @if test -d $(includedir)/wx/unix; then rmdir $(includedir)/wx/unix; fi
-       @if test -d $(includedir)/wx/generic; then rmdir $(includedir)/wx/generic; fi
-       @if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi
-       @if test -d $(includedir)/wx; then rmdir $(includedir)/wx; fi
-
-ALL_DIST:
-       mkdir _dist_dir
-       mkdir $(DISTDIR)
-       cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)
-       cp $(WXDIR)/configure.in $(DISTDIR)
-       cp $(WXDIR)/configure $(DISTDIR)
-       cp $(WXDIR)/config.sub $(DISTDIR)
-       cp $(WXDIR)/config.guess $(DISTDIR)
-       cp $(WXDIR)/install-sh $(DISTDIR)
-       cp $(WXDIR)/mkinstalldirs $(DISTDIR)
-       cp $(WXDIR)/wx-config.in $(DISTDIR)
-       cp $(WXDIR)/setup.h.in $(DISTDIR)
-       cp $(WXDIR)/Makefile.in $(DISTDIR)
-       cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
-       cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
-       cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt
-       cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
-       cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt
-       cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt
-       cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt
-       mkdir $(DISTDIR)/include
-       mkdir $(DISTDIR)/include/wx
-       mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
-       mkdir $(DISTDIR)/include/wx/generic
-       mkdir $(DISTDIR)/include/wx/html
-       mkdir $(DISTDIR)/include/wx/unix
-       mkdir $(DISTDIR)/include/wx/protocol
-       cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx 
-       cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx 
-       cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
-       cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
-       cp $(INCDIR)/wx/generic/*.xpm $(DISTDIR)/include/wx/generic
-       cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
-       cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
-       cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
-       mkdir $(DISTDIR)/src
-       mkdir $(DISTDIR)/src/common
-       mkdir $(DISTDIR)/src/generic
-       mkdir $(DISTDIR)/src/html
-       mkdir $(DISTDIR)/src/html/bitmaps
-       mkdir $(DISTDIR)/src/$(TOOLKITDIR)
-       mkdir $(DISTDIR)/src/unix
-       mkdir $(DISTDIR)/src/png
-       mkdir $(DISTDIR)/src/jpeg
-       mkdir $(DISTDIR)/src/tiff
-       mkdir $(DISTDIR)/src/zlib
-       mkdir $(DISTDIR)/src/iodbc
-       cp $(SRCDIR)/*.in $(DISTDIR)/src
-       cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
-       cp $(COMMDIR)/*.c $(DISTDIR)/src/common
-       cp $(COMMDIR)/*.inc $(DISTDIR)/src/common
-       cp $(COMMDIR)/*.l $(DISTDIR)/src/common
-       cp $(COMMDIR)/*.h $(DISTDIR)/src/common
-       cp $(COMMDIR)/*.y $(DISTDIR)/src/common
-       cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
-       cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
-       cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
-       cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix
-       cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
-       cp $(PNGDIR)/*.h $(DISTDIR)/src/png
-       cp $(PNGDIR)/*.c $(DISTDIR)/src/png
-       cp $(PNGDIR)/README $(DISTDIR)/src/png
-       cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
-       cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
-       cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
-       cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
-       cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
-       cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
-       cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff
-       cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
-       cp $(TIFFDIR)/README $(DISTDIR)/src/tiff
-       cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
-       cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
-       cp $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc
-       cp $(ODBCDIR)/*.exp $(DISTDIR)/src/iodbc
-       cp $(ODBCDIR)/README $(DISTDIR)/src/iodbc
-       cp $(ODBCDIR)/NEWS $(DISTDIR)/src/iodbc
-       cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc
-
-GTK_DIST:
-       cp $(WXDIR)/wxGTK.spec $(DISTDIR)
-       cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
-       cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk
-       cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
-       cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk
-       cp $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk
-
-MOTIF_DIST:
-       cp $(WXDIR)/wxMOTIF.spec $(DISTDIR)
-       cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
-       cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif
-       cp $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif
-       mkdir $(DISTDIR)/src/motif/xmcombo
-       cp $(MOTIFDIR)/xmcombo/*.c $(DISTDIR)/src/motif/xmcombo
-       cp $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo
-       cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
-
-MSW_DIST:
-       cp $(WXDIR)/wxWINE.spec $(DISTDIR)
-       cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
-       cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw
-       cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw
-       cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw
-       cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
-       cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
-       cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
-       cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
-       mkdir $(DISTDIR)/src/msw/ole
-       cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
-
-DEMOS_DIST:
-       mkdir $(DISTDIR)/demos
-       cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
-
-       mkdir $(DISTDIR)/demos/bombs
-       cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
-       cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs
-       cp $(DEMODIR)/bombs/*.cpp $(DISTDIR)/demos/bombs
-       cp $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs
-       cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
-       cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
-       
-       mkdir $(DISTDIR)/demos/forty
-       cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
-       cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty
-       cp $(DEMODIR)/forty/*.h $(DISTDIR)/demos/forty
-       cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
-       cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
-       cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty
-       
-       mkdir $(DISTDIR)/demos/life
-       mkdir $(DISTDIR)/demos/life/bitmaps
-       cp $(DEMODIR)/life/Makefile.in $(DISTDIR)/demos/life
-       cp $(DEMODIR)/life/makefile.unx $(DISTDIR)/demos/life
-       cp $(DEMODIR)/life/*.cpp $(DISTDIR)/demos/life
-       cp $(DEMODIR)/life/*.h $(DISTDIR)/demos/life
-       cp $(DEMODIR)/life/*.xpm $(DISTDIR)/demos/life
-       cp $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps
-       
-       mkdir $(DISTDIR)/demos/poem
-       cp $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem
-       cp $(DEMODIR)/poem/makefile.unx $(DISTDIR)/demos/poem
-       cp $(DEMODIR)/poem/*.cpp $(DISTDIR)/demos/poem
-       cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem
-       cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem
-       cp $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem
-    
-       mkdir $(DISTDIR)/demos/fractal
-       cp $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal
-       cp $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal
-       cp $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal
-       
-SAMPLES_DIST:
-       mkdir $(DISTDIR)/samples
-       cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
-       
-       mkdir $(DISTDIR)/samples/caret
-       cp $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret
-       cp $(SAMPDIR)/caret/makefile.unx $(DISTDIR)/samples/caret
-       cp $(SAMPDIR)/caret/*.cpp $(DISTDIR)/samples/caret
-       cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret
-       
-       mkdir $(DISTDIR)/samples/calendar
-       cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar
-       cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar
-       cp $(SAMPDIR)/calendar/*.cpp $(DISTDIR)/samples/calendar
-       
-       mkdir $(DISTDIR)/samples/config
-       cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config
-       cp $(SAMPDIR)/config/makefile.unx $(DISTDIR)/samples/config
-       cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config
-       
-       mkdir $(DISTDIR)/samples/console
-       cp $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
-       cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
-       cp $(SAMPDIR)/console/*.cpp $(DISTDIR)/samples/console
-       
-       mkdir $(DISTDIR)/samples/controls
-       mkdir $(DISTDIR)/samples/controls/icons
-       cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls
-       cp $(SAMPDIR)/controls/makefile.unx $(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
-       
-       mkdir $(DISTDIR)/samples/checklst
-       cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
-       cp $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst
-       cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
-       cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
-       
-       mkdir $(DISTDIR)/samples/db
-       cp $(SAMPDIR)/db/Makefile.in $(DISTDIR)/samples/db
-       cp $(SAMPDIR)/db/makefile.unx $(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/makefile.unx $(DISTDIR)/samples/dialogs
-       cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
-       cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
-       cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
-       
-       mkdir $(DISTDIR)/samples/dnd
-       cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
-       cp $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd
-       cp $(SAMPDIR)/dnd/*.wxr $(DISTDIR)/samples/dnd
-       cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd
-       cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd
-       cp $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd
-       cp $(SAMPDIR)/dnd/*.png $(DISTDIR)/samples/dnd
-       
-       mkdir $(DISTDIR)/samples/docview
-       cp $(SAMPDIR)/docview/Makefile.in $(DISTDIR)/samples/docview
-       cp $(SAMPDIR)/docview/makefile.unx $(DISTDIR)/samples/docview
-       cp $(SAMPDIR)/docview/*.cpp $(DISTDIR)/samples/docview
-       cp $(SAMPDIR)/docview/*.h $(DISTDIR)/samples/docview
-       cp $(SAMPDIR)/docview/*.xpm $(DISTDIR)/samples/docview
-       
-       mkdir $(DISTDIR)/samples/docvwmdi
-       cp $(SAMPDIR)/docvwmdi/Makefile.in $(DISTDIR)/samples/docvwmdi
-       cp $(SAMPDIR)/docvwmdi/makefile.unx $(DISTDIR)/samples/docvwmdi
-       cp $(SAMPDIR)/docvwmdi/*.cpp $(DISTDIR)/samples/docvwmdi
-       cp $(SAMPDIR)/docvwmdi/*.h $(DISTDIR)/samples/docvwmdi
-       
-       mkdir $(DISTDIR)/samples/drawing
-       cp $(SAMPDIR)/drawing/Makefile.in $(DISTDIR)/samples/drawing
-       cp $(SAMPDIR)/drawing/makefile.unx $(DISTDIR)/samples/drawing
-       cp $(SAMPDIR)/drawing/*.cpp $(DISTDIR)/samples/drawing
-       cp $(SAMPDIR)/drawing/*.xpm $(DISTDIR)/samples/drawing
-       
-       mkdir $(DISTDIR)/samples/dynamic
-       cp $(SAMPDIR)/dynamic/Makefile.in $(DISTDIR)/samples/dynamic
-       cp $(SAMPDIR)/dynamic/makefile.unx $(DISTDIR)/samples/dynamic
-       cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
-       cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
-       
-       mkdir $(DISTDIR)/samples/exec
-       cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec
-       cp $(SAMPDIR)/exec/*.cpp $(DISTDIR)/samples/exec
-       
-       mkdir $(DISTDIR)/samples/ipc
-       cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
-       cp $(SAMPDIR)/ipc/*.xpm $(DISTDIR)/samples/ipc
-       cp $(SAMPDIR)/ipc/*.h $(DISTDIR)/samples/ipc
-       cp $(SAMPDIR)/ipc/*.cpp $(DISTDIR)/samples/ipc
-       
-       mkdir $(DISTDIR)/samples/font
-       cp $(SAMPDIR)/font/Makefile.in $(DISTDIR)/samples/font
-       cp $(SAMPDIR)/font/makefile.unx $(DISTDIR)/samples/font
-       cp $(SAMPDIR)/font/*.cpp $(DISTDIR)/samples/font
-       
-       mkdir $(DISTDIR)/samples/grid
-       cp $(SAMPDIR)/grid/Makefile.in $(DISTDIR)/samples/grid
-       cp $(SAMPDIR)/grid/makefile.unx $(DISTDIR)/samples/grid
-       cp $(SAMPDIR)/grid/*.cpp $(DISTDIR)/samples/grid
-       
-       mkdir $(DISTDIR)/samples/help
-       mkdir $(DISTDIR)/samples/help/doc
-       cp $(SAMPDIR)/help/Makefile.in $(DISTDIR)/samples/help
-       cp $(SAMPDIR)/help/makefile.unx $(DISTDIR)/samples/help
-       cp $(SAMPDIR)/help/*.cpp $(DISTDIR)/samples/help
-       cp $(SAMPDIR)/help/*.xpm $(DISTDIR)/samples/help
-       cp $(SAMPDIR)/help/doc/*.* $(DISTDIR)/samples/help/doc
-       
-       mkdir $(DISTDIR)/samples/html
-       cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html
-       mkdir $(DISTDIR)/samples/html/about
-       cp $(SAMPDIR)/html/about/Makefile.in $(DISTDIR)/samples/html/about
-       cp $(SAMPDIR)/html/about/*.cpp $(DISTDIR)/samples/html/about
-       mkdir $(DISTDIR)/samples/html/about/data
-       cp $(SAMPDIR)/html/about/data/*.htm $(DISTDIR)/samples/html/about/data
-       cp $(SAMPDIR)/html/about/data/*.png $(DISTDIR)/samples/html/about/data
-       mkdir $(DISTDIR)/samples/html/help
-       cp $(SAMPDIR)/html/help/Makefile.in $(DISTDIR)/samples/html/help
-       cp $(SAMPDIR)/html/help/*.cpp $(DISTDIR)/samples/html/help
-       mkdir $(DISTDIR)/samples/html/help/helpfiles
-       cp $(SAMPDIR)/html/help/helpfiles/*.??? $(DISTDIR)/samples/html/help/helpfiles
-       mkdir $(DISTDIR)/samples/html/helpview
-       cp $(SAMPDIR)/html/helpview/Makefile.in $(DISTDIR)/samples/html/helpview
-       cp $(SAMPDIR)/html/helpview/*.cpp $(DISTDIR)/samples/html/helpview
-       cp $(SAMPDIR)/html/helpview/*.zip $(DISTDIR)/samples/html/helpview
-       mkdir $(DISTDIR)/samples/html/printing
-       cp $(SAMPDIR)/html/printing/Makefile.in $(DISTDIR)/samples/html/printing
-       cp $(SAMPDIR)/html/printing/*.cpp $(DISTDIR)/samples/html/printing
-       cp $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing
-       mkdir $(DISTDIR)/samples/html/test
-       cp $(SAMPDIR)/html/test/Makefile.in $(DISTDIR)/samples/html/test
-       cp $(SAMPDIR)/html/test/*.cpp $(DISTDIR)/samples/html/test
-       cp $(SAMPDIR)/html/test/*.bmp $(DISTDIR)/samples/html/test
-       cp $(SAMPDIR)/html/test/*.png $(DISTDIR)/samples/html/test
-       cp $(SAMPDIR)/html/test/*.htm $(DISTDIR)/samples/html/test
-       cp $(SAMPDIR)/html/test/*.html $(DISTDIR)/samples/html/test
-       mkdir $(DISTDIR)/samples/html/virtual
-       cp $(SAMPDIR)/html/virtual/Makefile.in $(DISTDIR)/samples/html/virtual
-       cp $(SAMPDIR)/html/virtual/*.cpp $(DISTDIR)/samples/html/virtual
-       cp $(SAMPDIR)/html/virtual/*.htm $(DISTDIR)/samples/html/virtual
-       mkdir $(DISTDIR)/samples/html/widget
-       cp $(SAMPDIR)/html/widget/Makefile.in $(DISTDIR)/samples/html/widget
-       cp $(SAMPDIR)/html/widget/*.cpp $(DISTDIR)/samples/html/widget
-       cp $(SAMPDIR)/html/widget/*.htm $(DISTDIR)/samples/html/widget
-       mkdir $(DISTDIR)/samples/html/zip
-       cp $(SAMPDIR)/html/zip/Makefile.in $(DISTDIR)/samples/html/zip
-       cp $(SAMPDIR)/html/zip/*.cpp $(DISTDIR)/samples/html/zip
-       cp $(SAMPDIR)/html/zip/*.htm $(DISTDIR)/samples/html/zip
-       cp $(SAMPDIR)/html/zip/*.zip $(DISTDIR)/samples/html/zip
-       
-       mkdir $(DISTDIR)/samples/image
-       cp $(SAMPDIR)/image/Makefile.in $(DISTDIR)/samples/image
-       cp $(SAMPDIR)/image/makefile.unx $(DISTDIR)/samples/image
-       cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image
-       cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
-       cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image
-       cp $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image
-    
-       mkdir $(DISTDIR)/samples/internat
-       mkdir $(DISTDIR)/samples/internat/de
-       mkdir $(DISTDIR)/samples/internat/fr
-       cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat
-       cp $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat
-       cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat
-       cp $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat
-       cp $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat
-       cp $(SAMPDIR)/internat/*.po $(DISTDIR)/samples/internat
-       cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
-       cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
-       cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
-       cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
-       
-       mkdir $(DISTDIR)/samples/layout
-       cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
-       cp $(SAMPDIR)/layout/makefile.unx $(DISTDIR)/samples/layout
-       cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout
-       cp $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout
-       
-       mkdir $(DISTDIR)/samples/listctrl
-       mkdir $(DISTDIR)/samples/listctrl/bitmaps
-       cp $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl
-       cp $(SAMPDIR)/listctrl/makefile.unx $(DISTDIR)/samples/listctrl
-       cp $(SAMPDIR)/listctrl/*.cpp $(DISTDIR)/samples/listctrl
-       cp $(SAMPDIR)/listctrl/*.h $(DISTDIR)/samples/listctrl
-       cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl
-       cp $(SAMPDIR)/listctrl/bitmaps/*.xpm $(DISTDIR)/samples/listctrl/bitmaps
-       
-       mkdir $(DISTDIR)/samples/mdi
-       mkdir $(DISTDIR)/samples/mdi/bitmaps
-       cp $(SAMPDIR)/mdi/Makefile.in $(DISTDIR)/samples/mdi
-       cp $(SAMPDIR)/mdi/makefile.unx $(DISTDIR)/samples/mdi
-       cp $(SAMPDIR)/mdi/*.cpp $(DISTDIR)/samples/mdi
-       cp $(SAMPDIR)/mdi/*.h $(DISTDIR)/samples/mdi
-       cp $(SAMPDIR)/mdi/*.xpm $(DISTDIR)/samples/mdi
-       cp $(SAMPDIR)/mdi/bitmaps/*.xpm $(DISTDIR)/samples/mdi/bitmaps
-       
-       mkdir $(DISTDIR)/samples/memcheck
-       cp $(SAMPDIR)/memcheck/Makefile.in $(DISTDIR)/samples/memcheck
-       cp $(SAMPDIR)/memcheck/makefile.unx $(DISTDIR)/samples/memcheck
-       cp $(SAMPDIR)/memcheck/*.cpp $(DISTDIR)/samples/memcheck
-       cp $(SAMPDIR)/memcheck/*.xpm $(DISTDIR)/samples/memcheck
-       
-       mkdir $(DISTDIR)/samples/menu
-       cp $(SAMPDIR)/menu/Makefile.in $(DISTDIR)/samples/menu
-       cp $(SAMPDIR)/menu/makefile.unx $(DISTDIR)/samples/menu
-       cp $(SAMPDIR)/menu/*.cpp $(DISTDIR)/samples/menu
-       
-       mkdir $(DISTDIR)/samples/minifram
-       mkdir $(DISTDIR)/samples/minifram/bitmaps
-       cp $(SAMPDIR)/minifram/Makefile.in $(DISTDIR)/samples/minifram
-       cp $(SAMPDIR)/minifram/makefile.unx $(DISTDIR)/samples/minifram
-       cp $(SAMPDIR)/minifram/*.cpp $(DISTDIR)/samples/minifram
-       cp $(SAMPDIR)/minifram/*.h $(DISTDIR)/samples/minifram
-       cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram
-       cp $(SAMPDIR)/minifram/bitmaps/*.xpm $(DISTDIR)/samples/minifram/bitmaps
-       
-       mkdir $(DISTDIR)/samples/minimal
-       cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
-       cp $(SAMPDIR)/minimal/makefile.unx $(DISTDIR)/samples/minimal
-       cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
-       cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
-       
-       mkdir $(DISTDIR)/samples/dialup
-       cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
-       cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup
-       cp $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup
-       
-       mkdir $(DISTDIR)/samples/newgrid
-       cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
-       cp $(SAMPDIR)/newgrid/makefile.unx $(DISTDIR)/samples/newgrid
-       cp $(SAMPDIR)/newgrid/*.cpp $(DISTDIR)/samples/newgrid
-       cp $(SAMPDIR)/newgrid/*.h $(DISTDIR)/samples/newgrid
-       
-       mkdir $(DISTDIR)/samples/notebook
-       cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
-       cp $(SAMPDIR)/notebook/makefile.unx $(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/makefile.unx $(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/printing
-       cp $(SAMPDIR)/printing/Makefile.in $(DISTDIR)/samples/printing
-       cp $(SAMPDIR)/printing/makefile.unx $(DISTDIR)/samples/printing
-       cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing
-       cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
-       cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
-       cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
-       
-       mkdir $(DISTDIR)/samples/resource
-       cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
-       cp $(SAMPDIR)/resource/makefile.unx $(DISTDIR)/samples/resource
-       cp $(SAMPDIR)/resource/*.cpp $(DISTDIR)/samples/resource
-       cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
-       cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource
-       
-       mkdir $(DISTDIR)/samples/richedit
-       cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
-       cp $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit
-       cp $(SAMPDIR)/richedit/*.h $(DISTDIR)/samples/richedit
-       cp $(SAMPDIR)/richedit/*.xpm $(DISTDIR)/samples/richedit
-       cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit
-       cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit
-    
-       mkdir $(DISTDIR)/samples/proplist
-       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
-       cp $(SAMPDIR)/sashtest/*.h $(DISTDIR)/samples/sashtest
-    
-       mkdir $(DISTDIR)/samples/scroll
-       cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll
-       cp $(SAMPDIR)/scroll/makefile.unx $(DISTDIR)/samples/scroll
-       cp $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll
-    
-       mkdir $(DISTDIR)/samples/scrollsub
-       cp $(SAMPDIR)/scrollsub/Makefile.in $(DISTDIR)/samples/scrollsub
-       cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub
-       cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub
-    
-       mkdir $(DISTDIR)/samples/splitter
-       cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter
-       cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
-       cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
-    
-       mkdir $(DISTDIR)/samples/text
-       cp $(SAMPDIR)/text/Makefile.in $(DISTDIR)/samples/text
-       cp $(SAMPDIR)/text/makefile.unx $(DISTDIR)/samples/text
-       cp $(SAMPDIR)/text/*.cpp $(DISTDIR)/samples/text
-       cp $(SAMPDIR)/text/*.xpm $(DISTDIR)/samples/text
-    
-       mkdir $(DISTDIR)/samples/thread
-       cp $(SAMPDIR)/thread/Makefile.in $(DISTDIR)/samples/thread
-       cp $(SAMPDIR)/thread/makefile.unx $(DISTDIR)/samples/thread
-       cp $(SAMPDIR)/thread/*.cpp $(DISTDIR)/samples/thread
-    
-       mkdir $(DISTDIR)/samples/toolbar
-       cp $(SAMPDIR)/toolbar/Makefile.in $(DISTDIR)/samples/toolbar
-       cp $(SAMPDIR)/toolbar/*.cpp $(DISTDIR)/samples/toolbar
-       cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar
-       mkdir $(DISTDIR)/samples/toolbar/bitmaps
-       cp $(SAMPDIR)/toolbar/bitmaps/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
-    
-       mkdir $(DISTDIR)/samples/treectrl
-       cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl
-       cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl
-       cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl
-       cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl
-    
-       mkdir $(DISTDIR)/samples/typetest
-       cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest
-       cp $(SAMPDIR)/typetest/*.cpp $(DISTDIR)/samples/typetest
-       cp $(SAMPDIR)/typetest/*.h $(DISTDIR)/samples/typetest
-       cp $(SAMPDIR)/typetest/*.xpm $(DISTDIR)/samples/typetest
-    
-       mkdir $(DISTDIR)/samples/validate
-       cp $(SAMPDIR)/validate/Makefile.in $(DISTDIR)/samples/validate
-       cp $(SAMPDIR)/validate/*.cpp $(DISTDIR)/samples/validate
-       cp $(SAMPDIR)/validate/*.h $(DISTDIR)/samples/validate
-       cp $(SAMPDIR)/validate/*.xpm $(DISTDIR)/samples/validate
-    
-       mkdir $(DISTDIR)/samples/wizard
-       cp $(SAMPDIR)/wizard/Makefile.in $(DISTDIR)/samples/wizard
-       cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard
-       cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard
-    
-       mkdir $(DISTDIR)/samples/sockets
-       cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
-       cp $(SAMPDIR)/sockets/*.cpp $(DISTDIR)/samples/sockets
-       cp $(SAMPDIR)/sockets/*.xpm $(DISTDIR)/samples/sockets
-
-UTILS_DIST:
-       mkdir $(DISTDIR)/utils
-       cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
-       
-       mkdir $(DISTDIR)/utils/wxMMedia2
-       mkdir $(DISTDIR)/utils/wxMMedia2/lib
-       mkdir $(DISTDIR)/utils/wxMMedia2/sample
-       cp $(UTILSDIR)/wxMMedia2/Makefile.in $(DISTDIR)/utils/wxMMedia2
-       cp $(UTILSDIR)/wxMMedia2/lib/Makefile.in $(DISTDIR)/utils/wxMMedia2/lib
-       cp $(UTILSDIR)/wxMMedia2/lib/*.h $(DISTDIR)/utils/wxMMedia2/lib
-       cp $(UTILSDIR)/wxMMedia2/lib/*.cpp $(DISTDIR)/utils/wxMMedia2/lib
-       cp $(UTILSDIR)/wxMMedia2/lib/*.def $(DISTDIR)/utils/wxMMedia2/lib
-       cp $(UTILSDIR)/wxMMedia2/sample/Makefile.in $(DISTDIR)/utils/wxMMedia2/sample
-       cp $(UTILSDIR)/wxMMedia2/sample/*.cpp $(DISTDIR)/utils/wxMMedia2/sample
-       
-       mkdir $(DISTDIR)/utils/glcanvas
-       mkdir $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
-       cp $(UTILSDIR)/glcanvas/Makefile.in $(DISTDIR)/utils/glcanvas
-       cp $(UTILSDIR)/glcanvas/docs/notes.txt $(DISTDIR)/utils/glcanvas/NOTES.txt
-       cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/Makefile.in $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
-       cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.h $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
-       cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.cpp $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
-       
-       mkdir $(DISTDIR)/utils/ogl
-       mkdir $(DISTDIR)/utils/ogl/src
-       cp $(UTILSDIR)/ogl/Makefile.in $(DISTDIR)/utils/ogl
-       cp $(UTILSDIR)/ogl/src/Makefile.in $(DISTDIR)/utils/ogl/src
-       cp $(UTILSDIR)/ogl/src/*.h $(DISTDIR)/utils/ogl/src
-       cp $(UTILSDIR)/ogl/src/*.cpp $(DISTDIR)/utils/ogl/src
-       
-MISC_DIST:
-       mkdir $(DISTDIR)/misc
-       mkdir $(DISTDIR)/misc/afm
-       cp $(MISCDIR)/afm/*.afm  $(DISTDIR)/misc/afm
-       mkdir $(DISTDIR)/misc/gs_afm
-       cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
-       
-dist: ALL_DIST @GUIDIST@ SAMPLES_DIST DEMOS_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) ../..
-       mv _dist_dir/wx$(TOOLKIT)/demos _dist_dir/wx$(TOOLKIT)/wxDemos
-       cd _dist_dir/wx$(TOOLKIT); tar ch wxDemos | gzip -f9 > $(WXDEMOS); mv $(WXDEMOS) ../..
-       $(RM) -r _dist_dir
-
-clean:
-       $(RM) *.o
-       $(RM) *.d
-       $(RM) parser.c
-       $(RM) lexer.c
-       $(RM) ./lib/*
-
-cleanall: clean
index a0ae7a93d966a9847747b219dcb965d9412d4fa1..6b85b38beb18770fc6c571d702b9d5e95cea1c54 100644 (file)
@@ -1,4 +1,22 @@
 
+12th January '2000: wxWindows 2.1.14 released
+
+Corrected one more bug in the TIFF handler.
+
+It is now possible to run wxGTK apps in the best visual
+instead of only the default on system that support this
+(typically IRIX).
+
+Added default keyboard handling to wxScrolledWindow.
+
+Fixed slightly overoptimized window colour and style handling.
+
+Fixed bug in drawing code that made GTK pick the wrong pen
+style when using the default.
+
+The L-GPL iODBC library must now be enables explicitly so as
+to not mislead people into reading the license wrong.
+
 24th January '2000: wxWindows 2.1.13 released
 
 Corrections to TAB handling in notebooks.
index 54648146b3649a804221e239d6ee87ac6089bc3d..33c31801e73b2932deebcd5c015bdb805a93884e 100644 (file)
@@ -150,7 +150,7 @@ function will find the first top-level window (frame or dialog) and return that.
 
 \constfunc{bool}{GetUseBestVisual}{\void}
 
-Returns TRUE if the application will use the best visual on system that support
+Returns TRUE if the application will use the best visual on systems that support
 different visuals, FALSE otherwise.
 
 \wxheading{See also}
@@ -464,9 +464,9 @@ can be overridden by the user to change the default icons.
 \func{void}{SetUseBestVisual}{\param{bool}{ flag}}
 
 Allows the programmer to specify whether the application will use the best visual
-on system that support several visual on the same display. This is typically the
-case under Solaris and IRIX, where the default visual is only 8-bit but some apps
-are supposed to run in TrueColour mode.
+on systems that support several visual on the same display. This is typically the
+case under Solaris and IRIX, where the default visual is only 8-bit whereas certain
+appications are supposed to run in TrueColour mode.
 
 Note that this function has to be called in the constructor of the {\tt wxApp}
 instance and won't have any effect when called later on.
index 63792d1c87da10c82310dc36b63afc8f299f89e6..5a22deae3d58314f515c7d3374a08b5aec5dac6c 100644 (file)
@@ -1663,8 +1663,7 @@ functions so should not be required by the application programmer.
 
 Reparents the window, i.e the window will be removed from its
 current parent window (e.g. a non-standard toolbar in a wxFrame)
-and then re-inserted into another (e.g. a wxMiniFrame for a
-floating toolbar). Available on Windows and GTK+.
+and then re-inserted into another. Available on Windows and GTK.
 
 \wxheading{Parameters}
 
@@ -1709,8 +1708,7 @@ Physically scrolls the pixels in the window and move child windows accordingly.
 
 \docparam{rect}{Rectangle to invalidate. If this is NULL, the whole window is invalidated. If you
 pass a rectangle corresponding to the area of the window exposed by the scroll, your painting handler
-can optimise painting by checking for the invalidated region. This paramter is ignored under GTK,
-instead the regions to be invalidated are calculated automatically. }
+can optimise painting by checking for the invalidated region. This paramter is ignored under GTK.}
 
 \wxheading{Remarks}
 
@@ -1737,14 +1735,6 @@ be called automatically when the window is resized. Use in connection with
 \docparam{autoLayout}{Set this to TRUE if you wish the Layout function to be called
 from within wxWindow::OnSize functions.}
 
-\wxheading{Remarks}
-
-Note that this function is actually disabled for wxWindow. It has
-effect for wxDialog, wxFrame, wxPanel and wxScrolledWindow.  Windows
-of other types that need to invoke the Layout algorithm should provide
-an EVT\_SIZE handler and call
-\helpref{wxWindow::Layout}{wxwindowlayout} from within it.
-
 \wxheading{See also}
 
 \helpref{wxWindow::SetConstraints}{wxwindowsetconstraints}
@@ -1769,9 +1759,9 @@ Note that setting the background colour does not cause an immediate refresh, so
 may wish to call \helpref{wxWindow::Clear}{wxwindowclear} or \helpref{wxWindow::Refresh}{wxwindowrefresh} after
 calling this function.
 
-Note that when using this functions under GTK, you will disable the so called "themes",
-i.e. the user chosen apperance of windows and controls, including the themes of
-their parent windows.
+Use this function with care under GTK as the new appearance of the window might
+not look equally well when used with "Themes", i.e GTK's ability to change its
+look as the user wishes with run-time loadable modules.
 
 \wxheading{See also}
 
index 81e65a023aa2594153f70a9531b9fda869f0914c..f2c5c1165c8b95b2b92aef9c9a65eecb573cbfb4 100644 (file)
@@ -393,7 +393,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     m_text = new wxTextCtrl(this, -1, "This is the log window.\n",
                             wxPoint(0, 250), wxSize(100, 50), wxTE_MULTILINE);
-    //  m_text->SetBackgroundColour("wheat");
+    m_text->SetBackgroundColour("wheat");
 
     wxLog::AddTraceMask(_T("focus"));
     m_logTargetOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_text));
@@ -655,6 +655,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     m_label = new wxStaticText(panel, -1, "Label with some long text",
                                wxPoint(250, 60), wxDefaultSize,
                                wxALIGN_RIGHT | wxST_NO_AUTORESIZE);
+    m_label->SetForegroundColour( *wxBLUE );
 
     m_notebook->AddPage(panel, "wxBitmapXXX");
 
@@ -750,13 +751,13 @@ void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))
         SetBackgroundColour(s_colOld);
         s_colOld = wxNullColour;
 
-        m_lbSelectThis->SetForegroundColour("yellow");
-        m_lbSelectThis->SetBackgroundColour("blue");
+        m_lbSelectThis->SetForegroundColour("red");
+        m_lbSelectThis->SetBackgroundColour("white");
     }
     else
     {
-        s_colOld = GetBackgroundColour();
-        SetBackgroundColour("green");
+        s_colOld = wxColour("red");
+        SetBackgroundColour("white");
 
         m_lbSelectThis->SetForegroundColour("white");
         m_lbSelectThis->SetBackgroundColour("red");
index 33f7b9d5f202c253151296aef5f49fd1f9042c13..636bd5231031124f8a4da4e34212a47daaf2b837 100644 (file)
@@ -7,9 +7,3 @@
 0 wx.html                  ;wxWindows: Help index; additional keywords like overview
 1 wxwin.htm           ;  wxWindows Class References
 2 wx204.htm#functions         ;  wxWindows Function References; methods
-;
-; Some doc++ generated files:
-;
-4 aindex.html                 ;wxExtHelpController: Table of contents
-3 HIER.html                   ;  Class hierarchy (very small) 
-5 wxExtHelpController.html    ;  The class documentation of wxExtHelpController.;brower viewer
index 1813a6fce0b14852942abc1955166f514702a806..58dec0c3b65742abf452d68a6a371191db29235f 100644 (file)
@@ -1309,12 +1309,15 @@ wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, u
     
     bitmap.SetDepth( 1 );
 
+    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    wxASSERT( visual );
+    
     // Create picture image
 
     unsigned char *data_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
     
     GdkImage *data_image =
-        gdk_image_new_bitmap( gdk_visual_get_system(), data_data, width, height );
+        gdk_image_new_bitmap( visual, data_data, width, height );
 
     // Create mask image
 
@@ -1324,7 +1327,7 @@ wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, u
     {
         unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
 
-        mask_image =  gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height );
+        mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
 
         wxMask *mask = new wxMask();
         mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 );
@@ -1405,10 +1408,11 @@ wxBitmap wxImage::ConvertToBitmap() const
 
     bitmap.SetPixmap( gdk_pixmap_new( wxRootWindow->window, width, height, -1 ) );
 
-     // Retrieve depth
+    // Retrieve depth
 
-    GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
-    if (visual == NULL) visual = gdk_visual_get_system();
+    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    wxASSERT( visual );
+    
     int bpp = visual->depth;
 
     bitmap.SetDepth( bpp );
@@ -1448,7 +1452,7 @@ wxBitmap wxImage::ConvertToBitmap() const
     // Create picture image
 
     GdkImage *data_image =
-        gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), width, height );
+        gdk_image_new( GDK_IMAGE_FASTEST, visual, width, height );
 
     // Create mask image
 
@@ -1458,7 +1462,7 @@ wxBitmap wxImage::ConvertToBitmap() const
     {
         unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
 
-        mask_image =  gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height );
+        mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
 
         wxMask *mask = new wxMask();
         mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 );
@@ -1473,7 +1477,6 @@ wxBitmap wxImage::ConvertToBitmap() const
 
     if (bpp >= 24)
     {
-        GdkVisual *visual = gdk_visual_get_system();
         if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask))      b_o = RGB;
         else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask))  b_o = RGB;
         else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask))   b_o = BRG;
index bbde88901498891389b2f360631430c60bf34420..b85f97f63d19e5217d35cf9c2decb63db8fed5ce 100644 (file)
@@ -92,7 +92,9 @@ bool wxMask::Create( const wxBitmap& bitmap,
     unsigned char green = colour.Green();
     unsigned char blue = colour.Blue();
 
-    GdkVisual *visual = gdk_visual_get_system();
+    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    wxASSERT( visual );
+    
     int bpp = visual->depth;
     if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
     if (bpp == 15)
@@ -243,9 +245,12 @@ wxBitmap::wxBitmap( int width, int height, int depth )
 {
     wxCHECK_RET( (width > 0) && (height > 0), wxT("invalid bitmap size") )
 
-    if (depth == -1) depth = gdk_window_get_visual( wxRootWindow->window )->depth;
+    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    wxASSERT( visual );
 
-    wxCHECK_RET( (depth ==  gdk_window_get_visual( wxRootWindow->window )->depth) ||
+    if (depth == -1) depth = visual->depth;
+
+    wxCHECK_RET( (depth == visual->depth) ||
                  (depth == 1), wxT("invalid bitmap depth") )
 
     m_refData = new wxBitmapRefData();
@@ -260,7 +265,7 @@ wxBitmap::wxBitmap( int width, int height, int depth )
     else
     {
         M_BMPDATA->m_pixmap = gdk_pixmap_new( wxRootWindow->window, width, height, depth );
-        M_BMPDATA->m_bpp = gdk_window_get_visual( wxRootWindow->window )->depth;
+        M_BMPDATA->m_bpp = visual->depth;
     }
 
     if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
@@ -270,6 +275,9 @@ bool wxBitmap::CreateFromXpm( const char **bits )
 {
     wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
 
+    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    wxASSERT( visual );
+    
     m_refData = new wxBitmapRefData();
 
     GdkBitmap *mask = (GdkBitmap*) NULL;
@@ -286,7 +294,8 @@ bool wxBitmap::CreateFromXpm( const char **bits )
 
     gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
 
-    M_BMPDATA->m_bpp = gdk_window_get_visual( wxRootWindow->window )->depth;  // ?
+    M_BMPDATA->m_bpp = visual->depth;  // ?
+    
     if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
 
     return TRUE;
@@ -443,6 +452,9 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
 
     if (!wxFileExists(name)) return FALSE;
 
+    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    wxASSERT( visual );
+    
     if (type == wxBITMAP_TYPE_XPM)
     {
         m_refData = new wxBitmapRefData();
@@ -458,7 +470,8 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
         }
 
         gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
-        M_BMPDATA->m_bpp = gdk_window_get_visual( wxRootWindow->window )->depth;
+        
+        M_BMPDATA->m_bpp = visual->depth;
     }
     else // try if wxImage can load it
     {
index 15db772b4257e2f8d8c890ae94c08e2853ef1e1b..a7c370dbe7394eee42d91ba6af4dc6c2ed6999d0 100644 (file)
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 21:13, 2000/01/28
+# This file was automatically generated by tmake at 17:23, 2000/02/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
@@ -192,14 +192,14 @@ ALL_SOURCES = \
                gtk/wave.cpp \
                gtk/win_gtk.c \
                gtk/window.cpp \
-               gtk/dialup.cpp \
-               gtk/dir.cpp \
-               gtk/fontenum.cpp \
-               gtk/fontutil.cpp \
-               gtk/gsocket.c \
-               gtk/mimetype.cpp \
-               gtk/threadpsx.cpp \
-               gtk/utilsunx.cpp \
+               unix/dialup.cpp \
+               unix/dir.cpp \
+               unix/fontenum.cpp \
+               unix/fontutil.cpp \
+               unix/gsocket.c \
+               unix/mimetype.cpp \
+               unix/threadpsx.cpp \
+               unix/utilsunx.cpp \
                html/helpctrl.cpp \
                html/helpdata.cpp \
                html/helpfrm.cpp \
@@ -317,6 +317,8 @@ ALL_HEADERS = \
                intl.h \
                ioswrap.h \
                ipcbase.h \
+               isql.h \
+               isqlext.h \
                joystick.h \
                layout.h \
                laywin.h \
@@ -637,6 +639,7 @@ COMMONOBJS = \
                zstream.o
 
 COMMONDEPS = \
+               parser.d \
                appcmn.d \
                choiccmn.d \
                clipcmn.d \
@@ -995,6 +998,3 @@ HTMLDEPS = \
                m_tables.d \
                winpars.d
 
-IODBCOBJS = \
-
-IODBCDEPS = \
index c12549013e45d8471db958267e60df16d0aa8cb3..b760a98993ae0f65c4801d64a9cf75bd7b04551c 100644 (file)
@@ -2977,12 +2977,10 @@ bool wxWindow::SetBackgroundColour( const wxColour &colour )
         // but it couldn't get applied as the
         // widget hasn't been realized yet.
         m_delayedBackgroundColour = TRUE;
-
-        // pretend we have done something
-        return TRUE;
     }
 
     if ((m_wxwindow) &&
+        (m_wxwindow->window) &&
         (m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE)))
     {
         /* wxMSW doesn't clear the window here. I don't do that either to
@@ -3020,9 +3018,6 @@ bool wxWindow::SetForegroundColour( const wxColour &colour )
         // but it couldn't get applied as the
         // widget hasn't been realized yet.
         m_delayedForegroundColour = TRUE;
-
-        // pretend we have done something
-        return TRUE;
     }
 
     ApplyWidgetStyle();
@@ -3032,15 +3027,24 @@ bool wxWindow::SetForegroundColour( const wxColour &colour )
 
 GtkStyle *wxWindow::GetWidgetStyle()
 {
-    if (m_widgetStyle) return m_widgetStyle;
-
-    GtkStyle *def = gtk_rc_get_style( m_widget );
+    if (m_widgetStyle)
+    {
+        GtkStyle *remake = gtk_style_copy( m_widgetStyle );
+        remake->klass = m_widgetStyle->klass;
+        
+        gtk_style_unref( m_widgetStyle );
+        m_widgetStyle = remake;
+    }
+    else
+    {
+        GtkStyle *def = gtk_rc_get_style( m_widget );
 
-    if (!def)
-        def = gtk_widget_get_default_style();
+        if (!def)
+            def = gtk_widget_get_default_style();
 
-    m_widgetStyle = gtk_style_copy( def );
-    m_widgetStyle->klass = def->klass;
+        m_widgetStyle = gtk_style_copy( def );
+        m_widgetStyle->klass = def->klass;
+    }
 
     return m_widgetStyle;
 }
index bbde88901498891389b2f360631430c60bf34420..b85f97f63d19e5217d35cf9c2decb63db8fed5ce 100644 (file)
@@ -92,7 +92,9 @@ bool wxMask::Create( const wxBitmap& bitmap,
     unsigned char green = colour.Green();
     unsigned char blue = colour.Blue();
 
-    GdkVisual *visual = gdk_visual_get_system();
+    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    wxASSERT( visual );
+    
     int bpp = visual->depth;
     if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
     if (bpp == 15)
@@ -243,9 +245,12 @@ wxBitmap::wxBitmap( int width, int height, int depth )
 {
     wxCHECK_RET( (width > 0) && (height > 0), wxT("invalid bitmap size") )
 
-    if (depth == -1) depth = gdk_window_get_visual( wxRootWindow->window )->depth;
+    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    wxASSERT( visual );
 
-    wxCHECK_RET( (depth ==  gdk_window_get_visual( wxRootWindow->window )->depth) ||
+    if (depth == -1) depth = visual->depth;
+
+    wxCHECK_RET( (depth == visual->depth) ||
                  (depth == 1), wxT("invalid bitmap depth") )
 
     m_refData = new wxBitmapRefData();
@@ -260,7 +265,7 @@ wxBitmap::wxBitmap( int width, int height, int depth )
     else
     {
         M_BMPDATA->m_pixmap = gdk_pixmap_new( wxRootWindow->window, width, height, depth );
-        M_BMPDATA->m_bpp = gdk_window_get_visual( wxRootWindow->window )->depth;
+        M_BMPDATA->m_bpp = visual->depth;
     }
 
     if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
@@ -270,6 +275,9 @@ bool wxBitmap::CreateFromXpm( const char **bits )
 {
     wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
 
+    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    wxASSERT( visual );
+    
     m_refData = new wxBitmapRefData();
 
     GdkBitmap *mask = (GdkBitmap*) NULL;
@@ -286,7 +294,8 @@ bool wxBitmap::CreateFromXpm( const char **bits )
 
     gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
 
-    M_BMPDATA->m_bpp = gdk_window_get_visual( wxRootWindow->window )->depth;  // ?
+    M_BMPDATA->m_bpp = visual->depth;  // ?
+    
     if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
 
     return TRUE;
@@ -443,6 +452,9 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
 
     if (!wxFileExists(name)) return FALSE;
 
+    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    wxASSERT( visual );
+    
     if (type == wxBITMAP_TYPE_XPM)
     {
         m_refData = new wxBitmapRefData();
@@ -458,7 +470,8 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
         }
 
         gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
-        M_BMPDATA->m_bpp = gdk_window_get_visual( wxRootWindow->window )->depth;
+        
+        M_BMPDATA->m_bpp = visual->depth;
     }
     else // try if wxImage can load it
     {
index 15db772b4257e2f8d8c890ae94c08e2853ef1e1b..a7c370dbe7394eee42d91ba6af4dc6c2ed6999d0 100644 (file)
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 21:13, 2000/01/28
+# This file was automatically generated by tmake at 17:23, 2000/02/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
@@ -192,14 +192,14 @@ ALL_SOURCES = \
                gtk/wave.cpp \
                gtk/win_gtk.c \
                gtk/window.cpp \
-               gtk/dialup.cpp \
-               gtk/dir.cpp \
-               gtk/fontenum.cpp \
-               gtk/fontutil.cpp \
-               gtk/gsocket.c \
-               gtk/mimetype.cpp \
-               gtk/threadpsx.cpp \
-               gtk/utilsunx.cpp \
+               unix/dialup.cpp \
+               unix/dir.cpp \
+               unix/fontenum.cpp \
+               unix/fontutil.cpp \
+               unix/gsocket.c \
+               unix/mimetype.cpp \
+               unix/threadpsx.cpp \
+               unix/utilsunx.cpp \
                html/helpctrl.cpp \
                html/helpdata.cpp \
                html/helpfrm.cpp \
@@ -317,6 +317,8 @@ ALL_HEADERS = \
                intl.h \
                ioswrap.h \
                ipcbase.h \
+               isql.h \
+               isqlext.h \
                joystick.h \
                layout.h \
                laywin.h \
@@ -637,6 +639,7 @@ COMMONOBJS = \
                zstream.o
 
 COMMONDEPS = \
+               parser.d \
                appcmn.d \
                choiccmn.d \
                clipcmn.d \
@@ -995,6 +998,3 @@ HTMLDEPS = \
                m_tables.d \
                winpars.d
 
-IODBCOBJS = \
-
-IODBCDEPS = \
index c12549013e45d8471db958267e60df16d0aa8cb3..b760a98993ae0f65c4801d64a9cf75bd7b04551c 100644 (file)
@@ -2977,12 +2977,10 @@ bool wxWindow::SetBackgroundColour( const wxColour &colour )
         // but it couldn't get applied as the
         // widget hasn't been realized yet.
         m_delayedBackgroundColour = TRUE;
-
-        // pretend we have done something
-        return TRUE;
     }
 
     if ((m_wxwindow) &&
+        (m_wxwindow->window) &&
         (m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE)))
     {
         /* wxMSW doesn't clear the window here. I don't do that either to
@@ -3020,9 +3018,6 @@ bool wxWindow::SetForegroundColour( const wxColour &colour )
         // but it couldn't get applied as the
         // widget hasn't been realized yet.
         m_delayedForegroundColour = TRUE;
-
-        // pretend we have done something
-        return TRUE;
     }
 
     ApplyWidgetStyle();
@@ -3032,15 +3027,24 @@ bool wxWindow::SetForegroundColour( const wxColour &colour )
 
 GtkStyle *wxWindow::GetWidgetStyle()
 {
-    if (m_widgetStyle) return m_widgetStyle;
-
-    GtkStyle *def = gtk_rc_get_style( m_widget );
+    if (m_widgetStyle)
+    {
+        GtkStyle *remake = gtk_style_copy( m_widgetStyle );
+        remake->klass = m_widgetStyle->klass;
+        
+        gtk_style_unref( m_widgetStyle );
+        m_widgetStyle = remake;
+    }
+    else
+    {
+        GtkStyle *def = gtk_rc_get_style( m_widget );
 
-    if (!def)
-        def = gtk_widget_get_default_style();
+        if (!def)
+            def = gtk_widget_get_default_style();
 
-    m_widgetStyle = gtk_style_copy( def );
-    m_widgetStyle->klass = def->klass;
+        m_widgetStyle = gtk_style_copy( def );
+        m_widgetStyle->klass = def->klass;
+    }
 
     return m_widgetStyle;
 }
index c27ad5bcc659fdc6e5cb7f122bf96d6740bc8c26..898787cc03e92c1b6e428c0442c18f1a3898f8f0 100644 (file)
@@ -1,6 +1,6 @@
 # Note that this is NOT a relocatable package
 %define pref /usr
-%define ver 2.1.13
+%define ver 2.1.14
 %define rel 0
 
 Summary: wxBase library - non-GUI support classes of wxWindows toolkit
@@ -33,7 +33,7 @@ Header files for wxBase. You need them to develop programs using wxBase.
 
 %prep
 %setup -n wxBase
-./configure --prefix=%{pref} --disable-gui
+./configure --prefix=%{pref} --disable-gui --disable-std_iostreams
 
 %build
 if [ "$SMP" != "" ]; then
index 5c96964c17699d7d38e5f294488f0a16adca087d..d126784a6c05196591fc1508de4b4e4cc7517543 100644 (file)
@@ -1,6 +1,6 @@
 # Note that this is NOT a relocatable package
 %define pref /usr
-%define ver 2.1.13
+%define ver 2.1.14
 %define rel 0
 
 Summary: The GTK+ 1.2 port of the wxWindows library
@@ -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.13.tgz
+Source: wxGTK-%{ver}.tar.gz
 URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html
 Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
 BuildRoot: /tmp/wxgtk_root
@@ -37,7 +37,12 @@ Header files for the wxGTK, the GTK+ 1.2 port of the wxWindows library.
 ./configure --prefix=%{pref} --enable-threads --disable-std_iostreams --disable-newgrid
 
 %build
-make
+if [ "$SMP" != "" ]; then
+  export MAKE="make -j$SMP"
+else
+  export MAKE="make"
+fi
+$MAKE
 
 %install
 rm -rf $RPM_BUILD_ROOT