From 8e877c195bc9ade6d4cb9f96bffb00e81978d740 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Tue, 10 Aug 1999 20:08:24 +0000 Subject: [PATCH] New makefiles for GTK and Motif, using configure but not libtool and automake. Numerous Motif crash fixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- BuildCVS.txt | 23 +- configure.in | 20 +- distrib/msw/tmake/filelist.txt | 6 +- distrib/msw/tmake/gtk.t | 219 ----------- distrib/msw/tmake/makeall.bat | 2 - distrib/msw/tmake/unx.t | 275 +++++++------- include/wx/motif/dialog.h | 3 + makefile.unx.in | 644 --------------------------------- src/generic/numdlgg.cpp | 2 +- src/gtk.env | 107 ------ src/gtk/Makefile | 352 ------------------ src/gtk/makefile.unx.in | 612 +++++++++++++++++++++++++++++++ src/gtk1/Makefile | 352 ------------------ src/gtk1/makefile.unx.in | 612 +++++++++++++++++++++++++++++++ src/make.env | 189 +++++----- src/makelib.env | 1 + src/makelib.env.in | 19 + src/makelib.gtk | 21 -- src/makeprog.env | 11 +- src/makeprog.env.in | 18 + src/makeprog.gtk | 13 - src/motif/button.cpp | 12 +- src/motif/dialog.cpp | 52 ++- src/motif/frame.cpp | 16 +- src/motif/makefile.unx.in | 612 +++++++++++++++++++++++++++++++ src/motif/window.cpp | 9 +- 26 files changed, 2218 insertions(+), 1984 deletions(-) delete mode 100644 distrib/msw/tmake/gtk.t delete mode 100644 makefile.unx.in delete mode 100644 src/gtk.env delete mode 100644 src/gtk/Makefile create mode 100644 src/gtk/makefile.unx.in delete mode 100644 src/gtk1/Makefile create mode 100644 src/gtk1/makefile.unx.in create mode 100644 src/makelib.env.in delete mode 100644 src/makelib.gtk create mode 100644 src/makeprog.env.in delete mode 100644 src/makeprog.gtk create mode 100644 src/motif/makefile.unx.in diff --git a/BuildCVS.txt b/BuildCVS.txt index 55054813c4..b4f28fcfaf 100644 --- a/BuildCVS.txt +++ b/BuildCVS.txt @@ -45,17 +45,26 @@ and its make.exe). -> type: cd c:\wxWin\src\msw -> type: make -f makefile.g95 -II) GTK port on Unix using plain makefiles. ------------------------------------------- +II) Unix ports using plain makefiles. +-------------------------------------- + +Building wxGTK or wxMotif completely without configure +won't ever work, but there is now a new makefile system +that works without libtool and automake, using only +configure to create what is needed. So far, no shared +libraries can be build with this system. Set WXWIN environment variable to the base directory such -as ~/wxWindows +as ~/wxWindows (this is actually not really needed). -> type: export WXWIN=~/wxWindows --> edit ~/wxWindows/src/gtk.env as you wish. --> type: cd ~/wxWindows/src/gtk --> type: cp ./setup0.h setup.h --> type: make +-> type: md mybuild +-> type: cd mybuild +-> type: ../configure --with-motif +or type: ../configure --with-gtk +-> type: cd src/gtk +or type: cd src/motif +-> type: make -f makefile.unx III) Windows using configure diff --git a/configure.in b/configure.in index 0e894f9e05..49a63f738a 100644 --- a/configure.in +++ b/configure.in @@ -891,6 +891,10 @@ dnl disable static libs by default, this takes too much time... dnl libtool doesn't work on anything but Linux and maybe dnl ***BSD +SHLIB_LINKER= +SHLIB_LINKER_FLAG= +SHLIB_CFLAG= + case "${host}" in *-hp-hpux* ) AM_DISABLE_SHARED @@ -1192,6 +1196,9 @@ TOOLKIT_DEF=-D__WX${TOOLKIT}__ dnl the name of the (libtool) library WX_LIBRARY_NAME="libwx_${TOOLKIT_DIR}.la" +dnl the name of the static library +WX_LIBRARY_NAME_STATIC="libwx_${TOOLKIT_DIR}.a" + dnl the name of the library to be linked reported by wx-config WX_LIBRARY="wx_${TOOLKIT_DIR}" @@ -2166,6 +2173,10 @@ dnl all the libraries needed to link wxWindows programs (when the library is not dnl yet installed) LIBS="\${top_builddir}/src/${TOOLKIT_DIR}/${WX_LIBRARY_NAME} $EXTRA_LIBS" +dnl all the libraries needed to link wxWindows programs when using the +dnl makefile system without libtool +LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS" + dnl all -I options we must pass to the compiler INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TOOLKIT_INCLUDE" @@ -2245,6 +2256,7 @@ AC_SUBST(USER_SUBDIRS) dnl additional libraries AC_SUBST(EXTRA_LIBS) AC_SUBST(LIBS) +AC_SUBST(LD_LIBS) dnl create the configuration header file from the template dnl @@ -2263,7 +2275,13 @@ dnl (the original file name may be overriden by appending another name after a dnl colon) AC_OUTPUT([ wx-config - makefile.unx + + src/make.env + src/makeprog.env + src/makelib.env + src/gtk/makefile.unx + src/motif/makefile.unx + Makefile src/Makefile diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index d45210b55d..2339adff27 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -29,6 +29,7 @@ # O OLE file (needs Win32 and a decent compiler) # S Socket file (currently doesn't compile under Win16 nor with GNU) # R Not required for the GTK port +# X Not required for the Motif port # WX Base header # GTK GTK header # MSW MSW header @@ -276,7 +277,7 @@ data.cpp R dataobj.cpp R dc.cpp R dcclient.cpp R -dcmemory.cpp R +dcmemory.cpp R dcscreen.cpp R dialog.cpp R dnd.cpp R @@ -334,7 +335,7 @@ data.cpp X dataobj.cpp X dc.cpp X dcclient.cpp X -dcmemory.cpp X +dcmemory.cpp X dcscreen.cpp X dialog.cpp X filedlg.cpp X @@ -364,7 +365,6 @@ stattext.cpp X toolbar.cpp X textctrl.cpp X timer.cpp X -tooltip.cpp X utils.cpp X window.cpp X diff --git a/distrib/msw/tmake/gtk.t b/distrib/msw/tmake/gtk.t deleted file mode 100644 index 5dfb5e2d75..0000000000 --- a/distrib/msw/tmake/gtk.t +++ /dev/null @@ -1,219 +0,0 @@ -#!############################################################################# -#! File: gtk.t -#! Purpose: tmake template file from which Makefile is generated by running -#! tmake -t gtk wxwin.pro -o Makefile -#! 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 and %wxGTK hashes. - IncludeTemplate("filelist.t"); - - #! now transform these hashes into $project tags - foreach $file (sort keys %wxGeneric) { - next if $wxGeneric{$file} =~ /\bR\b/; - - $file =~ s/cp?p?$/\$(OBJSUFF)/; - $project{"WXGENERICOBJS"} .= '$(GENDIR)/' . $file . " " - } - - foreach $file (sort keys %wxCommon) { - next if $wxCommon{$file} =~ /\bR\b/; - - $file =~ s/cp?p?$/\$(OBJSUFF)/; - $project{"WXCOMMONOBJS"} .= '$(COMMDIR)/' . $file . " " - } - - foreach $file (sort keys %wxGTK) { - $file =~ s/cp?p?$/\$(OBJSUFF)/; - $project{"WXGTKOBJS"} .= '$(GTKDIR)/' . $file . " " - } - - foreach $file (sort keys %wxHTML) { - $file =~ s/cp?p?$/\$(OBJSUFF)/; - $project{"WXHTMLOBJS"} .= '$(HTMLDIR)/' . $file . " " - } - - foreach $file (sort keys %wxUNIX) { - $file =~ s/cp?p?$/\$(OBJSUFF)/; - $project{"WXUNIXOBJS"} .= '$(UNIXDIR)/' . $file . " " - } -#$} -# This file was automatically generated by tmake at #$ Now() -# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! - -# -# File: Makefile -# 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 - -WXDIR = ../.. - -include $(WXDIR)/src/gtk.env - -# Subordinate library possibilities - -GENDIR = $(WXDIR)/src/generic -COMMDIR = $(WXDIR)/src/common -HTMLDIR = $(WXDIR)/src/html -UNIXDIR = $(WXDIR)/src/unix -PNGDIR = $(WXDIR)/src/png -JPEGDIR = $(WXDIR)/src/jpeg -ZLIBDIR = $(WXDIR)/src/zlib -GTKDIR = $(WXDIR)/src/gtk - -DOCDIR = $(WXDIR)\docs - -GENERICOBJS = \ - #$ ExpandList("WXGENERICOBJS"); - -COMMONOBJS = \ - $(COMMDIR)/parser.$(OBJSUFF) \ - #$ ExpandList("WXCOMMONOBJS"); - -HTMLOBJS = \ - #$ ExpandList("WXHTMLOBJS"); - -GTKOBJS = \ - #$ ExpandList("WXGTKOBJS"); - -UNIXOBJS = \ - #$ ExpandList("WXUNIXOBJS"); - -ZLIBOBJS = \ - $(ZLIBDIR)/adler32.$(OBJSUFF) \ - $(ZLIBDIR)/compress.$(OBJSUFF) \ - $(ZLIBDIR)/crc32.$(OBJSUFF) \ - $(ZLIBDIR)/gzio.$(OBJSUFF) \ - $(ZLIBDIR)/uncompr.$(OBJSUFF) \ - $(ZLIBDIR)/deflate.$(OBJSUFF) \ - $(ZLIBDIR)/trees.$(OBJSUFF) \ - $(ZLIBDIR)/zutil.$(OBJSUFF) \ - $(ZLIBDIR)/inflate.$(OBJSUFF) \ - $(ZLIBDIR)/infblock.$(OBJSUFF) \ - $(ZLIBDIR)/inftrees.$(OBJSUFF) \ - $(ZLIBDIR)/infcodes.$(OBJSUFF) \ - $(ZLIBDIR)/infutil.$(OBJSUFF) \ - $(ZLIBDIR)/inffast.$(OBJSUFF) - -PNGOBJS = \ - $(PNGDIR)/png.$(OBJSUFF) \ - $(PNGDIR)/pngread.$(OBJSUFF) \ - $(PNGDIR)/pngrtran.$(OBJSUFF) \ - $(PNGDIR)/pngrutil.$(OBJSUFF) \ - $(PNGDIR)/pngpread.$(OBJSUFF) \ - $(PNGDIR)/pngtrans.$(OBJSUFF) \ - $(PNGDIR)/pngwrite.$(OBJSUFF) \ - $(PNGDIR)/pngwtran.$(OBJSUFF) \ - $(PNGDIR)/pngwutil.$(OBJSUFF) \ - $(PNGDIR)/pngerror.$(OBJSUFF) \ - $(PNGDIR)/pngmem.$(OBJSUFF) \ - $(PNGDIR)/pngwio.$(OBJSUFF) \ - $(PNGDIR)/pngrio.$(OBJSUFF) \ - $(PNGDIR)/pngget.$(OBJSUFF) \ - $(PNGDIR)/pngset.$(OBJSUFF) - - -JPEGOBJS = \ - $(JPEGDIR)/jcomapi.$(OBJSUFF) \ - $(JPEGDIR)/jutils.$(OBJSUFF) \ - $(JPEGDIR)/jerror.$(OBJSUFF) \ - $(JPEGDIR)/jmemmgr.$(OBJSUFF) \ - $(JPEGDIR)/jmemnobs.$(OBJSUFF) \ - $(JPEGDIR)/jcapimin.$(OBJSUFF) \ - $(JPEGDIR)/jcapistd.$(OBJSUFF) \ - $(JPEGDIR)/jctrans.$(OBJSUFF) \ - $(JPEGDIR)/jcparam.$(OBJSUFF) \ - $(JPEGDIR)/jdatadst.$(OBJSUFF) \ - $(JPEGDIR)/jcinit.$(OBJSUFF) \ - $(JPEGDIR)/jcmaster.$(OBJSUFF) \ - $(JPEGDIR)/jcmarker.$(OBJSUFF) \ - $(JPEGDIR)/jcmainct.$(OBJSUFF) \ - $(JPEGDIR)/jcprepct.$(OBJSUFF) \ - $(JPEGDIR)/jccoefct.$(OBJSUFF) \ - $(JPEGDIR)/jccolor.$(OBJSUFF) \ - $(JPEGDIR)/jcsample.$(OBJSUFF) \ - $(JPEGDIR)/jchuff.$(OBJSUFF) \ - $(JPEGDIR)/jcphuff.$(OBJSUFF) \ - $(JPEGDIR)/jcdctmgr.$(OBJSUFF) \ - $(JPEGDIR)/jfdctfst.$(OBJSUFF) \ - $(JPEGDIR)/jfdctflt.$(OBJSUFF) \ - $(JPEGDIR)/jfdctint.$(OBJSUFF) \ - $(JPEGDIR)/jdapimin.$(OBJSUFF) \ - $(JPEGDIR)/jdapistd.$(OBJSUFF) \ - $(JPEGDIR)/jdtrans.$(OBJSUFF) \ - $(JPEGDIR)/jdatasrc.$(OBJSUFF) \ - $(JPEGDIR)/jdmaster.$(OBJSUFF) \ - $(JPEGDIR)/jdinput.$(OBJSUFF) \ - $(JPEGDIR)/jdmarker.$(OBJSUFF) \ - $(JPEGDIR)/jdhuff.$(OBJSUFF) \ - $(JPEGDIR)/jdphuff.$(OBJSUFF) \ - $(JPEGDIR)/jdmainct.$(OBJSUFF) \ - $(JPEGDIR)/jdcoefct.$(OBJSUFF) \ - $(JPEGDIR)/jdpostct.$(OBJSUFF) \ - $(JPEGDIR)/jddctmgr.$(OBJSUFF) \ - $(JPEGDIR)/jidctfst.$(OBJSUFF) \ - $(JPEGDIR)/jidctflt.$(OBJSUFF) \ - $(JPEGDIR)/jidctint.$(OBJSUFF) \ - $(JPEGDIR)/jidctred.$(OBJSUFF) \ - $(JPEGDIR)/jdsample.$(OBJSUFF) \ - $(JPEGDIR)/jdcolor.$(OBJSUFF) \ - $(JPEGDIR)/jquant1.$(OBJSUFF) \ - $(JPEGDIR)/jquant2.$(OBJSUFF) \ - $(JPEGDIR)/jdmerge.$(OBJSUFF) - -OBJECTS = $(GTKOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJ) $(UNIXOBJS) \ - $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) - -all: $(OBJECTS) $(WXLIB) - -$(WXLIB): $(OBJECTS) - ar $(AROPTIONS) $@ $(OBJECTS) - $(RANLIB) $@ - -$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h - -$(COMMDIR)/parser.$(OBJSUFF): $(COMMDIR)/parser.c $(COMMDIR)/lexer.c - $(CCLEX) -c $(CFLAGS) -o $@ $(COMMDIR)/parser.c - -$(COMMDIR)/parser.c: $(COMMDIR)/parser.y $(COMMDIR)/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" > $(COMMDIR)/parser.c - @$(RM) y.tab.c - -$(COMMDIR)/lexer.c: $(COMMDIR)/lexer.l - $(LEX) $(COMMDIR)/lexer.l - @sed -e "s;$(COMMDIR)/lex.yy.c;lexer.l;g" < lex.yy.c | \ - sed -e "s/yy/PROIO_yy/g" | \ - sed -e "s/input/PROIO_input/g" | \ - sed -e "s/unput/PROIO_unput/g" > $(COMMDIR)/lexer.c - @$(RM) lex.yy.c - -clean: - rm -f $(GTKDIR)/*.$(OBJSUFF) - rm -f $(COMMDIR)/parser.c - rm -f $(COMMDIR)/lexer.c - rm -f $(COMMDIR)/*.$(OBJSUFF) - rm -f $(GENDIR)/*.$(OBJSUFF) - rm -f $(PNGDIR)/*.$(OBJSUFF) - rm -f $(ZLIBDIR)/*.$(OBJSUFF) - rm -f $(JPEGDIR)/*.$(OBJSUFF) - rm -f $(UNIXDIR)/*.$(OBJSUFF) - rm -f $(HTMLDIR)/*.$(OBJSUFF) - rm -f $(WXWIN)/lib/libwx_$(GUI).a - -cleanall: clean diff --git a/distrib/msw/tmake/makeall.bat b/distrib/msw/tmake/makeall.bat index 6a8e744521..1c048f2086 100755 --- a/distrib/msw/tmake/makeall.bat +++ b/distrib/msw/tmake/makeall.bat @@ -49,8 +49,6 @@ echo Generating for Symantec C++... E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t sc wxwin.pro -o makefile.sc echo Generating for Watcom C++... E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t wat wxwin.pro -o makefile.wat -echo Generating for wxGTK... -E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t gtk wxwin.pro -o Makefile echo Generating for Unix and Configure... E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t unx wxwin.pro -o makefile.unx.in diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t index cf7c28c488..3ea7663c5b 100644 --- a/distrib/msw/tmake/unx.t +++ b/distrib/msw/tmake/unx.t @@ -17,47 +17,49 @@ next if $wxGeneric{$file} =~ /\bR\b/; $file =~ s/cp?p?$/\o/; - $project{"WXGTK_GENERICOBJS"} .= $file . " " + $project{"WXGTK_GENERICOBJS"} .= "../generic/" . $file . " " } #! now transform these hashes into $project tags foreach $file (sort keys %wxGeneric) { + next if $wxCommon{$file} =~ /\bX\b/; $file =~ s/cp?p?$/\o/; - $project{"WXMOTIF_GENERICOBJS"} .= $file . " " + $project{"WXMOTIF_GENERICOBJS"} .= "../generic/" . $file . " " } foreach $file (sort keys %wxCommon) { next if $wxCommon{$file} =~ /\bR\b/; $file =~ s/cp?p?$/\o/; - $project{"WXGTK_COMMONOBJS"} .= $file . " " + $project{"WXGTK_COMMONOBJS"} .= "../common/" . $file . " " } foreach $file (sort keys %wxCommon) { + next if $wxCommon{$file} =~ /\bX\b/; $file =~ s/cp?p?$/\o/; - $project{"WXMOTIF_COMMONOBJS"} .= $file . " " + $project{"WXMOTIF_COMMONOBJS"} .= "../common/" . $file . " " } foreach $file (sort keys %wxGTK) { $file =~ s/cp?p?$/\o/; - $project{"WXGTK_GUIOBJS"} .= $file . " " + $project{"WXGTK_GUIOBJS"} .= "../gtk/" . $file . " " } foreach $file (sort keys %wxMOTIF) { $file =~ s/cp?p?$/\o/; - $project{"WXMOTIF_GUIOBJS"} .= $file . " " + $project{"WXMOTIF_GUIOBJS"} .= "../motif/" . $file . " " } foreach $file (sort keys %wxHTML) { $file =~ s/cp?p?$/\o/; - $project{"WXHTMLOBJS"} .= $file . " " + $project{"WXHTMLOBJS"} .= "../html/" . $file . " " } foreach $file (sort keys %wxUNIX) { $file =~ s/cp?p?$/\o/; - $project{"WXUNIXOBJS"} .= $file . " " + $project{"WXUNIXOBJS"} .= "../unix/" . $file . " " } #$} @@ -87,27 +89,15 @@ # # Makefile for libwx_gtk.a, libwx_motif.a and libwx_msw.a -########################### VERSION ################################# +################################################################### -LIBS = @LIBS@ - -TOOLKIT = @TOOLKIT@ - -WXLIB = @WX_LIBRARY@ - -########################### VERSION ################################# - -WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@ -WX_MINOR_VERSION_NUMBER = @WX_MINOR_VERSION_NUMBER@ -WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@ - -########################### Misc ################################# - -SHELL = @SHELL@ +include ../make.env ########################### Paths ################################# -srcdir = @srcdir@/src/@TOOLKIT_DIR@ +srcdir = @srcdir@ + +VPATH = :$(srcdir) top_srcdir = @top_srcdir@ prefix = @prefix@ @@ -132,7 +122,7 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . +top_builddir = ../.. INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -153,53 +143,7 @@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ -EXTRA_VPATH = @EXTRA_VPATH@ - -VPATH = .:${srcdir}:${srcdir}/../common:${srcdir}/../generic:${srcdir}/../html:${EXTRA_VPATH} - -########################### Programs ################################# - -# C++ compiler -CC = @CXX@ -CCPP = @CXXCPP@ - -# C compiler -CCC = @CC@ -CCCPP = @CPP@ - -# Compiler for lex/yacc .c programs -CCLEX = @CC@ - -LEX = @LEX@ -YACC = @YACC@ -AR = @AR@ -AS = @AS@ -NM = @NM@ -LN_S = @LN_S@ -STRIP = @STRIP@ -MAKE = make -AROPTIONS = ruv -RANLIB = @RANLIB@ -LD = @LD@ -MAKEINFO = @MAKEINFO@ - -########################### Flags ################################# - -CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@ -CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ - -########################### Rules ################################# - -# Clears all default suffixes -.SUFFIXES: .o .cpp .c - -.c.o : - $(CCC) -c $(CFLAGS) -o $@ $< - -.cpp.o : - $(CC) -c $(CPPFLAGS) -o $@ $< - -########################### Files ################################# +############################# Dirs ################################# WXDIR = $(srcdir)/../.. @@ -216,7 +160,9 @@ GTKDIR = $(WXDIR)/src/gtk MOTIFDIR = $(WXDIR)/src/motif INCDIR = $(WXDIR)/include -DOCDIR = $(WXDIR)\docs +DOCDIR = $(WXDIR)/docs + +############################## Files ################################## GTK_GENERICOBJS = \ #$ ExpandList("WXGTK_GENERICOBJS"); @@ -236,6 +182,7 @@ MOTIF_COMMONOBJS = \ #$ ExpandList("WXMOTIF_COMMONOBJS"); MOTIF_GUIOBJS = \ + ../motif/xmcombo/xmcombo.o \ #$ ExpandList("WXMOTIF_GUIOBJS"); HTMLOBJS = \ @@ -245,96 +192,118 @@ UNIXOBJS = \ #$ ExpandList("WXUNIXOBJS"); 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 + ../zlib/adler32.o \ + ../zlib/compress.o \ + ../zlib/crc32.o \ + ../zlib/gzio.o \ + ../zlib/uncompr.o \ + ../zlib/deflate.o \ + ../zlib/trees.o \ + ../zlib/zutil.o \ + ../zlib/inflate.o \ + ../zlib/infblock.o \ + ../zlib/inftrees.o \ + ../zlib/infcodes.o \ + ../zlib/infutil.o \ + ../zlib/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 + ../png/png.o \ + ../png/pngread.o \ + ../png/pngrtran.o \ + ../png/pngrutil.o \ + ../png/pngpread.o \ + ../png/pngtrans.o \ + ../png/pngwrite.o \ + ../png/pngwtran.o \ + ../png/pngwutil.o \ + ../png/pngerror.o \ + ../png/pngmem.o \ + ../png/pngwio.o \ + ../png/pngrio.o \ + ../png/pngget.o \ + ../png/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 + ../jpeg/jcomapi.o \ + ../jpeg/jutils.o \ + ../jpeg/jerror.o \ + ../jpeg/jmemmgr.o \ + ../jpeg/jmemnobs.o \ + ../jpeg/jcapimin.o \ + ../jpeg/jcapistd.o \ + ../jpeg/jctrans.o \ + ../jpeg/jcparam.o \ + ../jpeg/jdatadst.o \ + ../jpeg/jcinit.o \ + ../jpeg/jcmaster.o \ + ../jpeg/jcmarker.o \ + ../jpeg/jcmainct.o \ + ../jpeg/jcprepct.o \ + ../jpeg/jccoefct.o \ + ../jpeg/jccolor.o \ + ../jpeg/jcsample.o \ + ../jpeg/jchuff.o \ + ../jpeg/jcphuff.o \ + ../jpeg/jcdctmgr.o \ + ../jpeg/jfdctfst.o \ + ../jpeg/jfdctflt.o \ + ../jpeg/jfdctint.o \ + ../jpeg/jdapimin.o \ + ../jpeg/jdapistd.o \ + ../jpeg/jdtrans.o \ + ../jpeg/jdatasrc.o \ + ../jpeg/jdmaster.o \ + ../jpeg/jdinput.o \ + ../jpeg/jdmarker.o \ + ../jpeg/jdhuff.o \ + ../jpeg/jdphuff.o \ + ../jpeg/jdmainct.o \ + ../jpeg/jdcoefct.o \ + ../jpeg/jdpostct.o \ + ../jpeg/jddctmgr.o \ + ../jpeg/jidctfst.o \ + ../jpeg/jidctflt.o \ + ../jpeg/jidctint.o \ + ../jpeg/jidctred.o \ + ../jpeg/jdsample.o \ + ../jpeg/jdcolor.o \ + ../jpeg/jquant1.o \ + ../jpeg/jquant2.o \ + ../jpeg/jdmerge.o OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(HTMLOBJS) $(UNIXOBJS) \ $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) -all: $(OBJECTS) $(WXLIB) -$(WXLIB): $(OBJECTS) - $AR) $(AROPTIONS) $@ $(OBJECTS) - $(RANLIB) $@ +REQUIRED_DIRS = ../../lib ../../src ../../src/common ../../src/gtk ../../src/motif \ + ../../src/generic ../../src/unix ../../src/motif/xmombo ../../src/html \ + ../../src/zlib ../../src/jpeg ../../src/png + +all: $(REQUIRED_DIRS) $(OBJECTS) $(WXLIB) + +$(REQUIRED_DIRS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h + @if test ! -d ../../lib; then mkdir ../../lib; fi + @if test ! -d ../../src; then mkdir ../../src; fi + @if test ! -d ../../src/common; then mkdir ../../src/common; fi + @if test ! -d ../../src/gtk; then mkdir ../../src/gtk; fi + @if test ! -d ../../src/motif; then mkdir ../../src/motif; fi + @if test ! -d ../../src/motif/xmcombo; then mkdir ../../src/motif/xmcombo; fi + @if test ! -d ../../src/generic; then mkdir ../../src/generic; fi + @if test ! -d ../../src/unix; then mkdir ../../src/unix; fi + @if test ! -d ../../src/html; then mkdir ../../src/html; fi + @if test ! -d ../../src/png; then mkdir ../../src/png; fi + @if test ! -d ../../src/jpeg; then mkdir ../../src/jpeg; fi + @if test ! -d ../../src/zlib; then mkdir ../../src/zlib; fi + +$(WXLIB): $(OBJECTS) + @if test ! ../../samples/dialog.cpp; \ + then cp -f -r $(WXDIR)/samples ../..; \ + fi + $(AR) $(AROPTIONS) ../../lib/$@ $(OBJECTS) + $(RANLIB) ../../lib/$@ $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h index da9d0382f1..1c01f7f4e9 100644 --- a/include/wx/motif/dialog.h +++ b/include/wx/motif/dialog.h @@ -98,6 +98,9 @@ public: void OnCharHook(wxKeyEvent& event); void OnCloseWindow(wxCloseEvent& event); + // Responds to size changes + void OnSize(wxSizeEvent& event); + public: //// Motif-specific bool m_modalShowing; diff --git a/makefile.unx.in b/makefile.unx.in deleted file mode 100644 index e2eb64e3d8..0000000000 --- a/makefile.unx.in +++ /dev/null @@ -1,644 +0,0 @@ - -# -# I want this to be: -# $(INSTALL_DATA) $(INCDIR)/wx/window.h $(includedir)/wx/window.h -# -# foreach $file (sort keys %wxINCLUDE) { -# next if $wxINCLUDE{$file} =~ /\b(GTK|MSW|MOT|PM|MAC|GEN|HTM|UNX)\b/; -# -# $project{"WXINSTALLWX"} .= "$(INSTALL_DATA)" . " " . "\$(INCDIR)/wx/" . $file . " \$(includedir)/wx/" . $file . "\n" -# } -# -# -# -# This file was automatically generated by tmake at 13:53, 1999/08/10 -# 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 - -########################### VERSION ################################# - -LIBS = @LIBS@ - -TOOLKIT = @TOOLKIT@ - -WXLIB = @WX_LIBRARY@ - -########################### VERSION ################################# - -WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@ -WX_MINOR_VERSION_NUMBER = @WX_MINOR_VERSION_NUMBER@ -WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@ - -########################### Misc ################################# - -SHELL = @SHELL@ - -########################### Paths ################################# - -srcdir = @srcdir@/src/@TOOLKIT_DIR@ - -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@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -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@ - -EXTRA_VPATH = @EXTRA_VPATH@ - -VPATH = .:${srcdir}:${srcdir}/../common:${srcdir}/../generic:${srcdir}/../html:${EXTRA_VPATH} - -########################### Programs ################################# - -# C++ compiler -CC = @CXX@ -CCPP = @CXXCPP@ - -# C compiler -CCC = @CC@ -CCCPP = @CPP@ - -# Compiler for lex/yacc .c programs -CCLEX = @CC@ - -LEX = @LEX@ -YACC = @YACC@ -AR = @AR@ -AS = @AS@ -NM = @NM@ -LN_S = @LN_S@ -STRIP = @STRIP@ -MAKE = make -AROPTIONS = ruv -RANLIB = @RANLIB@ -LD = @LD@ -MAKEINFO = @MAKEINFO@ - -########################### Flags ################################# - -CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@ -CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ - -########################### Rules ################################# - -# Clears all default suffixes -.SUFFIXES: .o .cpp .c - -.c.o : - $(CCC) -c $(CFLAGS) -o $@ $< - -.cpp.o : - $(CC) -c $(CPPFLAGS) -o $@ $< - -########################### Files ################################# - -WXDIR = $(srcdir)/../.. - -# Subordinate library possibilities - -GENDIR = $(WXDIR)/src/generic -COMMDIR = $(WXDIR)/src/common -HTMLDIR = $(WXDIR)/src/html -UNIXDIR = $(WXDIR)/src/unix -PNGDIR = $(WXDIR)/src/png -JPEGDIR = $(WXDIR)/src/jpeg -ZLIBDIR = $(WXDIR)/src/zlib -GTKDIR = $(WXDIR)/src/gtk -MOTIFDIR = $(WXDIR)/src/motif -INCDIR = $(WXDIR)/include - -DOCDIR = $(WXDIR)\docs - -GTK_GENERICOBJS = \ - busyinfo.o \ - caret.o \ - colrdlgg.o \ - dirdlgg.o \ - extdlgg.o \ - fontdlgg.o \ - gridg.o \ - imaglist.o \ - laywin.o \ - listctrl.o \ - numdlgg.o \ - panelg.o \ - printps.o \ - prntdlgg.o \ - progdlgg.o \ - prop.o \ - propform.o \ - proplist.o \ - sashwin.o \ - scrolwin.o \ - splitter.o \ - statusbr.o \ - tipdlg.o \ - treectrl.o - -GTK_COMMONOBJS = \ - parser.o \ - cmndata.o \ - config.o \ - date.o \ - datstrm.o \ - db.o \ - dbtable.o \ - dcbase.o \ - dlgcmn.o \ - docmdi.o \ - docview.o \ - dynarray.o \ - dynlib.o \ - event.o \ - extended.o \ - ffile.o \ - file.o \ - fileconf.o \ - filefn.o \ - filesys.o \ - framecmn.o \ - fs_inet.o \ - fs_zip.o \ - ftp.o \ - gdicmn.o \ - hash.o \ - helpbase.o \ - http.o \ - imagbmp.o \ - image.o \ - imaggif.o \ - imagjpeg.o \ - imagpng.o \ - intl.o \ - ipcbase.o \ - layout.o \ - list.o \ - log.o \ - memory.o \ - mimetype.o \ - module.o \ - mstream.o \ - object.o \ - objstrm.o \ - paper.o \ - prntbase.o \ - process.o \ - protocol.o \ - resource.o \ - sckaddr.o \ - sckfile.o \ - sckipc.o \ - sckstrm.o \ - socket.o \ - strconv.o \ - stream.o \ - string.o \ - tbarbase.o \ - tbarsmpl.o \ - textcmn.o \ - textfile.o \ - time.o \ - timercmn.o \ - tokenzr.o \ - txtstrm.o \ - unzip.o \ - url.o \ - utilscmn.o \ - valgen.o \ - validate.o \ - valtext.o \ - variant.o \ - wfstream.o \ - wincmn.o \ - wxchar.o \ - wxexpr.o \ - zipstrm.o \ - zstream.o - -GTK_GUIOBJS = \ - accel.o \ - app.o \ - bitmap.o \ - bmpbuttn.o \ - brush.o \ - button.o \ - checkbox.o \ - checklst.o \ - choicdlg.o \ - choice.o \ - clipbrd.o \ - colour.o \ - combobox.o \ - control.o \ - cursor.o \ - data.o \ - dataobj.o \ - dc.o \ - dcclient.o \ - dcmemory.cpp \ - dcscreen.o \ - dialog.o \ - dnd.o \ - filedlg.o \ - font.o \ - frame.o \ - gauge.o \ - gdiobj.o \ - gsockgtk.o \ - icon.o \ - listbox.o \ - main.o \ - mdi.o \ - menu.o \ - minifram.o \ - msgdlg.o \ - notebook.o \ - palette.o \ - pen.o \ - radiobox.o \ - radiobut.o \ - region.o \ - scrolbar.o \ - settings.o \ - slider.o \ - spinbutt.o \ - statbmp.o \ - statbox.o \ - statline.o \ - stattext.o \ - tbargtk.o \ - textctrl.o \ - textdlg.o \ - timer.o \ - tooltip.o \ - utilsgtk.o \ - utilsres.o \ - wave.o \ - win_gtk.o \ - window.o - -MOTIF_GENERICOBJS = \ - busyinfo.o \ - caret.o \ - choicdgg.o \ - colrdlgg.o \ - dirdlgg.o \ - extdlgg.o \ - fontdlgg.o \ - gridg.o \ - helpxlp.o \ - imaglist.o \ - laywin.o \ - listctrl.o \ - msgdlgg.o \ - notebook.o \ - numdlgg.o \ - panelg.o \ - printps.o \ - prntdlgg.o \ - progdlgg.o \ - prop.o \ - propform.o \ - proplist.o \ - sashwin.o \ - scrolwin.o \ - splitter.o \ - statusbr.o \ - tabg.o \ - textdlgg.o \ - tipdlg.o \ - treectrl.o - -MOTIF_COMMONOBJS = \ - parser.o \ - choiccmn.o \ - cmndata.o \ - config.o \ - ctrlcmn.o \ - date.o \ - datstrm.o \ - db.o \ - dbtable.o \ - dcbase.o \ - dlgcmn.o \ - docmdi.o \ - docview.o \ - dynarray.o \ - dynlib.o \ - event.o \ - extended.o \ - ffile.o \ - file.o \ - fileconf.o \ - filefn.o \ - filesys.o \ - framecmn.o \ - fs_inet.o \ - fs_zip.o \ - ftp.o \ - gdicmn.o \ - hash.o \ - helpbase.o \ - http.o \ - imagbmp.o \ - image.o \ - imaggif.o \ - imagjpeg.o \ - imagpng.o \ - intl.o \ - ipcbase.o \ - layout.o \ - list.o \ - log.o \ - memory.o \ - mimetype.o \ - module.o \ - mstream.o \ - object.o \ - objstrm.o \ - odbc.o \ - paper.o \ - prntbase.o \ - process.o \ - protocol.o \ - resource.o \ - sckaddr.o \ - sckfile.o \ - sckipc.o \ - sckstrm.o \ - socket.o \ - strconv.o \ - stream.o \ - string.o \ - tbarbase.o \ - tbarsmpl.o \ - textcmn.o \ - textfile.o \ - time.o \ - timercmn.o \ - tokenzr.o \ - txtstrm.o \ - unzip.o \ - url.o \ - utilscmn.o \ - valgen.o \ - validate.o \ - valtext.o \ - variant.o \ - wfstream.o \ - wincmn.o \ - wxchar.o \ - wxexpr.o \ - zipstrm.o \ - zstream.o - -MOTIF_GUIOBJS = \ - accel.o \ - app.o \ - bitmap.o \ - bmpbuttn.o \ - brush.o \ - button.o \ - checkbox.o \ - choice.o \ - clipbrd.o \ - colour.o \ - combobox.o \ - control.o \ - cursor.o \ - data.o \ - dataobj.o \ - dc.o \ - dcclient.o \ - dcmemory.cpp \ - dcscreen.o \ - dialog.o \ - filedlg.o \ - font.o \ - frame.o \ - gauge.o \ - gdiobj.o \ - gsockmot.o \ - icon.o \ - listbox.o \ - main.o \ - mdi.o \ - menu.o \ - menuitem.o \ - minifram.o \ - msgdlg.o \ - palette.o \ - pen.o \ - radiobox.o \ - radiobut.o \ - region.o \ - scrolbar.o \ - settings.o \ - slider.o \ - statbmp.o \ - statbox.o \ - stattext.o \ - textctrl.o \ - timer.o \ - toolbar.o \ - tooltip.o \ - utils.o \ - window.o - -HTMLOBJS = \ - htmlcell.o \ - htmlfilter.o \ - htmlhelp.o \ - htmlhelp_io.o \ - htmlparser.o \ - htmltag.o \ - htmlwin.o \ - htmlwinparser.o \ - mod_fonts.o \ - mod_hline.o \ - mod_image.o \ - mod_layout.o \ - mod_links.o \ - mod_list.o \ - mod_pre.o \ - mod_tables.o \ - search.o - -UNIXOBJS = \ - gsocket.o \ - threadpsx.o \ - utilsunx.o - -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 - - -OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(HTMLOBJS) $(UNIXOBJS) \ - $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) - -all: $(OBJECTS) $(WXLIB) - -$(WXLIB): $(OBJECTS) - $AR) $(AROPTIONS) $@ $(OBJECTS) - $(RANLIB) $@ - -$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h - -parser.o: parser.c lexer.c - $(CCLEX) -c $(CFLAGS) -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.yy.c;lexer.l;g" < lex.yy.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.yy.c - -install: $(WXLIB) - -clean: - rm -f *.o - rm -f *.lo - rm -f parser.c - rm -f lexer.c - rm -f *.a - rm -f *.la - -cleanall: clean diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp index 6b17ca942a..a11b234489 100644 --- a/src/generic/numdlgg.cpp +++ b/src/generic/numdlgg.cpp @@ -129,7 +129,7 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent, const wxPoint& pos) : wxDialog(parent, -1, caption, pos, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL) + wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL ) { m_value = value; m_max = max; diff --git a/src/gtk.env b/src/gtk.env deleted file mode 100644 index 18090c1721..0000000000 --- a/src/gtk.env +++ /dev/null @@ -1,107 +0,0 @@ -# gtk.env -# -# Common makefile settings for wxGTK programs. You have to set -# the WXDIR variable before including this file. -# -# This file is included by all the other makefiles, thus changes -# made here take effect everywhere (except where overriden). -# -# RCS-ID: $Id$ -# - -########################### General ################################# - -# The name of the GUI used in directory paths and library names -GUI = gtk - -# The library version number -MAX_VER = 2 -MIN_VER = 1 -MIC_VER = 0 - -WXLIB = - -########################### Programs ################################# - -# C++ compiler -CC = gcc - -# C compiler -CCC = gcc - -# Compiler for lex/yacc .c programs -CCLEX = $(CCC) - -LEX = lex -YACC = yacc -# Note: if using bison, use -y option for yacc compatibility -# YACC = bison -y -MAKE = make -AROPTIONS = ruv -RANLIB = ranlib - -############################ Switches ################################# - -# Debug/trace mode. 1 or more for debugging. -DEBUG = 1 -GUI_OPT = -D__WXGTK__ -D__UNIX__ - -########################## Compiler flags ############################# - -# Misc options -CPP_EXTRA = -D_REENTRANT -C_EXTRA = -D_REENTRANT -LEX_EXTRA = -D_REENTRANT - -# Optimisation -CPP_OPT = -O2 -fno-strength-reduce -DGTK_NO_CHECK_CASTS -fno-rtti -fno-exceptions -C_OPT = -O2 -fno-strength-reduce -DGTK_NO_CHECK_CASTS -LEX_OPT = -O2 -fno-strength-reduce - -# Debug -CPP_DEBUG = -D__WXDEBUG__ # -g -C_DEBUG = -D__WXDEBUG__ -LEX_DEBUG = -D__WXDEBUG__ - -# Warning level -CPP_WARN = -Wall -C_WARN = -Wall -Wno-unused -LEX_WARN = -Wall - -# Link flag -LD_EXTRA = - -############################ Includes ################################# - -WX_INC = -I$(WXDIR)/include -GUI_INC = `gtk-config --cflags` -EXTRA_INC = -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/odbc - -############################ Libraries ################################ - -WXLIB = $(WXDIR)/lib/libwx_$(GUI).a - -LD_LIBS = $(WXLIB) `gtk-config --libs` -L/usr/lib -ldl -lpthread - -############################# Suffixes ################################ - -OBJSUFF = o - -####################### No changes below this line #################### - -CPPFLAGS = $(GUI_OPT) $(CPP_EXTRA) $(CPP_OPT) $(CPP_DEBUG) $(CPP_WARN) $(WX_INC) $(EXTRA_INC) $(GUI_INC) -CFLAGS = $(GUI_OPT) $(C_EXTRA) $(C_OPT) $(C_DEBUG) $(C_WARN) $(WX_INC) $(EXTRA_INC) $(GUI_INC) -LDFLAGS = $(LD_EXTRA) $(LD_LIBS) - -# Clears all default suffixes -.SUFFIXES: .o .cpp .c - -.c.o : - $(CCC) -c $(CFLAGS) -o $@ $< - -.cpp.o : - $(CC) -c $(CPPFLAGS) -o $@ $< - -.C.o : - $(CC) -c $(CPPFLAGS) -o $@ $< - diff --git a/src/gtk/Makefile b/src/gtk/Makefile deleted file mode 100644 index d7db9d0e21..0000000000 --- a/src/gtk/Makefile +++ /dev/null @@ -1,352 +0,0 @@ - -# This file was automatically generated by tmake at 23:37, 1999/08/08 -# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! - -# -# File: Makefile -# 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 - -WXDIR = ../.. - -include $(WXDIR)/src/gtk.env - -# Subordinate library possibilities - -GENDIR = $(WXDIR)/src/generic -COMMDIR = $(WXDIR)/src/common -HTMLDIR = $(WXDIR)/src/html -UNIXDIR = $(WXDIR)/src/unix -PNGDIR = $(WXDIR)/src/png -JPEGDIR = $(WXDIR)/src/jpeg -ZLIBDIR = $(WXDIR)/src/zlib -GTKDIR = $(WXDIR)/src/gtk - -DOCDIR = $(WXDIR)\docs - -GENERICOBJS = \ - $(GENDIR)/busyinfo.$(OBJSUFF) \ - $(GENDIR)/caret.$(OBJSUFF) \ - $(GENDIR)/colrdlgg.$(OBJSUFF) \ - $(GENDIR)/dirdlgg.$(OBJSUFF) \ - $(GENDIR)/extdlgg.$(OBJSUFF) \ - $(GENDIR)/fontdlgg.$(OBJSUFF) \ - $(GENDIR)/gridg.$(OBJSUFF) \ - $(GENDIR)/imaglist.$(OBJSUFF) \ - $(GENDIR)/laywin.$(OBJSUFF) \ - $(GENDIR)/listctrl.$(OBJSUFF) \ - $(GENDIR)/numdlgg.$(OBJSUFF) \ - $(GENDIR)/panelg.$(OBJSUFF) \ - $(GENDIR)/printps.$(OBJSUFF) \ - $(GENDIR)/prntdlgg.$(OBJSUFF) \ - $(GENDIR)/progdlgg.$(OBJSUFF) \ - $(GENDIR)/prop.$(OBJSUFF) \ - $(GENDIR)/propform.$(OBJSUFF) \ - $(GENDIR)/proplist.$(OBJSUFF) \ - $(GENDIR)/sashwin.$(OBJSUFF) \ - $(GENDIR)/scrolwin.$(OBJSUFF) \ - $(GENDIR)/splitter.$(OBJSUFF) \ - $(GENDIR)/statusbr.$(OBJSUFF) \ - $(GENDIR)/tipdlg.$(OBJSUFF) \ - $(GENDIR)/treectrl.$(OBJSUFF) - -COMMONOBJS = \ - $(COMMDIR)/parser.$(OBJSUFF) \ - $(COMMDIR)/cmndata.$(OBJSUFF) \ - $(COMMDIR)/config.$(OBJSUFF) \ - $(COMMDIR)/date.$(OBJSUFF) \ - $(COMMDIR)/datstrm.$(OBJSUFF) \ - $(COMMDIR)/db.$(OBJSUFF) \ - $(COMMDIR)/dbtable.$(OBJSUFF) \ - $(COMMDIR)/dcbase.$(OBJSUFF) \ - $(COMMDIR)/dlgcmn.$(OBJSUFF) \ - $(COMMDIR)/docmdi.$(OBJSUFF) \ - $(COMMDIR)/docview.$(OBJSUFF) \ - $(COMMDIR)/dynarray.$(OBJSUFF) \ - $(COMMDIR)/dynlib.$(OBJSUFF) \ - $(COMMDIR)/event.$(OBJSUFF) \ - $(COMMDIR)/extended.$(OBJSUFF) \ - $(COMMDIR)/ffile.$(OBJSUFF) \ - $(COMMDIR)/file.$(OBJSUFF) \ - $(COMMDIR)/fileconf.$(OBJSUFF) \ - $(COMMDIR)/filefn.$(OBJSUFF) \ - $(COMMDIR)/filesys.$(OBJSUFF) \ - $(COMMDIR)/framecmn.$(OBJSUFF) \ - $(COMMDIR)/fs_inet.$(OBJSUFF) \ - $(COMMDIR)/fs_zip.$(OBJSUFF) \ - $(COMMDIR)/ftp.$(OBJSUFF) \ - $(COMMDIR)/gdicmn.$(OBJSUFF) \ - $(COMMDIR)/hash.$(OBJSUFF) \ - $(COMMDIR)/helpbase.$(OBJSUFF) \ - $(COMMDIR)/http.$(OBJSUFF) \ - $(COMMDIR)/imagbmp.$(OBJSUFF) \ - $(COMMDIR)/image.$(OBJSUFF) \ - $(COMMDIR)/imaggif.$(OBJSUFF) \ - $(COMMDIR)/imagjpeg.$(OBJSUFF) \ - $(COMMDIR)/imagpng.$(OBJSUFF) \ - $(COMMDIR)/intl.$(OBJSUFF) \ - $(COMMDIR)/ipcbase.$(OBJSUFF) \ - $(COMMDIR)/layout.$(OBJSUFF) \ - $(COMMDIR)/list.$(OBJSUFF) \ - $(COMMDIR)/log.$(OBJSUFF) \ - $(COMMDIR)/memory.$(OBJSUFF) \ - $(COMMDIR)/mimetype.$(OBJSUFF) \ - $(COMMDIR)/module.$(OBJSUFF) \ - $(COMMDIR)/mstream.$(OBJSUFF) \ - $(COMMDIR)/object.$(OBJSUFF) \ - $(COMMDIR)/objstrm.$(OBJSUFF) \ - $(COMMDIR)/paper.$(OBJSUFF) \ - $(COMMDIR)/prntbase.$(OBJSUFF) \ - $(COMMDIR)/process.$(OBJSUFF) \ - $(COMMDIR)/protocol.$(OBJSUFF) \ - $(COMMDIR)/resource.$(OBJSUFF) \ - $(COMMDIR)/sckaddr.$(OBJSUFF) \ - $(COMMDIR)/sckfile.$(OBJSUFF) \ - $(COMMDIR)/sckipc.$(OBJSUFF) \ - $(COMMDIR)/sckstrm.$(OBJSUFF) \ - $(COMMDIR)/socket.$(OBJSUFF) \ - $(COMMDIR)/strconv.$(OBJSUFF) \ - $(COMMDIR)/stream.$(OBJSUFF) \ - $(COMMDIR)/string.$(OBJSUFF) \ - $(COMMDIR)/tbarbase.$(OBJSUFF) \ - $(COMMDIR)/tbarsmpl.$(OBJSUFF) \ - $(COMMDIR)/textcmn.$(OBJSUFF) \ - $(COMMDIR)/textfile.$(OBJSUFF) \ - $(COMMDIR)/time.$(OBJSUFF) \ - $(COMMDIR)/timercmn.$(OBJSUFF) \ - $(COMMDIR)/tokenzr.$(OBJSUFF) \ - $(COMMDIR)/txtstrm.$(OBJSUFF) \ - $(COMMDIR)/unzip.$(OBJSUFF) \ - $(COMMDIR)/url.$(OBJSUFF) \ - $(COMMDIR)/utilscmn.$(OBJSUFF) \ - $(COMMDIR)/valgen.$(OBJSUFF) \ - $(COMMDIR)/validate.$(OBJSUFF) \ - $(COMMDIR)/valtext.$(OBJSUFF) \ - $(COMMDIR)/variant.$(OBJSUFF) \ - $(COMMDIR)/wfstream.$(OBJSUFF) \ - $(COMMDIR)/wincmn.$(OBJSUFF) \ - $(COMMDIR)/wxchar.$(OBJSUFF) \ - $(COMMDIR)/wxexpr.$(OBJSUFF) \ - $(COMMDIR)/zipstrm.$(OBJSUFF) \ - $(COMMDIR)/zstream.$(OBJSUFF) - -HTMLOBJS = \ - $(HTMLDIR)/htmlcell.$(OBJSUFF) \ - $(HTMLDIR)/htmlfilter.$(OBJSUFF) \ - $(HTMLDIR)/htmlhelp.$(OBJSUFF) \ - $(HTMLDIR)/htmlhelp_io.$(OBJSUFF) \ - $(HTMLDIR)/htmlparser.$(OBJSUFF) \ - $(HTMLDIR)/htmltag.$(OBJSUFF) \ - $(HTMLDIR)/htmlwin.$(OBJSUFF) \ - $(HTMLDIR)/htmlwinparser.$(OBJSUFF) \ - $(HTMLDIR)/mod_fonts.$(OBJSUFF) \ - $(HTMLDIR)/mod_hline.$(OBJSUFF) \ - $(HTMLDIR)/mod_image.$(OBJSUFF) \ - $(HTMLDIR)/mod_layout.$(OBJSUFF) \ - $(HTMLDIR)/mod_links.$(OBJSUFF) \ - $(HTMLDIR)/mod_list.$(OBJSUFF) \ - $(HTMLDIR)/mod_pre.$(OBJSUFF) \ - $(HTMLDIR)/mod_tables.$(OBJSUFF) \ - $(HTMLDIR)/search.$(OBJSUFF) - -GTKOBJS = \ - $(GTKDIR)/accel.$(OBJSUFF) \ - $(GTKDIR)/app.$(OBJSUFF) \ - $(GTKDIR)/bitmap.$(OBJSUFF) \ - $(GTKDIR)/bmpbuttn.$(OBJSUFF) \ - $(GTKDIR)/brush.$(OBJSUFF) \ - $(GTKDIR)/button.$(OBJSUFF) \ - $(GTKDIR)/checkbox.$(OBJSUFF) \ - $(GTKDIR)/checklst.$(OBJSUFF) \ - $(GTKDIR)/choicdlg.$(OBJSUFF) \ - $(GTKDIR)/choice.$(OBJSUFF) \ - $(GTKDIR)/clipbrd.$(OBJSUFF) \ - $(GTKDIR)/colour.$(OBJSUFF) \ - $(GTKDIR)/combobox.$(OBJSUFF) \ - $(GTKDIR)/control.$(OBJSUFF) \ - $(GTKDIR)/cursor.$(OBJSUFF) \ - $(GTKDIR)/data.$(OBJSUFF) \ - $(GTKDIR)/dataobj.$(OBJSUFF) \ - $(GTKDIR)/dc.$(OBJSUFF) \ - $(GTKDIR)/dcclient.$(OBJSUFF) \ - $(GTKDIR)/dcmemory.cpp \ - $(GTKDIR)/dcscreen.$(OBJSUFF) \ - $(GTKDIR)/dialog.$(OBJSUFF) \ - $(GTKDIR)/dnd.$(OBJSUFF) \ - $(GTKDIR)/filedlg.$(OBJSUFF) \ - $(GTKDIR)/font.$(OBJSUFF) \ - $(GTKDIR)/frame.$(OBJSUFF) \ - $(GTKDIR)/gauge.$(OBJSUFF) \ - $(GTKDIR)/gdiobj.$(OBJSUFF) \ - $(GTKDIR)/gsockgtk.$(OBJSUFF) \ - $(GTKDIR)/icon.$(OBJSUFF) \ - $(GTKDIR)/listbox.$(OBJSUFF) \ - $(GTKDIR)/main.$(OBJSUFF) \ - $(GTKDIR)/mdi.$(OBJSUFF) \ - $(GTKDIR)/menu.$(OBJSUFF) \ - $(GTKDIR)/minifram.$(OBJSUFF) \ - $(GTKDIR)/msgdlg.$(OBJSUFF) \ - $(GTKDIR)/notebook.$(OBJSUFF) \ - $(GTKDIR)/palette.$(OBJSUFF) \ - $(GTKDIR)/pen.$(OBJSUFF) \ - $(GTKDIR)/radiobox.$(OBJSUFF) \ - $(GTKDIR)/radiobut.$(OBJSUFF) \ - $(GTKDIR)/region.$(OBJSUFF) \ - $(GTKDIR)/scrolbar.$(OBJSUFF) \ - $(GTKDIR)/settings.$(OBJSUFF) \ - $(GTKDIR)/slider.$(OBJSUFF) \ - $(GTKDIR)/spinbutt.$(OBJSUFF) \ - $(GTKDIR)/statbmp.$(OBJSUFF) \ - $(GTKDIR)/statbox.$(OBJSUFF) \ - $(GTKDIR)/statline.$(OBJSUFF) \ - $(GTKDIR)/stattext.$(OBJSUFF) \ - $(GTKDIR)/tbargtk.$(OBJSUFF) \ - $(GTKDIR)/textctrl.$(OBJSUFF) \ - $(GTKDIR)/textdlg.$(OBJSUFF) \ - $(GTKDIR)/timer.$(OBJSUFF) \ - $(GTKDIR)/tooltip.$(OBJSUFF) \ - $(GTKDIR)/utilsgtk.$(OBJSUFF) \ - $(GTKDIR)/utilsres.$(OBJSUFF) \ - $(GTKDIR)/wave.$(OBJSUFF) \ - $(GTKDIR)/win_gtk.$(OBJSUFF) \ - $(GTKDIR)/window.$(OBJSUFF) - -UNIXOBJS = \ - $(UNIXDIR)/gsocket.$(OBJSUFF) \ - $(UNIXDIR)/threadpsx.$(OBJSUFF) \ - $(UNIXDIR)/utilsunx.$(OBJSUFF) - -ZLIBOBJS = \ - $(ZLIBDIR)/adler32.$(OBJSUFF) \ - $(ZLIBDIR)/compress.$(OBJSUFF) \ - $(ZLIBDIR)/crc32.$(OBJSUFF) \ - $(ZLIBDIR)/gzio.$(OBJSUFF) \ - $(ZLIBDIR)/uncompr.$(OBJSUFF) \ - $(ZLIBDIR)/deflate.$(OBJSUFF) \ - $(ZLIBDIR)/trees.$(OBJSUFF) \ - $(ZLIBDIR)/zutil.$(OBJSUFF) \ - $(ZLIBDIR)/inflate.$(OBJSUFF) \ - $(ZLIBDIR)/infblock.$(OBJSUFF) \ - $(ZLIBDIR)/inftrees.$(OBJSUFF) \ - $(ZLIBDIR)/infcodes.$(OBJSUFF) \ - $(ZLIBDIR)/infutil.$(OBJSUFF) \ - $(ZLIBDIR)/inffast.$(OBJSUFF) - -PNGOBJS = \ - $(PNGDIR)/png.$(OBJSUFF) \ - $(PNGDIR)/pngread.$(OBJSUFF) \ - $(PNGDIR)/pngrtran.$(OBJSUFF) \ - $(PNGDIR)/pngrutil.$(OBJSUFF) \ - $(PNGDIR)/pngpread.$(OBJSUFF) \ - $(PNGDIR)/pngtrans.$(OBJSUFF) \ - $(PNGDIR)/pngwrite.$(OBJSUFF) \ - $(PNGDIR)/pngwtran.$(OBJSUFF) \ - $(PNGDIR)/pngwutil.$(OBJSUFF) \ - $(PNGDIR)/pngerror.$(OBJSUFF) \ - $(PNGDIR)/pngmem.$(OBJSUFF) \ - $(PNGDIR)/pngwio.$(OBJSUFF) \ - $(PNGDIR)/pngrio.$(OBJSUFF) \ - $(PNGDIR)/pngget.$(OBJSUFF) \ - $(PNGDIR)/pngset.$(OBJSUFF) - - -JPEGOBJS = \ - $(JPEGDIR)/jcomapi.$(OBJSUFF) \ - $(JPEGDIR)/jutils.$(OBJSUFF) \ - $(JPEGDIR)/jerror.$(OBJSUFF) \ - $(JPEGDIR)/jmemmgr.$(OBJSUFF) \ - $(JPEGDIR)/jmemnobs.$(OBJSUFF) \ - $(JPEGDIR)/jcapimin.$(OBJSUFF) \ - $(JPEGDIR)/jcapistd.$(OBJSUFF) \ - $(JPEGDIR)/jctrans.$(OBJSUFF) \ - $(JPEGDIR)/jcparam.$(OBJSUFF) \ - $(JPEGDIR)/jdatadst.$(OBJSUFF) \ - $(JPEGDIR)/jcinit.$(OBJSUFF) \ - $(JPEGDIR)/jcmaster.$(OBJSUFF) \ - $(JPEGDIR)/jcmarker.$(OBJSUFF) \ - $(JPEGDIR)/jcmainct.$(OBJSUFF) \ - $(JPEGDIR)/jcprepct.$(OBJSUFF) \ - $(JPEGDIR)/jccoefct.$(OBJSUFF) \ - $(JPEGDIR)/jccolor.$(OBJSUFF) \ - $(JPEGDIR)/jcsample.$(OBJSUFF) \ - $(JPEGDIR)/jchuff.$(OBJSUFF) \ - $(JPEGDIR)/jcphuff.$(OBJSUFF) \ - $(JPEGDIR)/jcdctmgr.$(OBJSUFF) \ - $(JPEGDIR)/jfdctfst.$(OBJSUFF) \ - $(JPEGDIR)/jfdctflt.$(OBJSUFF) \ - $(JPEGDIR)/jfdctint.$(OBJSUFF) \ - $(JPEGDIR)/jdapimin.$(OBJSUFF) \ - $(JPEGDIR)/jdapistd.$(OBJSUFF) \ - $(JPEGDIR)/jdtrans.$(OBJSUFF) \ - $(JPEGDIR)/jdatasrc.$(OBJSUFF) \ - $(JPEGDIR)/jdmaster.$(OBJSUFF) \ - $(JPEGDIR)/jdinput.$(OBJSUFF) \ - $(JPEGDIR)/jdmarker.$(OBJSUFF) \ - $(JPEGDIR)/jdhuff.$(OBJSUFF) \ - $(JPEGDIR)/jdphuff.$(OBJSUFF) \ - $(JPEGDIR)/jdmainct.$(OBJSUFF) \ - $(JPEGDIR)/jdcoefct.$(OBJSUFF) \ - $(JPEGDIR)/jdpostct.$(OBJSUFF) \ - $(JPEGDIR)/jddctmgr.$(OBJSUFF) \ - $(JPEGDIR)/jidctfst.$(OBJSUFF) \ - $(JPEGDIR)/jidctflt.$(OBJSUFF) \ - $(JPEGDIR)/jidctint.$(OBJSUFF) \ - $(JPEGDIR)/jidctred.$(OBJSUFF) \ - $(JPEGDIR)/jdsample.$(OBJSUFF) \ - $(JPEGDIR)/jdcolor.$(OBJSUFF) \ - $(JPEGDIR)/jquant1.$(OBJSUFF) \ - $(JPEGDIR)/jquant2.$(OBJSUFF) \ - $(JPEGDIR)/jdmerge.$(OBJSUFF) - -OBJECTS = $(GTKOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJ) $(UNIXOBJS) \ - $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) - -all: $(OBJECTS) $(WXLIB) - -$(WXLIB): $(OBJECTS) - ar $(AROPTIONS) $@ $(OBJECTS) - $(RANLIB) $@ - -$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h - -$(COMMDIR)/parser.$(OBJSUFF): $(COMMDIR)/parser.c $(COMMDIR)/lexer.c - $(CCLEX) -c $(CFLAGS) -o $@ $(COMMDIR)/parser.c - -$(COMMDIR)/parser.c: $(COMMDIR)/parser.y $(COMMDIR)/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" > $(COMMDIR)/parser.c - @$(RM) y.tab.c - -$(COMMDIR)/lexer.c: $(COMMDIR)/lexer.l - $(LEX) $(COMMDIR)/lexer.l - @sed -e "s;$(COMMDIR)/lex.yy.c;lexer.l;g" < lex.yy.c | \ - sed -e "s/yy/PROIO_yy/g" | \ - sed -e "s/input/PROIO_input/g" | \ - sed -e "s/unput/PROIO_unput/g" > $(COMMDIR)/lexer.c - @$(RM) lex.yy.c - -clean: - rm -f $(GTKDIR)/*.$(OBJSUFF) - rm -f $(COMMDIR)/parser.c - rm -f $(COMMDIR)/lexer.c - rm -f $(COMMDIR)/*.$(OBJSUFF) - rm -f $(GENDIR)/*.$(OBJSUFF) - rm -f $(PNGDIR)/*.$(OBJSUFF) - rm -f $(ZLIBDIR)/*.$(OBJSUFF) - rm -f $(JPEGDIR)/*.$(OBJSUFF) - rm -f $(UNIXDIR)/*.$(OBJSUFF) - rm -f $(HTMLDIR)/*.$(OBJSUFF) - rm -f $(WXWIN)/lib/libwx_$(GUI).a - -cleanall: clean diff --git a/src/gtk/makefile.unx.in b/src/gtk/makefile.unx.in new file mode 100644 index 0000000000..2089c71ef0 --- /dev/null +++ b/src/gtk/makefile.unx.in @@ -0,0 +1,612 @@ + +# +# I want this to be: +# $(INSTALL_DATA) $(INCDIR)/wx/window.h $(includedir)/wx/window.h +# +# foreach $file (sort keys %wxINCLUDE) { +# next if $wxINCLUDE{$file} =~ /\b(GTK|MSW|MOT|PM|MAC|GEN|HTM|UNX)\b/; +# +# $project{"WXINSTALLWX"} .= "$(INSTALL_DATA)" . " " . "\$(INCDIR)/wx/" . $file . " \$(includedir)/wx/" . $file . "\n" +# } +# +# +# +# This file was automatically generated by tmake at 19:48, 1999/08/10 +# 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 ../make.env + +########################### Paths ################################# + +srcdir = @srcdir@ + +VPATH = :$(srcdir) + +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@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +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@ + +############################# Dirs ################################# + +WXDIR = $(srcdir)/../.. + +# Subordinate library possibilities + +GENDIR = $(WXDIR)/src/generic +COMMDIR = $(WXDIR)/src/common +HTMLDIR = $(WXDIR)/src/html +UNIXDIR = $(WXDIR)/src/unix +PNGDIR = $(WXDIR)/src/png +JPEGDIR = $(WXDIR)/src/jpeg +ZLIBDIR = $(WXDIR)/src/zlib +GTKDIR = $(WXDIR)/src/gtk +MOTIFDIR = $(WXDIR)/src/motif +INCDIR = $(WXDIR)/include + +DOCDIR = $(WXDIR)/docs + +############################## Files ################################## + +GTK_GENERICOBJS = \ + ../generic/busyinfo.o \ + ../generic/caret.o \ + ../generic/colrdlgg.o \ + ../generic/dirdlgg.o \ + ../generic/extdlgg.o \ + ../generic/fontdlgg.o \ + ../generic/gridg.o \ + ../generic/imaglist.o \ + ../generic/laywin.o \ + ../generic/listctrl.o \ + ../generic/numdlgg.o \ + ../generic/panelg.o \ + ../generic/printps.o \ + ../generic/prntdlgg.o \ + ../generic/progdlgg.o \ + ../generic/prop.o \ + ../generic/propform.o \ + ../generic/proplist.o \ + ../generic/sashwin.o \ + ../generic/scrolwin.o \ + ../generic/splitter.o \ + ../generic/statusbr.o \ + ../generic/tipdlg.o \ + ../generic/treectrl.o + +GTK_COMMONOBJS = \ + parser.o \ + ../common/cmndata.o \ + ../common/config.o \ + ../common/date.o \ + ../common/datstrm.o \ + ../common/db.o \ + ../common/dbtable.o \ + ../common/dcbase.o \ + ../common/dlgcmn.o \ + ../common/docmdi.o \ + ../common/docview.o \ + ../common/dynarray.o \ + ../common/dynlib.o \ + ../common/event.o \ + ../common/extended.o \ + ../common/ffile.o \ + ../common/file.o \ + ../common/fileconf.o \ + ../common/filefn.o \ + ../common/filesys.o \ + ../common/framecmn.o \ + ../common/fs_inet.o \ + ../common/fs_zip.o \ + ../common/ftp.o \ + ../common/gdicmn.o \ + ../common/hash.o \ + ../common/helpbase.o \ + ../common/http.o \ + ../common/imagbmp.o \ + ../common/image.o \ + ../common/imaggif.o \ + ../common/imagjpeg.o \ + ../common/imagpng.o \ + ../common/intl.o \ + ../common/ipcbase.o \ + ../common/layout.o \ + ../common/list.o \ + ../common/log.o \ + ../common/memory.o \ + ../common/mimetype.o \ + ../common/module.o \ + ../common/mstream.o \ + ../common/object.o \ + ../common/objstrm.o \ + ../common/paper.o \ + ../common/prntbase.o \ + ../common/process.o \ + ../common/protocol.o \ + ../common/resource.o \ + ../common/sckaddr.o \ + ../common/sckfile.o \ + ../common/sckipc.o \ + ../common/sckstrm.o \ + ../common/sizer.o \ + ../common/socket.o \ + ../common/strconv.o \ + ../common/stream.o \ + ../common/string.o \ + ../common/tbarbase.o \ + ../common/tbarsmpl.o \ + ../common/textcmn.o \ + ../common/textfile.o \ + ../common/time.o \ + ../common/timercmn.o \ + ../common/tokenzr.o \ + ../common/txtstrm.o \ + ../common/unzip.o \ + ../common/url.o \ + ../common/utilscmn.o \ + ../common/valgen.o \ + ../common/validate.o \ + ../common/valtext.o \ + ../common/variant.o \ + ../common/wfstream.o \ + ../common/wincmn.o \ + ../common/wxchar.o \ + ../common/wxexpr.o \ + ../common/zipstrm.o \ + ../common/zstream.o + +GTK_GUIOBJS = \ + ../gtk/accel.o \ + ../gtk/app.o \ + ../gtk/bitmap.o \ + ../gtk/bmpbuttn.o \ + ../gtk/brush.o \ + ../gtk/button.o \ + ../gtk/checkbox.o \ + ../gtk/checklst.o \ + ../gtk/choicdlg.o \ + ../gtk/choice.o \ + ../gtk/clipbrd.o \ + ../gtk/colour.o \ + ../gtk/combobox.o \ + ../gtk/control.o \ + ../gtk/cursor.o \ + ../gtk/data.o \ + ../gtk/dataobj.o \ + ../gtk/dc.o \ + ../gtk/dcclient.o \ + ../gtk/dcmemory.o \ + ../gtk/dcscreen.o \ + ../gtk/dialog.o \ + ../gtk/dnd.o \ + ../gtk/filedlg.o \ + ../gtk/font.o \ + ../gtk/frame.o \ + ../gtk/gauge.o \ + ../gtk/gdiobj.o \ + ../gtk/gsockgtk.o \ + ../gtk/icon.o \ + ../gtk/listbox.o \ + ../gtk/main.o \ + ../gtk/mdi.o \ + ../gtk/menu.o \ + ../gtk/minifram.o \ + ../gtk/msgdlg.o \ + ../gtk/notebook.o \ + ../gtk/palette.o \ + ../gtk/pen.o \ + ../gtk/radiobox.o \ + ../gtk/radiobut.o \ + ../gtk/region.o \ + ../gtk/scrolbar.o \ + ../gtk/settings.o \ + ../gtk/slider.o \ + ../gtk/spinbutt.o \ + ../gtk/statbmp.o \ + ../gtk/statbox.o \ + ../gtk/statline.o \ + ../gtk/stattext.o \ + ../gtk/tbargtk.o \ + ../gtk/textctrl.o \ + ../gtk/textdlg.o \ + ../gtk/timer.o \ + ../gtk/tooltip.o \ + ../gtk/utilsgtk.o \ + ../gtk/utilsres.o \ + ../gtk/wave.o \ + ../gtk/win_gtk.o \ + ../gtk/window.o + +MOTIF_GENERICOBJS = \ + ../generic/busyinfo.o \ + ../generic/caret.o \ + ../generic/choicdgg.o \ + ../generic/colrdlgg.o \ + ../generic/dirdlgg.o \ + ../generic/extdlgg.o \ + ../generic/fontdlgg.o \ + ../generic/gridg.o \ + ../generic/helpxlp.o \ + ../generic/imaglist.o \ + ../generic/laywin.o \ + ../generic/listctrl.o \ + ../generic/msgdlgg.o \ + ../generic/notebook.o \ + ../generic/numdlgg.o \ + ../generic/panelg.o \ + ../generic/printps.o \ + ../generic/prntdlgg.o \ + ../generic/progdlgg.o \ + ../generic/prop.o \ + ../generic/propform.o \ + ../generic/proplist.o \ + ../generic/sashwin.o \ + ../generic/scrolwin.o \ + ../generic/splitter.o \ + ../generic/statusbr.o \ + ../generic/tabg.o \ + ../generic/textdlgg.o \ + ../generic/tipdlg.o \ + ../generic/treectrl.o + +MOTIF_COMMONOBJS = \ + parser.o \ + ../common/choiccmn.o \ + ../common/cmndata.o \ + ../common/config.o \ + ../common/ctrlcmn.o \ + ../common/date.o \ + ../common/datstrm.o \ + ../common/db.o \ + ../common/dbtable.o \ + ../common/dcbase.o \ + ../common/dlgcmn.o \ + ../common/docmdi.o \ + ../common/docview.o \ + ../common/dynarray.o \ + ../common/dynlib.o \ + ../common/event.o \ + ../common/extended.o \ + ../common/ffile.o \ + ../common/file.o \ + ../common/fileconf.o \ + ../common/filefn.o \ + ../common/filesys.o \ + ../common/framecmn.o \ + ../common/fs_inet.o \ + ../common/fs_zip.o \ + ../common/ftp.o \ + ../common/gdicmn.o \ + ../common/hash.o \ + ../common/helpbase.o \ + ../common/http.o \ + ../common/imagbmp.o \ + ../common/image.o \ + ../common/imaggif.o \ + ../common/imagjpeg.o \ + ../common/imagpng.o \ + ../common/intl.o \ + ../common/ipcbase.o \ + ../common/layout.o \ + ../common/list.o \ + ../common/log.o \ + ../common/memory.o \ + ../common/mimetype.o \ + ../common/module.o \ + ../common/mstream.o \ + ../common/object.o \ + ../common/objstrm.o \ + ../common/odbc.o \ + ../common/paper.o \ + ../common/prntbase.o \ + ../common/process.o \ + ../common/protocol.o \ + ../common/resource.o \ + ../common/sckaddr.o \ + ../common/sckfile.o \ + ../common/sckipc.o \ + ../common/sckstrm.o \ + ../common/sizer.o \ + ../common/socket.o \ + ../common/strconv.o \ + ../common/stream.o \ + ../common/string.o \ + ../common/tbarbase.o \ + ../common/tbarsmpl.o \ + ../common/textcmn.o \ + ../common/textfile.o \ + ../common/time.o \ + ../common/timercmn.o \ + ../common/tokenzr.o \ + ../common/txtstrm.o \ + ../common/unzip.o \ + ../common/url.o \ + ../common/utilscmn.o \ + ../common/valgen.o \ + ../common/validate.o \ + ../common/valtext.o \ + ../common/variant.o \ + ../common/wfstream.o \ + ../common/wincmn.o \ + ../common/wxchar.o \ + ../common/wxexpr.o \ + ../common/zipstrm.o \ + ../common/zstream.o + +MOTIF_GUIOBJS = \ + ../motif/xmcombo/xmcombo.o \ + ../motif/accel.o \ + ../motif/app.o \ + ../motif/bitmap.o \ + ../motif/bmpbuttn.o \ + ../motif/brush.o \ + ../motif/button.o \ + ../motif/checkbox.o \ + ../motif/choice.o \ + ../motif/clipbrd.o \ + ../motif/colour.o \ + ../motif/combobox.o \ + ../motif/control.o \ + ../motif/cursor.o \ + ../motif/data.o \ + ../motif/dataobj.o \ + ../motif/dc.o \ + ../motif/dcclient.o \ + ../motif/dcmemory.o \ + ../motif/dcscreen.o \ + ../motif/dialog.o \ + ../motif/filedlg.o \ + ../motif/font.o \ + ../motif/frame.o \ + ../motif/gauge.o \ + ../motif/gdiobj.o \ + ../motif/gsockmot.o \ + ../motif/icon.o \ + ../motif/listbox.o \ + ../motif/main.o \ + ../motif/mdi.o \ + ../motif/menu.o \ + ../motif/menuitem.o \ + ../motif/minifram.o \ + ../motif/msgdlg.o \ + ../motif/palette.o \ + ../motif/pen.o \ + ../motif/radiobox.o \ + ../motif/radiobut.o \ + ../motif/region.o \ + ../motif/scrolbar.o \ + ../motif/settings.o \ + ../motif/slider.o \ + ../motif/statbmp.o \ + ../motif/statbox.o \ + ../motif/stattext.o \ + ../motif/textctrl.o \ + ../motif/timer.o \ + ../motif/toolbar.o \ + ../motif/utils.o \ + ../motif/window.o + +HTMLOBJS = \ + ../html/htmlcell.o \ + ../html/htmlfilter.o \ + ../html/htmlhelp.o \ + ../html/htmlhelp_io.o \ + ../html/htmlparser.o \ + ../html/htmltag.o \ + ../html/htmlwin.o \ + ../html/htmlwinparser.o \ + ../html/mod_fonts.o \ + ../html/mod_hline.o \ + ../html/mod_image.o \ + ../html/mod_layout.o \ + ../html/mod_links.o \ + ../html/mod_list.o \ + ../html/mod_pre.o \ + ../html/mod_tables.o \ + ../html/search.o + +UNIXOBJS = \ + ../unix/gsocket.o \ + ../unix/threadpsx.o \ + ../unix/utilsunx.o + +ZLIBOBJS = \ + ../zlib/adler32.o \ + ../zlib/compress.o \ + ../zlib/crc32.o \ + ../zlib/gzio.o \ + ../zlib/uncompr.o \ + ../zlib/deflate.o \ + ../zlib/trees.o \ + ../zlib/zutil.o \ + ../zlib/inflate.o \ + ../zlib/infblock.o \ + ../zlib/inftrees.o \ + ../zlib/infcodes.o \ + ../zlib/infutil.o \ + ../zlib/inffast.o + +PNGOBJS = \ + ../png/png.o \ + ../png/pngread.o \ + ../png/pngrtran.o \ + ../png/pngrutil.o \ + ../png/pngpread.o \ + ../png/pngtrans.o \ + ../png/pngwrite.o \ + ../png/pngwtran.o \ + ../png/pngwutil.o \ + ../png/pngerror.o \ + ../png/pngmem.o \ + ../png/pngwio.o \ + ../png/pngrio.o \ + ../png/pngget.o \ + ../png/pngset.o + + +JPEGOBJS = \ + ../jpeg/jcomapi.o \ + ../jpeg/jutils.o \ + ../jpeg/jerror.o \ + ../jpeg/jmemmgr.o \ + ../jpeg/jmemnobs.o \ + ../jpeg/jcapimin.o \ + ../jpeg/jcapistd.o \ + ../jpeg/jctrans.o \ + ../jpeg/jcparam.o \ + ../jpeg/jdatadst.o \ + ../jpeg/jcinit.o \ + ../jpeg/jcmaster.o \ + ../jpeg/jcmarker.o \ + ../jpeg/jcmainct.o \ + ../jpeg/jcprepct.o \ + ../jpeg/jccoefct.o \ + ../jpeg/jccolor.o \ + ../jpeg/jcsample.o \ + ../jpeg/jchuff.o \ + ../jpeg/jcphuff.o \ + ../jpeg/jcdctmgr.o \ + ../jpeg/jfdctfst.o \ + ../jpeg/jfdctflt.o \ + ../jpeg/jfdctint.o \ + ../jpeg/jdapimin.o \ + ../jpeg/jdapistd.o \ + ../jpeg/jdtrans.o \ + ../jpeg/jdatasrc.o \ + ../jpeg/jdmaster.o \ + ../jpeg/jdinput.o \ + ../jpeg/jdmarker.o \ + ../jpeg/jdhuff.o \ + ../jpeg/jdphuff.o \ + ../jpeg/jdmainct.o \ + ../jpeg/jdcoefct.o \ + ../jpeg/jdpostct.o \ + ../jpeg/jddctmgr.o \ + ../jpeg/jidctfst.o \ + ../jpeg/jidctflt.o \ + ../jpeg/jidctint.o \ + ../jpeg/jidctred.o \ + ../jpeg/jdsample.o \ + ../jpeg/jdcolor.o \ + ../jpeg/jquant1.o \ + ../jpeg/jquant2.o \ + ../jpeg/jdmerge.o + + +OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(HTMLOBJS) $(UNIXOBJS) \ + $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) + + +REQUIRED_DIRS = ../../lib ../../src ../../src/common ../../src/gtk ../../src/motif \ + ../../src/generic ../../src/unix ../../src/motif/xmombo ../../src/html \ + ../../src/zlib ../../src/jpeg ../../src/png + +all: $(REQUIRED_DIRS) $(OBJECTS) $(WXLIB) + +$(REQUIRED_DIRS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h + @if test ! -d ../../lib; then mkdir ../../lib; fi + @if test ! -d ../../src; then mkdir ../../src; fi + @if test ! -d ../../src/common; then mkdir ../../src/common; fi + @if test ! -d ../../src/gtk; then mkdir ../../src/gtk; fi + @if test ! -d ../../src/motif; then mkdir ../../src/motif; fi + @if test ! -d ../../src/motif/xmcombo; then mkdir ../../src/motif/xmcombo; fi + @if test ! -d ../../src/generic; then mkdir ../../src/generic; fi + @if test ! -d ../../src/unix; then mkdir ../../src/unix; fi + @if test ! -d ../../src/html; then mkdir ../../src/html; fi + @if test ! -d ../../src/png; then mkdir ../../src/png; fi + @if test ! -d ../../src/jpeg; then mkdir ../../src/jpeg; fi + @if test ! -d ../../src/zlib; then mkdir ../../src/zlib; fi + +$(WXLIB): $(OBJECTS) + @if test ! ../../samples/dialog.cpp; \ + then cp -f -r $(WXDIR)/samples ../..; \ + fi + $(AR) $(AROPTIONS) ../../lib/$@ $(OBJECTS) + $(RANLIB) ../../lib/$@ + +$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h + +parser.o: parser.c lexer.c + $(CCLEX) -c $(CFLAGS) -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.yy.c;lexer.l;g" < lex.yy.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.yy.c + +install: $(WXLIB) + +clean: + rm -f *.o + rm -f *.lo + rm -f parser.c + rm -f lexer.c + rm -f *.a + rm -f *.la + +cleanall: clean diff --git a/src/gtk1/Makefile b/src/gtk1/Makefile deleted file mode 100644 index d7db9d0e21..0000000000 --- a/src/gtk1/Makefile +++ /dev/null @@ -1,352 +0,0 @@ - -# This file was automatically generated by tmake at 23:37, 1999/08/08 -# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! - -# -# File: Makefile -# 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 - -WXDIR = ../.. - -include $(WXDIR)/src/gtk.env - -# Subordinate library possibilities - -GENDIR = $(WXDIR)/src/generic -COMMDIR = $(WXDIR)/src/common -HTMLDIR = $(WXDIR)/src/html -UNIXDIR = $(WXDIR)/src/unix -PNGDIR = $(WXDIR)/src/png -JPEGDIR = $(WXDIR)/src/jpeg -ZLIBDIR = $(WXDIR)/src/zlib -GTKDIR = $(WXDIR)/src/gtk - -DOCDIR = $(WXDIR)\docs - -GENERICOBJS = \ - $(GENDIR)/busyinfo.$(OBJSUFF) \ - $(GENDIR)/caret.$(OBJSUFF) \ - $(GENDIR)/colrdlgg.$(OBJSUFF) \ - $(GENDIR)/dirdlgg.$(OBJSUFF) \ - $(GENDIR)/extdlgg.$(OBJSUFF) \ - $(GENDIR)/fontdlgg.$(OBJSUFF) \ - $(GENDIR)/gridg.$(OBJSUFF) \ - $(GENDIR)/imaglist.$(OBJSUFF) \ - $(GENDIR)/laywin.$(OBJSUFF) \ - $(GENDIR)/listctrl.$(OBJSUFF) \ - $(GENDIR)/numdlgg.$(OBJSUFF) \ - $(GENDIR)/panelg.$(OBJSUFF) \ - $(GENDIR)/printps.$(OBJSUFF) \ - $(GENDIR)/prntdlgg.$(OBJSUFF) \ - $(GENDIR)/progdlgg.$(OBJSUFF) \ - $(GENDIR)/prop.$(OBJSUFF) \ - $(GENDIR)/propform.$(OBJSUFF) \ - $(GENDIR)/proplist.$(OBJSUFF) \ - $(GENDIR)/sashwin.$(OBJSUFF) \ - $(GENDIR)/scrolwin.$(OBJSUFF) \ - $(GENDIR)/splitter.$(OBJSUFF) \ - $(GENDIR)/statusbr.$(OBJSUFF) \ - $(GENDIR)/tipdlg.$(OBJSUFF) \ - $(GENDIR)/treectrl.$(OBJSUFF) - -COMMONOBJS = \ - $(COMMDIR)/parser.$(OBJSUFF) \ - $(COMMDIR)/cmndata.$(OBJSUFF) \ - $(COMMDIR)/config.$(OBJSUFF) \ - $(COMMDIR)/date.$(OBJSUFF) \ - $(COMMDIR)/datstrm.$(OBJSUFF) \ - $(COMMDIR)/db.$(OBJSUFF) \ - $(COMMDIR)/dbtable.$(OBJSUFF) \ - $(COMMDIR)/dcbase.$(OBJSUFF) \ - $(COMMDIR)/dlgcmn.$(OBJSUFF) \ - $(COMMDIR)/docmdi.$(OBJSUFF) \ - $(COMMDIR)/docview.$(OBJSUFF) \ - $(COMMDIR)/dynarray.$(OBJSUFF) \ - $(COMMDIR)/dynlib.$(OBJSUFF) \ - $(COMMDIR)/event.$(OBJSUFF) \ - $(COMMDIR)/extended.$(OBJSUFF) \ - $(COMMDIR)/ffile.$(OBJSUFF) \ - $(COMMDIR)/file.$(OBJSUFF) \ - $(COMMDIR)/fileconf.$(OBJSUFF) \ - $(COMMDIR)/filefn.$(OBJSUFF) \ - $(COMMDIR)/filesys.$(OBJSUFF) \ - $(COMMDIR)/framecmn.$(OBJSUFF) \ - $(COMMDIR)/fs_inet.$(OBJSUFF) \ - $(COMMDIR)/fs_zip.$(OBJSUFF) \ - $(COMMDIR)/ftp.$(OBJSUFF) \ - $(COMMDIR)/gdicmn.$(OBJSUFF) \ - $(COMMDIR)/hash.$(OBJSUFF) \ - $(COMMDIR)/helpbase.$(OBJSUFF) \ - $(COMMDIR)/http.$(OBJSUFF) \ - $(COMMDIR)/imagbmp.$(OBJSUFF) \ - $(COMMDIR)/image.$(OBJSUFF) \ - $(COMMDIR)/imaggif.$(OBJSUFF) \ - $(COMMDIR)/imagjpeg.$(OBJSUFF) \ - $(COMMDIR)/imagpng.$(OBJSUFF) \ - $(COMMDIR)/intl.$(OBJSUFF) \ - $(COMMDIR)/ipcbase.$(OBJSUFF) \ - $(COMMDIR)/layout.$(OBJSUFF) \ - $(COMMDIR)/list.$(OBJSUFF) \ - $(COMMDIR)/log.$(OBJSUFF) \ - $(COMMDIR)/memory.$(OBJSUFF) \ - $(COMMDIR)/mimetype.$(OBJSUFF) \ - $(COMMDIR)/module.$(OBJSUFF) \ - $(COMMDIR)/mstream.$(OBJSUFF) \ - $(COMMDIR)/object.$(OBJSUFF) \ - $(COMMDIR)/objstrm.$(OBJSUFF) \ - $(COMMDIR)/paper.$(OBJSUFF) \ - $(COMMDIR)/prntbase.$(OBJSUFF) \ - $(COMMDIR)/process.$(OBJSUFF) \ - $(COMMDIR)/protocol.$(OBJSUFF) \ - $(COMMDIR)/resource.$(OBJSUFF) \ - $(COMMDIR)/sckaddr.$(OBJSUFF) \ - $(COMMDIR)/sckfile.$(OBJSUFF) \ - $(COMMDIR)/sckipc.$(OBJSUFF) \ - $(COMMDIR)/sckstrm.$(OBJSUFF) \ - $(COMMDIR)/socket.$(OBJSUFF) \ - $(COMMDIR)/strconv.$(OBJSUFF) \ - $(COMMDIR)/stream.$(OBJSUFF) \ - $(COMMDIR)/string.$(OBJSUFF) \ - $(COMMDIR)/tbarbase.$(OBJSUFF) \ - $(COMMDIR)/tbarsmpl.$(OBJSUFF) \ - $(COMMDIR)/textcmn.$(OBJSUFF) \ - $(COMMDIR)/textfile.$(OBJSUFF) \ - $(COMMDIR)/time.$(OBJSUFF) \ - $(COMMDIR)/timercmn.$(OBJSUFF) \ - $(COMMDIR)/tokenzr.$(OBJSUFF) \ - $(COMMDIR)/txtstrm.$(OBJSUFF) \ - $(COMMDIR)/unzip.$(OBJSUFF) \ - $(COMMDIR)/url.$(OBJSUFF) \ - $(COMMDIR)/utilscmn.$(OBJSUFF) \ - $(COMMDIR)/valgen.$(OBJSUFF) \ - $(COMMDIR)/validate.$(OBJSUFF) \ - $(COMMDIR)/valtext.$(OBJSUFF) \ - $(COMMDIR)/variant.$(OBJSUFF) \ - $(COMMDIR)/wfstream.$(OBJSUFF) \ - $(COMMDIR)/wincmn.$(OBJSUFF) \ - $(COMMDIR)/wxchar.$(OBJSUFF) \ - $(COMMDIR)/wxexpr.$(OBJSUFF) \ - $(COMMDIR)/zipstrm.$(OBJSUFF) \ - $(COMMDIR)/zstream.$(OBJSUFF) - -HTMLOBJS = \ - $(HTMLDIR)/htmlcell.$(OBJSUFF) \ - $(HTMLDIR)/htmlfilter.$(OBJSUFF) \ - $(HTMLDIR)/htmlhelp.$(OBJSUFF) \ - $(HTMLDIR)/htmlhelp_io.$(OBJSUFF) \ - $(HTMLDIR)/htmlparser.$(OBJSUFF) \ - $(HTMLDIR)/htmltag.$(OBJSUFF) \ - $(HTMLDIR)/htmlwin.$(OBJSUFF) \ - $(HTMLDIR)/htmlwinparser.$(OBJSUFF) \ - $(HTMLDIR)/mod_fonts.$(OBJSUFF) \ - $(HTMLDIR)/mod_hline.$(OBJSUFF) \ - $(HTMLDIR)/mod_image.$(OBJSUFF) \ - $(HTMLDIR)/mod_layout.$(OBJSUFF) \ - $(HTMLDIR)/mod_links.$(OBJSUFF) \ - $(HTMLDIR)/mod_list.$(OBJSUFF) \ - $(HTMLDIR)/mod_pre.$(OBJSUFF) \ - $(HTMLDIR)/mod_tables.$(OBJSUFF) \ - $(HTMLDIR)/search.$(OBJSUFF) - -GTKOBJS = \ - $(GTKDIR)/accel.$(OBJSUFF) \ - $(GTKDIR)/app.$(OBJSUFF) \ - $(GTKDIR)/bitmap.$(OBJSUFF) \ - $(GTKDIR)/bmpbuttn.$(OBJSUFF) \ - $(GTKDIR)/brush.$(OBJSUFF) \ - $(GTKDIR)/button.$(OBJSUFF) \ - $(GTKDIR)/checkbox.$(OBJSUFF) \ - $(GTKDIR)/checklst.$(OBJSUFF) \ - $(GTKDIR)/choicdlg.$(OBJSUFF) \ - $(GTKDIR)/choice.$(OBJSUFF) \ - $(GTKDIR)/clipbrd.$(OBJSUFF) \ - $(GTKDIR)/colour.$(OBJSUFF) \ - $(GTKDIR)/combobox.$(OBJSUFF) \ - $(GTKDIR)/control.$(OBJSUFF) \ - $(GTKDIR)/cursor.$(OBJSUFF) \ - $(GTKDIR)/data.$(OBJSUFF) \ - $(GTKDIR)/dataobj.$(OBJSUFF) \ - $(GTKDIR)/dc.$(OBJSUFF) \ - $(GTKDIR)/dcclient.$(OBJSUFF) \ - $(GTKDIR)/dcmemory.cpp \ - $(GTKDIR)/dcscreen.$(OBJSUFF) \ - $(GTKDIR)/dialog.$(OBJSUFF) \ - $(GTKDIR)/dnd.$(OBJSUFF) \ - $(GTKDIR)/filedlg.$(OBJSUFF) \ - $(GTKDIR)/font.$(OBJSUFF) \ - $(GTKDIR)/frame.$(OBJSUFF) \ - $(GTKDIR)/gauge.$(OBJSUFF) \ - $(GTKDIR)/gdiobj.$(OBJSUFF) \ - $(GTKDIR)/gsockgtk.$(OBJSUFF) \ - $(GTKDIR)/icon.$(OBJSUFF) \ - $(GTKDIR)/listbox.$(OBJSUFF) \ - $(GTKDIR)/main.$(OBJSUFF) \ - $(GTKDIR)/mdi.$(OBJSUFF) \ - $(GTKDIR)/menu.$(OBJSUFF) \ - $(GTKDIR)/minifram.$(OBJSUFF) \ - $(GTKDIR)/msgdlg.$(OBJSUFF) \ - $(GTKDIR)/notebook.$(OBJSUFF) \ - $(GTKDIR)/palette.$(OBJSUFF) \ - $(GTKDIR)/pen.$(OBJSUFF) \ - $(GTKDIR)/radiobox.$(OBJSUFF) \ - $(GTKDIR)/radiobut.$(OBJSUFF) \ - $(GTKDIR)/region.$(OBJSUFF) \ - $(GTKDIR)/scrolbar.$(OBJSUFF) \ - $(GTKDIR)/settings.$(OBJSUFF) \ - $(GTKDIR)/slider.$(OBJSUFF) \ - $(GTKDIR)/spinbutt.$(OBJSUFF) \ - $(GTKDIR)/statbmp.$(OBJSUFF) \ - $(GTKDIR)/statbox.$(OBJSUFF) \ - $(GTKDIR)/statline.$(OBJSUFF) \ - $(GTKDIR)/stattext.$(OBJSUFF) \ - $(GTKDIR)/tbargtk.$(OBJSUFF) \ - $(GTKDIR)/textctrl.$(OBJSUFF) \ - $(GTKDIR)/textdlg.$(OBJSUFF) \ - $(GTKDIR)/timer.$(OBJSUFF) \ - $(GTKDIR)/tooltip.$(OBJSUFF) \ - $(GTKDIR)/utilsgtk.$(OBJSUFF) \ - $(GTKDIR)/utilsres.$(OBJSUFF) \ - $(GTKDIR)/wave.$(OBJSUFF) \ - $(GTKDIR)/win_gtk.$(OBJSUFF) \ - $(GTKDIR)/window.$(OBJSUFF) - -UNIXOBJS = \ - $(UNIXDIR)/gsocket.$(OBJSUFF) \ - $(UNIXDIR)/threadpsx.$(OBJSUFF) \ - $(UNIXDIR)/utilsunx.$(OBJSUFF) - -ZLIBOBJS = \ - $(ZLIBDIR)/adler32.$(OBJSUFF) \ - $(ZLIBDIR)/compress.$(OBJSUFF) \ - $(ZLIBDIR)/crc32.$(OBJSUFF) \ - $(ZLIBDIR)/gzio.$(OBJSUFF) \ - $(ZLIBDIR)/uncompr.$(OBJSUFF) \ - $(ZLIBDIR)/deflate.$(OBJSUFF) \ - $(ZLIBDIR)/trees.$(OBJSUFF) \ - $(ZLIBDIR)/zutil.$(OBJSUFF) \ - $(ZLIBDIR)/inflate.$(OBJSUFF) \ - $(ZLIBDIR)/infblock.$(OBJSUFF) \ - $(ZLIBDIR)/inftrees.$(OBJSUFF) \ - $(ZLIBDIR)/infcodes.$(OBJSUFF) \ - $(ZLIBDIR)/infutil.$(OBJSUFF) \ - $(ZLIBDIR)/inffast.$(OBJSUFF) - -PNGOBJS = \ - $(PNGDIR)/png.$(OBJSUFF) \ - $(PNGDIR)/pngread.$(OBJSUFF) \ - $(PNGDIR)/pngrtran.$(OBJSUFF) \ - $(PNGDIR)/pngrutil.$(OBJSUFF) \ - $(PNGDIR)/pngpread.$(OBJSUFF) \ - $(PNGDIR)/pngtrans.$(OBJSUFF) \ - $(PNGDIR)/pngwrite.$(OBJSUFF) \ - $(PNGDIR)/pngwtran.$(OBJSUFF) \ - $(PNGDIR)/pngwutil.$(OBJSUFF) \ - $(PNGDIR)/pngerror.$(OBJSUFF) \ - $(PNGDIR)/pngmem.$(OBJSUFF) \ - $(PNGDIR)/pngwio.$(OBJSUFF) \ - $(PNGDIR)/pngrio.$(OBJSUFF) \ - $(PNGDIR)/pngget.$(OBJSUFF) \ - $(PNGDIR)/pngset.$(OBJSUFF) - - -JPEGOBJS = \ - $(JPEGDIR)/jcomapi.$(OBJSUFF) \ - $(JPEGDIR)/jutils.$(OBJSUFF) \ - $(JPEGDIR)/jerror.$(OBJSUFF) \ - $(JPEGDIR)/jmemmgr.$(OBJSUFF) \ - $(JPEGDIR)/jmemnobs.$(OBJSUFF) \ - $(JPEGDIR)/jcapimin.$(OBJSUFF) \ - $(JPEGDIR)/jcapistd.$(OBJSUFF) \ - $(JPEGDIR)/jctrans.$(OBJSUFF) \ - $(JPEGDIR)/jcparam.$(OBJSUFF) \ - $(JPEGDIR)/jdatadst.$(OBJSUFF) \ - $(JPEGDIR)/jcinit.$(OBJSUFF) \ - $(JPEGDIR)/jcmaster.$(OBJSUFF) \ - $(JPEGDIR)/jcmarker.$(OBJSUFF) \ - $(JPEGDIR)/jcmainct.$(OBJSUFF) \ - $(JPEGDIR)/jcprepct.$(OBJSUFF) \ - $(JPEGDIR)/jccoefct.$(OBJSUFF) \ - $(JPEGDIR)/jccolor.$(OBJSUFF) \ - $(JPEGDIR)/jcsample.$(OBJSUFF) \ - $(JPEGDIR)/jchuff.$(OBJSUFF) \ - $(JPEGDIR)/jcphuff.$(OBJSUFF) \ - $(JPEGDIR)/jcdctmgr.$(OBJSUFF) \ - $(JPEGDIR)/jfdctfst.$(OBJSUFF) \ - $(JPEGDIR)/jfdctflt.$(OBJSUFF) \ - $(JPEGDIR)/jfdctint.$(OBJSUFF) \ - $(JPEGDIR)/jdapimin.$(OBJSUFF) \ - $(JPEGDIR)/jdapistd.$(OBJSUFF) \ - $(JPEGDIR)/jdtrans.$(OBJSUFF) \ - $(JPEGDIR)/jdatasrc.$(OBJSUFF) \ - $(JPEGDIR)/jdmaster.$(OBJSUFF) \ - $(JPEGDIR)/jdinput.$(OBJSUFF) \ - $(JPEGDIR)/jdmarker.$(OBJSUFF) \ - $(JPEGDIR)/jdhuff.$(OBJSUFF) \ - $(JPEGDIR)/jdphuff.$(OBJSUFF) \ - $(JPEGDIR)/jdmainct.$(OBJSUFF) \ - $(JPEGDIR)/jdcoefct.$(OBJSUFF) \ - $(JPEGDIR)/jdpostct.$(OBJSUFF) \ - $(JPEGDIR)/jddctmgr.$(OBJSUFF) \ - $(JPEGDIR)/jidctfst.$(OBJSUFF) \ - $(JPEGDIR)/jidctflt.$(OBJSUFF) \ - $(JPEGDIR)/jidctint.$(OBJSUFF) \ - $(JPEGDIR)/jidctred.$(OBJSUFF) \ - $(JPEGDIR)/jdsample.$(OBJSUFF) \ - $(JPEGDIR)/jdcolor.$(OBJSUFF) \ - $(JPEGDIR)/jquant1.$(OBJSUFF) \ - $(JPEGDIR)/jquant2.$(OBJSUFF) \ - $(JPEGDIR)/jdmerge.$(OBJSUFF) - -OBJECTS = $(GTKOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJ) $(UNIXOBJS) \ - $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) - -all: $(OBJECTS) $(WXLIB) - -$(WXLIB): $(OBJECTS) - ar $(AROPTIONS) $@ $(OBJECTS) - $(RANLIB) $@ - -$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h - -$(COMMDIR)/parser.$(OBJSUFF): $(COMMDIR)/parser.c $(COMMDIR)/lexer.c - $(CCLEX) -c $(CFLAGS) -o $@ $(COMMDIR)/parser.c - -$(COMMDIR)/parser.c: $(COMMDIR)/parser.y $(COMMDIR)/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" > $(COMMDIR)/parser.c - @$(RM) y.tab.c - -$(COMMDIR)/lexer.c: $(COMMDIR)/lexer.l - $(LEX) $(COMMDIR)/lexer.l - @sed -e "s;$(COMMDIR)/lex.yy.c;lexer.l;g" < lex.yy.c | \ - sed -e "s/yy/PROIO_yy/g" | \ - sed -e "s/input/PROIO_input/g" | \ - sed -e "s/unput/PROIO_unput/g" > $(COMMDIR)/lexer.c - @$(RM) lex.yy.c - -clean: - rm -f $(GTKDIR)/*.$(OBJSUFF) - rm -f $(COMMDIR)/parser.c - rm -f $(COMMDIR)/lexer.c - rm -f $(COMMDIR)/*.$(OBJSUFF) - rm -f $(GENDIR)/*.$(OBJSUFF) - rm -f $(PNGDIR)/*.$(OBJSUFF) - rm -f $(ZLIBDIR)/*.$(OBJSUFF) - rm -f $(JPEGDIR)/*.$(OBJSUFF) - rm -f $(UNIXDIR)/*.$(OBJSUFF) - rm -f $(HTMLDIR)/*.$(OBJSUFF) - rm -f $(WXWIN)/lib/libwx_$(GUI).a - -cleanall: clean diff --git a/src/gtk1/makefile.unx.in b/src/gtk1/makefile.unx.in new file mode 100644 index 0000000000..2089c71ef0 --- /dev/null +++ b/src/gtk1/makefile.unx.in @@ -0,0 +1,612 @@ + +# +# I want this to be: +# $(INSTALL_DATA) $(INCDIR)/wx/window.h $(includedir)/wx/window.h +# +# foreach $file (sort keys %wxINCLUDE) { +# next if $wxINCLUDE{$file} =~ /\b(GTK|MSW|MOT|PM|MAC|GEN|HTM|UNX)\b/; +# +# $project{"WXINSTALLWX"} .= "$(INSTALL_DATA)" . " " . "\$(INCDIR)/wx/" . $file . " \$(includedir)/wx/" . $file . "\n" +# } +# +# +# +# This file was automatically generated by tmake at 19:48, 1999/08/10 +# 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 ../make.env + +########################### Paths ################################# + +srcdir = @srcdir@ + +VPATH = :$(srcdir) + +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@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +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@ + +############################# Dirs ################################# + +WXDIR = $(srcdir)/../.. + +# Subordinate library possibilities + +GENDIR = $(WXDIR)/src/generic +COMMDIR = $(WXDIR)/src/common +HTMLDIR = $(WXDIR)/src/html +UNIXDIR = $(WXDIR)/src/unix +PNGDIR = $(WXDIR)/src/png +JPEGDIR = $(WXDIR)/src/jpeg +ZLIBDIR = $(WXDIR)/src/zlib +GTKDIR = $(WXDIR)/src/gtk +MOTIFDIR = $(WXDIR)/src/motif +INCDIR = $(WXDIR)/include + +DOCDIR = $(WXDIR)/docs + +############################## Files ################################## + +GTK_GENERICOBJS = \ + ../generic/busyinfo.o \ + ../generic/caret.o \ + ../generic/colrdlgg.o \ + ../generic/dirdlgg.o \ + ../generic/extdlgg.o \ + ../generic/fontdlgg.o \ + ../generic/gridg.o \ + ../generic/imaglist.o \ + ../generic/laywin.o \ + ../generic/listctrl.o \ + ../generic/numdlgg.o \ + ../generic/panelg.o \ + ../generic/printps.o \ + ../generic/prntdlgg.o \ + ../generic/progdlgg.o \ + ../generic/prop.o \ + ../generic/propform.o \ + ../generic/proplist.o \ + ../generic/sashwin.o \ + ../generic/scrolwin.o \ + ../generic/splitter.o \ + ../generic/statusbr.o \ + ../generic/tipdlg.o \ + ../generic/treectrl.o + +GTK_COMMONOBJS = \ + parser.o \ + ../common/cmndata.o \ + ../common/config.o \ + ../common/date.o \ + ../common/datstrm.o \ + ../common/db.o \ + ../common/dbtable.o \ + ../common/dcbase.o \ + ../common/dlgcmn.o \ + ../common/docmdi.o \ + ../common/docview.o \ + ../common/dynarray.o \ + ../common/dynlib.o \ + ../common/event.o \ + ../common/extended.o \ + ../common/ffile.o \ + ../common/file.o \ + ../common/fileconf.o \ + ../common/filefn.o \ + ../common/filesys.o \ + ../common/framecmn.o \ + ../common/fs_inet.o \ + ../common/fs_zip.o \ + ../common/ftp.o \ + ../common/gdicmn.o \ + ../common/hash.o \ + ../common/helpbase.o \ + ../common/http.o \ + ../common/imagbmp.o \ + ../common/image.o \ + ../common/imaggif.o \ + ../common/imagjpeg.o \ + ../common/imagpng.o \ + ../common/intl.o \ + ../common/ipcbase.o \ + ../common/layout.o \ + ../common/list.o \ + ../common/log.o \ + ../common/memory.o \ + ../common/mimetype.o \ + ../common/module.o \ + ../common/mstream.o \ + ../common/object.o \ + ../common/objstrm.o \ + ../common/paper.o \ + ../common/prntbase.o \ + ../common/process.o \ + ../common/protocol.o \ + ../common/resource.o \ + ../common/sckaddr.o \ + ../common/sckfile.o \ + ../common/sckipc.o \ + ../common/sckstrm.o \ + ../common/sizer.o \ + ../common/socket.o \ + ../common/strconv.o \ + ../common/stream.o \ + ../common/string.o \ + ../common/tbarbase.o \ + ../common/tbarsmpl.o \ + ../common/textcmn.o \ + ../common/textfile.o \ + ../common/time.o \ + ../common/timercmn.o \ + ../common/tokenzr.o \ + ../common/txtstrm.o \ + ../common/unzip.o \ + ../common/url.o \ + ../common/utilscmn.o \ + ../common/valgen.o \ + ../common/validate.o \ + ../common/valtext.o \ + ../common/variant.o \ + ../common/wfstream.o \ + ../common/wincmn.o \ + ../common/wxchar.o \ + ../common/wxexpr.o \ + ../common/zipstrm.o \ + ../common/zstream.o + +GTK_GUIOBJS = \ + ../gtk/accel.o \ + ../gtk/app.o \ + ../gtk/bitmap.o \ + ../gtk/bmpbuttn.o \ + ../gtk/brush.o \ + ../gtk/button.o \ + ../gtk/checkbox.o \ + ../gtk/checklst.o \ + ../gtk/choicdlg.o \ + ../gtk/choice.o \ + ../gtk/clipbrd.o \ + ../gtk/colour.o \ + ../gtk/combobox.o \ + ../gtk/control.o \ + ../gtk/cursor.o \ + ../gtk/data.o \ + ../gtk/dataobj.o \ + ../gtk/dc.o \ + ../gtk/dcclient.o \ + ../gtk/dcmemory.o \ + ../gtk/dcscreen.o \ + ../gtk/dialog.o \ + ../gtk/dnd.o \ + ../gtk/filedlg.o \ + ../gtk/font.o \ + ../gtk/frame.o \ + ../gtk/gauge.o \ + ../gtk/gdiobj.o \ + ../gtk/gsockgtk.o \ + ../gtk/icon.o \ + ../gtk/listbox.o \ + ../gtk/main.o \ + ../gtk/mdi.o \ + ../gtk/menu.o \ + ../gtk/minifram.o \ + ../gtk/msgdlg.o \ + ../gtk/notebook.o \ + ../gtk/palette.o \ + ../gtk/pen.o \ + ../gtk/radiobox.o \ + ../gtk/radiobut.o \ + ../gtk/region.o \ + ../gtk/scrolbar.o \ + ../gtk/settings.o \ + ../gtk/slider.o \ + ../gtk/spinbutt.o \ + ../gtk/statbmp.o \ + ../gtk/statbox.o \ + ../gtk/statline.o \ + ../gtk/stattext.o \ + ../gtk/tbargtk.o \ + ../gtk/textctrl.o \ + ../gtk/textdlg.o \ + ../gtk/timer.o \ + ../gtk/tooltip.o \ + ../gtk/utilsgtk.o \ + ../gtk/utilsres.o \ + ../gtk/wave.o \ + ../gtk/win_gtk.o \ + ../gtk/window.o + +MOTIF_GENERICOBJS = \ + ../generic/busyinfo.o \ + ../generic/caret.o \ + ../generic/choicdgg.o \ + ../generic/colrdlgg.o \ + ../generic/dirdlgg.o \ + ../generic/extdlgg.o \ + ../generic/fontdlgg.o \ + ../generic/gridg.o \ + ../generic/helpxlp.o \ + ../generic/imaglist.o \ + ../generic/laywin.o \ + ../generic/listctrl.o \ + ../generic/msgdlgg.o \ + ../generic/notebook.o \ + ../generic/numdlgg.o \ + ../generic/panelg.o \ + ../generic/printps.o \ + ../generic/prntdlgg.o \ + ../generic/progdlgg.o \ + ../generic/prop.o \ + ../generic/propform.o \ + ../generic/proplist.o \ + ../generic/sashwin.o \ + ../generic/scrolwin.o \ + ../generic/splitter.o \ + ../generic/statusbr.o \ + ../generic/tabg.o \ + ../generic/textdlgg.o \ + ../generic/tipdlg.o \ + ../generic/treectrl.o + +MOTIF_COMMONOBJS = \ + parser.o \ + ../common/choiccmn.o \ + ../common/cmndata.o \ + ../common/config.o \ + ../common/ctrlcmn.o \ + ../common/date.o \ + ../common/datstrm.o \ + ../common/db.o \ + ../common/dbtable.o \ + ../common/dcbase.o \ + ../common/dlgcmn.o \ + ../common/docmdi.o \ + ../common/docview.o \ + ../common/dynarray.o \ + ../common/dynlib.o \ + ../common/event.o \ + ../common/extended.o \ + ../common/ffile.o \ + ../common/file.o \ + ../common/fileconf.o \ + ../common/filefn.o \ + ../common/filesys.o \ + ../common/framecmn.o \ + ../common/fs_inet.o \ + ../common/fs_zip.o \ + ../common/ftp.o \ + ../common/gdicmn.o \ + ../common/hash.o \ + ../common/helpbase.o \ + ../common/http.o \ + ../common/imagbmp.o \ + ../common/image.o \ + ../common/imaggif.o \ + ../common/imagjpeg.o \ + ../common/imagpng.o \ + ../common/intl.o \ + ../common/ipcbase.o \ + ../common/layout.o \ + ../common/list.o \ + ../common/log.o \ + ../common/memory.o \ + ../common/mimetype.o \ + ../common/module.o \ + ../common/mstream.o \ + ../common/object.o \ + ../common/objstrm.o \ + ../common/odbc.o \ + ../common/paper.o \ + ../common/prntbase.o \ + ../common/process.o \ + ../common/protocol.o \ + ../common/resource.o \ + ../common/sckaddr.o \ + ../common/sckfile.o \ + ../common/sckipc.o \ + ../common/sckstrm.o \ + ../common/sizer.o \ + ../common/socket.o \ + ../common/strconv.o \ + ../common/stream.o \ + ../common/string.o \ + ../common/tbarbase.o \ + ../common/tbarsmpl.o \ + ../common/textcmn.o \ + ../common/textfile.o \ + ../common/time.o \ + ../common/timercmn.o \ + ../common/tokenzr.o \ + ../common/txtstrm.o \ + ../common/unzip.o \ + ../common/url.o \ + ../common/utilscmn.o \ + ../common/valgen.o \ + ../common/validate.o \ + ../common/valtext.o \ + ../common/variant.o \ + ../common/wfstream.o \ + ../common/wincmn.o \ + ../common/wxchar.o \ + ../common/wxexpr.o \ + ../common/zipstrm.o \ + ../common/zstream.o + +MOTIF_GUIOBJS = \ + ../motif/xmcombo/xmcombo.o \ + ../motif/accel.o \ + ../motif/app.o \ + ../motif/bitmap.o \ + ../motif/bmpbuttn.o \ + ../motif/brush.o \ + ../motif/button.o \ + ../motif/checkbox.o \ + ../motif/choice.o \ + ../motif/clipbrd.o \ + ../motif/colour.o \ + ../motif/combobox.o \ + ../motif/control.o \ + ../motif/cursor.o \ + ../motif/data.o \ + ../motif/dataobj.o \ + ../motif/dc.o \ + ../motif/dcclient.o \ + ../motif/dcmemory.o \ + ../motif/dcscreen.o \ + ../motif/dialog.o \ + ../motif/filedlg.o \ + ../motif/font.o \ + ../motif/frame.o \ + ../motif/gauge.o \ + ../motif/gdiobj.o \ + ../motif/gsockmot.o \ + ../motif/icon.o \ + ../motif/listbox.o \ + ../motif/main.o \ + ../motif/mdi.o \ + ../motif/menu.o \ + ../motif/menuitem.o \ + ../motif/minifram.o \ + ../motif/msgdlg.o \ + ../motif/palette.o \ + ../motif/pen.o \ + ../motif/radiobox.o \ + ../motif/radiobut.o \ + ../motif/region.o \ + ../motif/scrolbar.o \ + ../motif/settings.o \ + ../motif/slider.o \ + ../motif/statbmp.o \ + ../motif/statbox.o \ + ../motif/stattext.o \ + ../motif/textctrl.o \ + ../motif/timer.o \ + ../motif/toolbar.o \ + ../motif/utils.o \ + ../motif/window.o + +HTMLOBJS = \ + ../html/htmlcell.o \ + ../html/htmlfilter.o \ + ../html/htmlhelp.o \ + ../html/htmlhelp_io.o \ + ../html/htmlparser.o \ + ../html/htmltag.o \ + ../html/htmlwin.o \ + ../html/htmlwinparser.o \ + ../html/mod_fonts.o \ + ../html/mod_hline.o \ + ../html/mod_image.o \ + ../html/mod_layout.o \ + ../html/mod_links.o \ + ../html/mod_list.o \ + ../html/mod_pre.o \ + ../html/mod_tables.o \ + ../html/search.o + +UNIXOBJS = \ + ../unix/gsocket.o \ + ../unix/threadpsx.o \ + ../unix/utilsunx.o + +ZLIBOBJS = \ + ../zlib/adler32.o \ + ../zlib/compress.o \ + ../zlib/crc32.o \ + ../zlib/gzio.o \ + ../zlib/uncompr.o \ + ../zlib/deflate.o \ + ../zlib/trees.o \ + ../zlib/zutil.o \ + ../zlib/inflate.o \ + ../zlib/infblock.o \ + ../zlib/inftrees.o \ + ../zlib/infcodes.o \ + ../zlib/infutil.o \ + ../zlib/inffast.o + +PNGOBJS = \ + ../png/png.o \ + ../png/pngread.o \ + ../png/pngrtran.o \ + ../png/pngrutil.o \ + ../png/pngpread.o \ + ../png/pngtrans.o \ + ../png/pngwrite.o \ + ../png/pngwtran.o \ + ../png/pngwutil.o \ + ../png/pngerror.o \ + ../png/pngmem.o \ + ../png/pngwio.o \ + ../png/pngrio.o \ + ../png/pngget.o \ + ../png/pngset.o + + +JPEGOBJS = \ + ../jpeg/jcomapi.o \ + ../jpeg/jutils.o \ + ../jpeg/jerror.o \ + ../jpeg/jmemmgr.o \ + ../jpeg/jmemnobs.o \ + ../jpeg/jcapimin.o \ + ../jpeg/jcapistd.o \ + ../jpeg/jctrans.o \ + ../jpeg/jcparam.o \ + ../jpeg/jdatadst.o \ + ../jpeg/jcinit.o \ + ../jpeg/jcmaster.o \ + ../jpeg/jcmarker.o \ + ../jpeg/jcmainct.o \ + ../jpeg/jcprepct.o \ + ../jpeg/jccoefct.o \ + ../jpeg/jccolor.o \ + ../jpeg/jcsample.o \ + ../jpeg/jchuff.o \ + ../jpeg/jcphuff.o \ + ../jpeg/jcdctmgr.o \ + ../jpeg/jfdctfst.o \ + ../jpeg/jfdctflt.o \ + ../jpeg/jfdctint.o \ + ../jpeg/jdapimin.o \ + ../jpeg/jdapistd.o \ + ../jpeg/jdtrans.o \ + ../jpeg/jdatasrc.o \ + ../jpeg/jdmaster.o \ + ../jpeg/jdinput.o \ + ../jpeg/jdmarker.o \ + ../jpeg/jdhuff.o \ + ../jpeg/jdphuff.o \ + ../jpeg/jdmainct.o \ + ../jpeg/jdcoefct.o \ + ../jpeg/jdpostct.o \ + ../jpeg/jddctmgr.o \ + ../jpeg/jidctfst.o \ + ../jpeg/jidctflt.o \ + ../jpeg/jidctint.o \ + ../jpeg/jidctred.o \ + ../jpeg/jdsample.o \ + ../jpeg/jdcolor.o \ + ../jpeg/jquant1.o \ + ../jpeg/jquant2.o \ + ../jpeg/jdmerge.o + + +OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(HTMLOBJS) $(UNIXOBJS) \ + $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) + + +REQUIRED_DIRS = ../../lib ../../src ../../src/common ../../src/gtk ../../src/motif \ + ../../src/generic ../../src/unix ../../src/motif/xmombo ../../src/html \ + ../../src/zlib ../../src/jpeg ../../src/png + +all: $(REQUIRED_DIRS) $(OBJECTS) $(WXLIB) + +$(REQUIRED_DIRS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h + @if test ! -d ../../lib; then mkdir ../../lib; fi + @if test ! -d ../../src; then mkdir ../../src; fi + @if test ! -d ../../src/common; then mkdir ../../src/common; fi + @if test ! -d ../../src/gtk; then mkdir ../../src/gtk; fi + @if test ! -d ../../src/motif; then mkdir ../../src/motif; fi + @if test ! -d ../../src/motif/xmcombo; then mkdir ../../src/motif/xmcombo; fi + @if test ! -d ../../src/generic; then mkdir ../../src/generic; fi + @if test ! -d ../../src/unix; then mkdir ../../src/unix; fi + @if test ! -d ../../src/html; then mkdir ../../src/html; fi + @if test ! -d ../../src/png; then mkdir ../../src/png; fi + @if test ! -d ../../src/jpeg; then mkdir ../../src/jpeg; fi + @if test ! -d ../../src/zlib; then mkdir ../../src/zlib; fi + +$(WXLIB): $(OBJECTS) + @if test ! ../../samples/dialog.cpp; \ + then cp -f -r $(WXDIR)/samples ../..; \ + fi + $(AR) $(AROPTIONS) ../../lib/$@ $(OBJECTS) + $(RANLIB) ../../lib/$@ + +$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h + +parser.o: parser.c lexer.c + $(CCLEX) -c $(CFLAGS) -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.yy.c;lexer.l;g" < lex.yy.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.yy.c + +install: $(WXLIB) + +clean: + rm -f *.o + rm -f *.lo + rm -f parser.c + rm -f lexer.c + rm -f *.a + rm -f *.la + +cleanall: clean diff --git a/src/make.env b/src/make.env index 5e6354b265..9f2b554333 100644 --- a/src/make.env +++ b/src/make.env @@ -1,87 +1,115 @@ -# generic.env -# Linux/generic # -# Common makefile settings for wxWindows programs -# This file is included by all the other makefiles, thus changes -# made here take effect everywhere (except where overriden). -# RCS-ID: $Id$ +# File: make.env +# 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 # -########################### Programs ################################# -# Replace this with your own path if necessary -WXDIR = $(WXWIN) +########################### VERSION ################################# -# C++ compiler -CC = g++ +LIBS = ${top_builddir}/src/motif/libwx_motif.la -lpthread -L/usr/X11R6/lib -lXm -lXpm -lXmu -lXt -lX11 -ldl -lm -# C compiler -CCC = gcc +TOOLKIT = MOTIF -# Compiler for lex/yacc .c programs -CCLEX = $(CCC) +WXLIB = libwx_motif.a -LEX = lex -YACC = yacc -# Note: if using bison, use -y option for yacc compatibility -# YACC = bison -y -MAKE = make -AROPTIONS = ruv -RANLIB = ranlib +########################### VERSION ################################# + +WX_MAJOR_VERSION_NUMBER = 2 +WX_MINOR_VERSION_NUMBER = 1 +WX_RELEASE_NUMBER = 0 -############################ Switches ################################# +########################### Misc ################################# -# Debug/trace mode. 1 or more for debugging. -DEBUG = 1 -GUI = -D__WXSTUBS__ -D__UNIX__ -GUISUFFIX = _stubs +SHELL = /bin/sh -########################## Compiler flags ############################# +########################### Paths ################################# -# Misc options -OPTIONS = -D__LINUX__ -D__WXDEBUG__ -COPTIONS = -DEBUGFLAGS = # -ggdb -INCLUDE = -WARN = -Wall -Wno-unused # -w -CWARN = -Wall -Wno-unused # -w -OPT = -O2 +srcdir = ../src/motif -############################ Includes ################################# +top_srcdir = .. +prefix = /usr/local +exec_prefix = ${prefix} -# Compiler or system-specific include paths -COMPPATHS = -XINCLUDE = -I/usr/openwin/include -I/usr/include/X11 -I/usr/include/Xm \ - -I/usr/include/X11/Xm -I/usr/include -I/usr/local/include \ - -I/usr/lib/glib/include -I/usr/local/lib/glib/include -XLIB = -L/usr/local/X11/lib -L/usr/openwin/lib -L/usr/X11/lib -L/usr/X11R6/lib +bindir = ${exec_prefix}/bin +sbindir = ${exec_prefix}/sbin +libexecdir = ${exec_prefix}/libexec +datadir = ${prefix}/share +sysconfdir = ${prefix}/etc +sharedstatedir = ${prefix}/com +localstatedir = ${prefix}/var +libdir = ${exec_prefix}/lib +infodir = ${prefix}/info +mandir = ${prefix}/man +includedir = ${prefix}/include +oldincludedir = /usr/include -############################ Libraries ################################ +DESTDIR = -COMPLIBS = -lstdc++ -GUILDLIBS = -lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lXpm -lX11 -lm +pkgdatadir = $(datadir)/wxWindows +pkglibdir = $(libdir)/wxWindows +pkgincludedir = $(includedir)/wxWindows -############################# Suffixes ################################ +top_builddir = . -# Change cpp to c if you want to use main.c instead of main.cpp. -# Edit wx_setup.h accordingly (USE_C_MAIN=1) +INSTALL = /usr/bin/install -c +INSTALL_PROGRAM = ${INSTALL} +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_SCRIPT = ${INSTALL_PROGRAM} +transform = s,x,x, -OBJSUFF =o -SRCSUFF =cpp -MAINSUFF =cpp +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_alias = i586-pc-linux-gnu +build_triplet = i586-pc-linux-gnu +host_alias = i586-pc-linux-gnu +host_triplet = i586-pc-linux-gnu +target_alias = i586-pc-linux-gnu +target_triplet = i586-pc-linux-gnu -####################### No changes below this line #################### +EXTRA_VPATH = :$(srcdir)/../unix:${srcdir}/../zlib:${srcdir}/../png:${srcdir}/../jpeg -WXINC = $(WXDIR)/include -WXLIB = $(WXDIR)/lib/libwx$(GUISUFFIX).a -INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib $(COMPPATHS) +VPATH = .:${srcdir}:${srcdir}/../common:${srcdir}/../generic:${srcdir}/../html:${EXTRA_VPATH} -# Directory for object files -OBJDIR = objects$(GUISUFFIX) +########################### Programs ################################# -CPPFLAGS = $(EXTRACPPFLAGS) $(INC) $(XINCLUDE) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) -CFLAGS = $(EXTRACFLAGS) $(INC) $(XINCLUDE) $(COPTIONS) $(GUI) $(DEBUGFLAGS) $(CWARN) $(OPT) -LDFLAGS = $(EXTRALDFLAGS) $(XLIB) -L$(WXDIR)/lib -LDLIBS = $(EXTRALDLIBS) $(GUILDLIBS) +# C++ compiler +CC = c++ +CCPP = c++ -E + +# C compiler +CCC = gcc +CCCPP = gcc -E + +# Compiler for lex/yacc .c programs +CCLEX = gcc + +LEX = flex +YACC = bison -y +AR = ar +AS = +NM = /usr/bin/nm -B +LN_S = ln -s +STRIP = strip +MAKE = make +AROPTIONS = ruv +RANLIB = ranlib +LD = /usr/i486-linux/bin/ld +MAKEINFO = makeinfo + +########################### Flags ################################# + +CFLAGS = -D__WXMOTIF__ -fno-rtti -fno-exceptions -D_REENTRANT -O2 -I. -I${top_builddir}/include -I${top_srcdir}/include -I${srcdir}/../zlib -I${srcdir}/../png -I${srcdir}/../jpeg -I/usr/X11R6/include -I/usr/local/include +CPPFLAGS = -D__WXMOTIF__ -fno-rtti -fno-exceptions -D_REENTRANT -O2 -I. -I${top_builddir}/include -I${top_srcdir}/include -I${srcdir}/../zlib -I${srcdir}/../png -I${srcdir}/../jpeg -I/usr/X11R6/include -I/usr/local/include -Wall + +########################### Rules ################################# # Clears all default suffixes .SUFFIXES: .o .cpp .c @@ -92,32 +120,23 @@ LDLIBS = $(EXTRALDLIBS) $(GUILDLIBS) .cpp.o : $(CC) -c $(CPPFLAGS) -o $@ $< -.C.o : - $(CC) -c $(CPPFLAGS) -o $@ $< - -####################### Targets to allow multiple GUIs #################### - -dummy: - echo Use a target: one of motif, stubs - -stubs: - make -f makefile.unx all GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm' - -motif: - make -f makefile.unx all GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lpng -lzlib -lXm -lXmu -lXt -lXpm -lX11 -lm' +########################### Files ################################# -gtk: - make -f makefile.unx all GUI='-D__WXGTK__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk $(COMPLIBS) -ldl `gtk-config --libs` -lX11 -lm -pthread' +WXDIR = $(srcdir)/../.. -cleanstubs: - make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm' +# Subordinate library possibilities -cleanmotif: - make -f makefile.unx clean GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm' +GENDIR = $(WXDIR)/src/generic +COMMDIR = $(WXDIR)/src/common +HTMLDIR = $(WXDIR)/src/html +UNIXDIR = $(WXDIR)/src/unix +PNGDIR = $(WXDIR)/src/png +JPEGDIR = $(WXDIR)/src/jpeg +ZLIBDIR = $(WXDIR)/src/zlib +GTKDIR = $(WXDIR)/src/gtk +MOTIFDIR = $(WXDIR)/src/motif +INCDIR = $(WXDIR)/include -cleangtk: - make -f makefile.unx clean GUI='-D__WXGTK__ -D__UNIX__' GUISUFFIX='_gtk' +DOCDIR = $(WXDIR)/docs -$(OBJDIR): - mkdir $(OBJDIR) diff --git a/src/makelib.env b/src/makelib.env index 9b320bcd8b..e3c1354cd3 100644 --- a/src/makelib.env +++ b/src/makelib.env @@ -2,6 +2,7 @@ # Replace this with your own path if necessary WXDIR = $(WXWIN) + include $(WXDIR)/src/make.env all: $(LIBTARGET)$(GUISUFFIX).a diff --git a/src/makelib.env.in b/src/makelib.env.in new file mode 100644 index 0000000000..4d913a8cf4 --- /dev/null +++ b/src/makelib.env.in @@ -0,0 +1,19 @@ +# Makes a library in Unix (Motif) + +# Replace this with your own path if necessary +WXDIR = $(WXWIN) + +# this is for using the samples in ../samples/xxxxx +pretop_srcdir = @top_srcdir@ +top_srcdir = ../$(pretop_srcdir) +top_builddir = ../.. +include ../../src/make.env + +all: $(LIBTARGET).a + +$(LIBTARGET).a : $(OBJECTS) + ar $(AROPTIONS) $@ $(OBJECTS) + $(RANLIB) $@ + +clean: + rm -f $(OBJECTS) $(LIBTARGET).a core diff --git a/src/makelib.gtk b/src/makelib.gtk deleted file mode 100644 index 0c7e6eaac5..0000000000 --- a/src/makelib.gtk +++ /dev/null @@ -1,21 +0,0 @@ -# -# File: makelib.gtk -# Author: Robert Roebling -# Created: 1999 -# Updated: -# Copyright: (c) Robert Roebling, 1999 -# -# - -WXDIR = $(WXWIN) - -include $(WXDIR)/src/gtk.env - -all: $(LIBTARGET) - -$(LIBTARGET): $(OBJECTS) - ar $(AROPTIONS) $@ $(OBJECTS) - $(RANLIB) $@ - -clean: - rm -f $(OBJECTS) $(LIBTARGET) core *.rsc *.res diff --git a/src/makeprog.env b/src/makeprog.env index d0d653795e..118ae704ff 100644 --- a/src/makeprog.env +++ b/src/makeprog.env @@ -1,13 +1,14 @@ # Make environment for making samples on Unix + # Replace this with your own path if necessary WXDIR = $(WXWIN) -#WXDIR = /home/jacs/wx2 + include $(WXDIR)/src/make.env -all: $(PROGRAM)$(GUISUFFIX) $(EXTRATARGETS) +all: $(PROGRAM) -$(PROGRAM)$(GUISUFFIX): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o $(PROGRAM)$(GUISUFFIX) $(OBJECTS) $(LDLIBS) +$(PROGRAM): $(OBJECTS) $(WXLIB) + $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LDLIBS) clean: - rm -f $(OBJECTS) $(PROGRAM)$(GUISUFFIX) core + rm -f $(OBJECTS) $(PROGRAM) core diff --git a/src/makeprog.env.in b/src/makeprog.env.in new file mode 100644 index 0000000000..9bad0a0c9e --- /dev/null +++ b/src/makeprog.env.in @@ -0,0 +1,18 @@ +# Make environment for making samples on Unix + +# Replace this with your own path if necessary +WXDIR = $(WXWIN) + +# this is for using the samples in ../samples/xxxxx +pretop_srcdir = @top_srcdir@ +top_srcdir = ../$(pretop_srcdir) +top_builddir = ../.. +include ../../src/make.env + +all: $(PROGRAM) + +$(PROGRAM): $(OBJECTS) ../../lib/$(WXLIB) + $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LDLIBS) + +clean: + rm -f $(OBJECTS) $(PROGRAM) core diff --git a/src/makeprog.gtk b/src/makeprog.gtk deleted file mode 100644 index c9eabec96f..0000000000 --- a/src/makeprog.gtk +++ /dev/null @@ -1,13 +0,0 @@ -# Make environment for making samples for wxGTK - -WXDIR = $(WXWIN) - -include $(WXDIR)/src/gtk.env - -all: $(PROGRAM) - -$(PROGRAM): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LDLIBS) - -clean: - rm -f $(OBJECTS) $(PROGRAM) core diff --git a/src/motif/button.cpp b/src/motif/button.cpp index 144cb92156..44f1f521db 100644 --- a/src/motif/button.cpp +++ b/src/motif/button.cpp @@ -80,7 +80,17 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, (XtPointer) this); SetCanAddEventHandler(TRUE); - AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y); + + int x = 0; int y = 0; + wxFont new_font( parent->GetFont() ); + GetTextExtent( label1, &x, &y, (int*)NULL, (int*)NULL, &new_font ); + + wxSize newSize = size; + if (newSize.x == -1) newSize.x = 30+x; + if (newSize.y == -1) newSize.y = 27+y; + SetSize( newSize.x, newSize.y ); + + AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, newSize.x, newSize.y); ChangeBackgroundColour(); diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp index 712b2e5e66..cdd1571578 100644 --- a/src/motif/dialog.cpp +++ b/src/motif/dialog.cpp @@ -66,12 +66,13 @@ extern wxList wxPendingDelete; IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel) BEGIN_EVENT_TABLE(wxDialog, wxPanel) -EVT_BUTTON(wxID_OK, wxDialog::OnOK) -EVT_BUTTON(wxID_APPLY, wxDialog::OnApply) -EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel) -EVT_CHAR_HOOK(wxDialog::OnCharHook) -EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged) -EVT_CLOSE(wxDialog::OnCloseWindow) + EVT_SIZE(wxDialog::OnSize) + EVT_BUTTON(wxID_OK, wxDialog::OnOK) + EVT_BUTTON(wxID_APPLY, wxDialog::OnApply) + EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel) + EVT_CHAR_HOOK(wxDialog::OnCharHook) + EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged) + EVT_CLOSE(wxDialog::OnCloseWindow) END_EVENT_TABLE() #endif @@ -326,6 +327,45 @@ void wxDialog::Iconize(bool WXUNUSED(iconize)) // XtVaSetValues((Widget) m_mainWidget, XmNiconic, iconize, NULL); } +// Default resizing behaviour - if only ONE subwindow, +// resize to client rectangle size +void wxDialog::OnSize(wxSizeEvent& event) +{ + // if we're using constraints - do use them +#if wxUSE_CONSTRAINTS + if ( GetAutoLayout() ) { + Layout(); + return; + } +#endif + + // do we have _exactly_ one child? + wxWindow *child = NULL; + for ( wxNode *node = GetChildren().First(); node; node = node->Next() ) + { + wxWindow *win = (wxWindow *)node->Data(); + if ( !win->IsKindOf(CLASSINFO(wxFrame)) && + !win->IsKindOf(CLASSINFO(wxDialog)) ) + { + if ( child ) + return; // it's our second subwindow - nothing to do + child = win; + } + } + + if ( child ) { + // we have exactly one child - set it's size to fill the whole frame + int clientW, clientH; + GetClientSize(&clientW, &clientH); + + int x = 0; + int y = 0; + + child->SetSize(x, y, clientW, clientH); + } +} + + bool wxDialog::IsIconized() const { /* diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp index 82725c86d7..c18c7de83f 100644 --- a/src/motif/frame.cpp +++ b/src/motif/frame.cpp @@ -64,16 +64,16 @@ extern wxList wxPendingDelete; static bool wxTopLevelUsed = FALSE; #if !USE_SHARED_LIBRARY -BEGIN_EVENT_TABLE(wxFrame, wxWindow) -EVT_SIZE(wxFrame::OnSize) -EVT_ACTIVATE(wxFrame::OnActivate) -EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight) -EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) -EVT_IDLE(wxFrame::OnIdle) -EVT_CLOSE(wxFrame::OnCloseWindow) +BEGIN_EVENT_TABLE(wxFrame, wxWindowBase) + EVT_SIZE(wxFrame::OnSize) + EVT_ACTIVATE(wxFrame::OnActivate) + EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight) + EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) + EVT_IDLE(wxFrame::OnIdle) + EVT_CLOSE(wxFrame::OnCloseWindow) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) +IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindowBase) #endif #if wxUSE_NATIVE_STATUSBAR diff --git a/src/motif/makefile.unx.in b/src/motif/makefile.unx.in new file mode 100644 index 0000000000..2089c71ef0 --- /dev/null +++ b/src/motif/makefile.unx.in @@ -0,0 +1,612 @@ + +# +# I want this to be: +# $(INSTALL_DATA) $(INCDIR)/wx/window.h $(includedir)/wx/window.h +# +# foreach $file (sort keys %wxINCLUDE) { +# next if $wxINCLUDE{$file} =~ /\b(GTK|MSW|MOT|PM|MAC|GEN|HTM|UNX)\b/; +# +# $project{"WXINSTALLWX"} .= "$(INSTALL_DATA)" . " " . "\$(INCDIR)/wx/" . $file . " \$(includedir)/wx/" . $file . "\n" +# } +# +# +# +# This file was automatically generated by tmake at 19:48, 1999/08/10 +# 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 ../make.env + +########################### Paths ################################# + +srcdir = @srcdir@ + +VPATH = :$(srcdir) + +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@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +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@ + +############################# Dirs ################################# + +WXDIR = $(srcdir)/../.. + +# Subordinate library possibilities + +GENDIR = $(WXDIR)/src/generic +COMMDIR = $(WXDIR)/src/common +HTMLDIR = $(WXDIR)/src/html +UNIXDIR = $(WXDIR)/src/unix +PNGDIR = $(WXDIR)/src/png +JPEGDIR = $(WXDIR)/src/jpeg +ZLIBDIR = $(WXDIR)/src/zlib +GTKDIR = $(WXDIR)/src/gtk +MOTIFDIR = $(WXDIR)/src/motif +INCDIR = $(WXDIR)/include + +DOCDIR = $(WXDIR)/docs + +############################## Files ################################## + +GTK_GENERICOBJS = \ + ../generic/busyinfo.o \ + ../generic/caret.o \ + ../generic/colrdlgg.o \ + ../generic/dirdlgg.o \ + ../generic/extdlgg.o \ + ../generic/fontdlgg.o \ + ../generic/gridg.o \ + ../generic/imaglist.o \ + ../generic/laywin.o \ + ../generic/listctrl.o \ + ../generic/numdlgg.o \ + ../generic/panelg.o \ + ../generic/printps.o \ + ../generic/prntdlgg.o \ + ../generic/progdlgg.o \ + ../generic/prop.o \ + ../generic/propform.o \ + ../generic/proplist.o \ + ../generic/sashwin.o \ + ../generic/scrolwin.o \ + ../generic/splitter.o \ + ../generic/statusbr.o \ + ../generic/tipdlg.o \ + ../generic/treectrl.o + +GTK_COMMONOBJS = \ + parser.o \ + ../common/cmndata.o \ + ../common/config.o \ + ../common/date.o \ + ../common/datstrm.o \ + ../common/db.o \ + ../common/dbtable.o \ + ../common/dcbase.o \ + ../common/dlgcmn.o \ + ../common/docmdi.o \ + ../common/docview.o \ + ../common/dynarray.o \ + ../common/dynlib.o \ + ../common/event.o \ + ../common/extended.o \ + ../common/ffile.o \ + ../common/file.o \ + ../common/fileconf.o \ + ../common/filefn.o \ + ../common/filesys.o \ + ../common/framecmn.o \ + ../common/fs_inet.o \ + ../common/fs_zip.o \ + ../common/ftp.o \ + ../common/gdicmn.o \ + ../common/hash.o \ + ../common/helpbase.o \ + ../common/http.o \ + ../common/imagbmp.o \ + ../common/image.o \ + ../common/imaggif.o \ + ../common/imagjpeg.o \ + ../common/imagpng.o \ + ../common/intl.o \ + ../common/ipcbase.o \ + ../common/layout.o \ + ../common/list.o \ + ../common/log.o \ + ../common/memory.o \ + ../common/mimetype.o \ + ../common/module.o \ + ../common/mstream.o \ + ../common/object.o \ + ../common/objstrm.o \ + ../common/paper.o \ + ../common/prntbase.o \ + ../common/process.o \ + ../common/protocol.o \ + ../common/resource.o \ + ../common/sckaddr.o \ + ../common/sckfile.o \ + ../common/sckipc.o \ + ../common/sckstrm.o \ + ../common/sizer.o \ + ../common/socket.o \ + ../common/strconv.o \ + ../common/stream.o \ + ../common/string.o \ + ../common/tbarbase.o \ + ../common/tbarsmpl.o \ + ../common/textcmn.o \ + ../common/textfile.o \ + ../common/time.o \ + ../common/timercmn.o \ + ../common/tokenzr.o \ + ../common/txtstrm.o \ + ../common/unzip.o \ + ../common/url.o \ + ../common/utilscmn.o \ + ../common/valgen.o \ + ../common/validate.o \ + ../common/valtext.o \ + ../common/variant.o \ + ../common/wfstream.o \ + ../common/wincmn.o \ + ../common/wxchar.o \ + ../common/wxexpr.o \ + ../common/zipstrm.o \ + ../common/zstream.o + +GTK_GUIOBJS = \ + ../gtk/accel.o \ + ../gtk/app.o \ + ../gtk/bitmap.o \ + ../gtk/bmpbuttn.o \ + ../gtk/brush.o \ + ../gtk/button.o \ + ../gtk/checkbox.o \ + ../gtk/checklst.o \ + ../gtk/choicdlg.o \ + ../gtk/choice.o \ + ../gtk/clipbrd.o \ + ../gtk/colour.o \ + ../gtk/combobox.o \ + ../gtk/control.o \ + ../gtk/cursor.o \ + ../gtk/data.o \ + ../gtk/dataobj.o \ + ../gtk/dc.o \ + ../gtk/dcclient.o \ + ../gtk/dcmemory.o \ + ../gtk/dcscreen.o \ + ../gtk/dialog.o \ + ../gtk/dnd.o \ + ../gtk/filedlg.o \ + ../gtk/font.o \ + ../gtk/frame.o \ + ../gtk/gauge.o \ + ../gtk/gdiobj.o \ + ../gtk/gsockgtk.o \ + ../gtk/icon.o \ + ../gtk/listbox.o \ + ../gtk/main.o \ + ../gtk/mdi.o \ + ../gtk/menu.o \ + ../gtk/minifram.o \ + ../gtk/msgdlg.o \ + ../gtk/notebook.o \ + ../gtk/palette.o \ + ../gtk/pen.o \ + ../gtk/radiobox.o \ + ../gtk/radiobut.o \ + ../gtk/region.o \ + ../gtk/scrolbar.o \ + ../gtk/settings.o \ + ../gtk/slider.o \ + ../gtk/spinbutt.o \ + ../gtk/statbmp.o \ + ../gtk/statbox.o \ + ../gtk/statline.o \ + ../gtk/stattext.o \ + ../gtk/tbargtk.o \ + ../gtk/textctrl.o \ + ../gtk/textdlg.o \ + ../gtk/timer.o \ + ../gtk/tooltip.o \ + ../gtk/utilsgtk.o \ + ../gtk/utilsres.o \ + ../gtk/wave.o \ + ../gtk/win_gtk.o \ + ../gtk/window.o + +MOTIF_GENERICOBJS = \ + ../generic/busyinfo.o \ + ../generic/caret.o \ + ../generic/choicdgg.o \ + ../generic/colrdlgg.o \ + ../generic/dirdlgg.o \ + ../generic/extdlgg.o \ + ../generic/fontdlgg.o \ + ../generic/gridg.o \ + ../generic/helpxlp.o \ + ../generic/imaglist.o \ + ../generic/laywin.o \ + ../generic/listctrl.o \ + ../generic/msgdlgg.o \ + ../generic/notebook.o \ + ../generic/numdlgg.o \ + ../generic/panelg.o \ + ../generic/printps.o \ + ../generic/prntdlgg.o \ + ../generic/progdlgg.o \ + ../generic/prop.o \ + ../generic/propform.o \ + ../generic/proplist.o \ + ../generic/sashwin.o \ + ../generic/scrolwin.o \ + ../generic/splitter.o \ + ../generic/statusbr.o \ + ../generic/tabg.o \ + ../generic/textdlgg.o \ + ../generic/tipdlg.o \ + ../generic/treectrl.o + +MOTIF_COMMONOBJS = \ + parser.o \ + ../common/choiccmn.o \ + ../common/cmndata.o \ + ../common/config.o \ + ../common/ctrlcmn.o \ + ../common/date.o \ + ../common/datstrm.o \ + ../common/db.o \ + ../common/dbtable.o \ + ../common/dcbase.o \ + ../common/dlgcmn.o \ + ../common/docmdi.o \ + ../common/docview.o \ + ../common/dynarray.o \ + ../common/dynlib.o \ + ../common/event.o \ + ../common/extended.o \ + ../common/ffile.o \ + ../common/file.o \ + ../common/fileconf.o \ + ../common/filefn.o \ + ../common/filesys.o \ + ../common/framecmn.o \ + ../common/fs_inet.o \ + ../common/fs_zip.o \ + ../common/ftp.o \ + ../common/gdicmn.o \ + ../common/hash.o \ + ../common/helpbase.o \ + ../common/http.o \ + ../common/imagbmp.o \ + ../common/image.o \ + ../common/imaggif.o \ + ../common/imagjpeg.o \ + ../common/imagpng.o \ + ../common/intl.o \ + ../common/ipcbase.o \ + ../common/layout.o \ + ../common/list.o \ + ../common/log.o \ + ../common/memory.o \ + ../common/mimetype.o \ + ../common/module.o \ + ../common/mstream.o \ + ../common/object.o \ + ../common/objstrm.o \ + ../common/odbc.o \ + ../common/paper.o \ + ../common/prntbase.o \ + ../common/process.o \ + ../common/protocol.o \ + ../common/resource.o \ + ../common/sckaddr.o \ + ../common/sckfile.o \ + ../common/sckipc.o \ + ../common/sckstrm.o \ + ../common/sizer.o \ + ../common/socket.o \ + ../common/strconv.o \ + ../common/stream.o \ + ../common/string.o \ + ../common/tbarbase.o \ + ../common/tbarsmpl.o \ + ../common/textcmn.o \ + ../common/textfile.o \ + ../common/time.o \ + ../common/timercmn.o \ + ../common/tokenzr.o \ + ../common/txtstrm.o \ + ../common/unzip.o \ + ../common/url.o \ + ../common/utilscmn.o \ + ../common/valgen.o \ + ../common/validate.o \ + ../common/valtext.o \ + ../common/variant.o \ + ../common/wfstream.o \ + ../common/wincmn.o \ + ../common/wxchar.o \ + ../common/wxexpr.o \ + ../common/zipstrm.o \ + ../common/zstream.o + +MOTIF_GUIOBJS = \ + ../motif/xmcombo/xmcombo.o \ + ../motif/accel.o \ + ../motif/app.o \ + ../motif/bitmap.o \ + ../motif/bmpbuttn.o \ + ../motif/brush.o \ + ../motif/button.o \ + ../motif/checkbox.o \ + ../motif/choice.o \ + ../motif/clipbrd.o \ + ../motif/colour.o \ + ../motif/combobox.o \ + ../motif/control.o \ + ../motif/cursor.o \ + ../motif/data.o \ + ../motif/dataobj.o \ + ../motif/dc.o \ + ../motif/dcclient.o \ + ../motif/dcmemory.o \ + ../motif/dcscreen.o \ + ../motif/dialog.o \ + ../motif/filedlg.o \ + ../motif/font.o \ + ../motif/frame.o \ + ../motif/gauge.o \ + ../motif/gdiobj.o \ + ../motif/gsockmot.o \ + ../motif/icon.o \ + ../motif/listbox.o \ + ../motif/main.o \ + ../motif/mdi.o \ + ../motif/menu.o \ + ../motif/menuitem.o \ + ../motif/minifram.o \ + ../motif/msgdlg.o \ + ../motif/palette.o \ + ../motif/pen.o \ + ../motif/radiobox.o \ + ../motif/radiobut.o \ + ../motif/region.o \ + ../motif/scrolbar.o \ + ../motif/settings.o \ + ../motif/slider.o \ + ../motif/statbmp.o \ + ../motif/statbox.o \ + ../motif/stattext.o \ + ../motif/textctrl.o \ + ../motif/timer.o \ + ../motif/toolbar.o \ + ../motif/utils.o \ + ../motif/window.o + +HTMLOBJS = \ + ../html/htmlcell.o \ + ../html/htmlfilter.o \ + ../html/htmlhelp.o \ + ../html/htmlhelp_io.o \ + ../html/htmlparser.o \ + ../html/htmltag.o \ + ../html/htmlwin.o \ + ../html/htmlwinparser.o \ + ../html/mod_fonts.o \ + ../html/mod_hline.o \ + ../html/mod_image.o \ + ../html/mod_layout.o \ + ../html/mod_links.o \ + ../html/mod_list.o \ + ../html/mod_pre.o \ + ../html/mod_tables.o \ + ../html/search.o + +UNIXOBJS = \ + ../unix/gsocket.o \ + ../unix/threadpsx.o \ + ../unix/utilsunx.o + +ZLIBOBJS = \ + ../zlib/adler32.o \ + ../zlib/compress.o \ + ../zlib/crc32.o \ + ../zlib/gzio.o \ + ../zlib/uncompr.o \ + ../zlib/deflate.o \ + ../zlib/trees.o \ + ../zlib/zutil.o \ + ../zlib/inflate.o \ + ../zlib/infblock.o \ + ../zlib/inftrees.o \ + ../zlib/infcodes.o \ + ../zlib/infutil.o \ + ../zlib/inffast.o + +PNGOBJS = \ + ../png/png.o \ + ../png/pngread.o \ + ../png/pngrtran.o \ + ../png/pngrutil.o \ + ../png/pngpread.o \ + ../png/pngtrans.o \ + ../png/pngwrite.o \ + ../png/pngwtran.o \ + ../png/pngwutil.o \ + ../png/pngerror.o \ + ../png/pngmem.o \ + ../png/pngwio.o \ + ../png/pngrio.o \ + ../png/pngget.o \ + ../png/pngset.o + + +JPEGOBJS = \ + ../jpeg/jcomapi.o \ + ../jpeg/jutils.o \ + ../jpeg/jerror.o \ + ../jpeg/jmemmgr.o \ + ../jpeg/jmemnobs.o \ + ../jpeg/jcapimin.o \ + ../jpeg/jcapistd.o \ + ../jpeg/jctrans.o \ + ../jpeg/jcparam.o \ + ../jpeg/jdatadst.o \ + ../jpeg/jcinit.o \ + ../jpeg/jcmaster.o \ + ../jpeg/jcmarker.o \ + ../jpeg/jcmainct.o \ + ../jpeg/jcprepct.o \ + ../jpeg/jccoefct.o \ + ../jpeg/jccolor.o \ + ../jpeg/jcsample.o \ + ../jpeg/jchuff.o \ + ../jpeg/jcphuff.o \ + ../jpeg/jcdctmgr.o \ + ../jpeg/jfdctfst.o \ + ../jpeg/jfdctflt.o \ + ../jpeg/jfdctint.o \ + ../jpeg/jdapimin.o \ + ../jpeg/jdapistd.o \ + ../jpeg/jdtrans.o \ + ../jpeg/jdatasrc.o \ + ../jpeg/jdmaster.o \ + ../jpeg/jdinput.o \ + ../jpeg/jdmarker.o \ + ../jpeg/jdhuff.o \ + ../jpeg/jdphuff.o \ + ../jpeg/jdmainct.o \ + ../jpeg/jdcoefct.o \ + ../jpeg/jdpostct.o \ + ../jpeg/jddctmgr.o \ + ../jpeg/jidctfst.o \ + ../jpeg/jidctflt.o \ + ../jpeg/jidctint.o \ + ../jpeg/jidctred.o \ + ../jpeg/jdsample.o \ + ../jpeg/jdcolor.o \ + ../jpeg/jquant1.o \ + ../jpeg/jquant2.o \ + ../jpeg/jdmerge.o + + +OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(HTMLOBJS) $(UNIXOBJS) \ + $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) + + +REQUIRED_DIRS = ../../lib ../../src ../../src/common ../../src/gtk ../../src/motif \ + ../../src/generic ../../src/unix ../../src/motif/xmombo ../../src/html \ + ../../src/zlib ../../src/jpeg ../../src/png + +all: $(REQUIRED_DIRS) $(OBJECTS) $(WXLIB) + +$(REQUIRED_DIRS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h + @if test ! -d ../../lib; then mkdir ../../lib; fi + @if test ! -d ../../src; then mkdir ../../src; fi + @if test ! -d ../../src/common; then mkdir ../../src/common; fi + @if test ! -d ../../src/gtk; then mkdir ../../src/gtk; fi + @if test ! -d ../../src/motif; then mkdir ../../src/motif; fi + @if test ! -d ../../src/motif/xmcombo; then mkdir ../../src/motif/xmcombo; fi + @if test ! -d ../../src/generic; then mkdir ../../src/generic; fi + @if test ! -d ../../src/unix; then mkdir ../../src/unix; fi + @if test ! -d ../../src/html; then mkdir ../../src/html; fi + @if test ! -d ../../src/png; then mkdir ../../src/png; fi + @if test ! -d ../../src/jpeg; then mkdir ../../src/jpeg; fi + @if test ! -d ../../src/zlib; then mkdir ../../src/zlib; fi + +$(WXLIB): $(OBJECTS) + @if test ! ../../samples/dialog.cpp; \ + then cp -f -r $(WXDIR)/samples ../..; \ + fi + $(AR) $(AROPTIONS) ../../lib/$@ $(OBJECTS) + $(RANLIB) ../../lib/$@ + +$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h + +parser.o: parser.c lexer.c + $(CCLEX) -c $(CFLAGS) -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.yy.c;lexer.l;g" < lex.yy.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.yy.c + +install: $(WXLIB) + +clean: + rm -f *.o + rm -f *.lo + rm -f parser.c + rm -f lexer.c + rm -f *.a + rm -f *.la + +cleanall: clean diff --git a/src/motif/window.cpp b/src/motif/window.cpp index f7ed6cb2bb..5ac4f203aa 100644 --- a/src/motif/window.cpp +++ b/src/motif/window.cpp @@ -117,9 +117,9 @@ static int str16len(const char *s) // ---------------------------------------------------------------------------- #if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler) + IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase) - BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler) + BEGIN_EVENT_TABLE(wxWindow, wxWindowBase) EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged) EVT_IDLE(wxWindow::OnIdle) END_EVENT_TABLE() @@ -1384,12 +1384,12 @@ void wxWindow::GetTextExtent(const wxString& string, fontToUse = (wxFont *) & m_font; wxCHECK_RET( fontToUse->Ok(), "valid window font needed" ); - + WXFontStructPtr pFontStruct = theFont->GetFontStruct(1.0, GetXDisplay()); int direction, ascent, descent2; XCharStruct overall; - int slen; + int slen = string.Len(); #if 0 if (use16) @@ -1408,6 +1408,7 @@ void wxWindow::GetTextExtent(const wxString& string, *descent = descent2; if (externalLeading) *externalLeading = 0; + } // ---------------------------------------------------------------------------- -- 2.45.2