added wxXPMHandler

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

diff --git a/src/gtk/files.lst b/src/gtk/files.lst
index 2119fe47e1840e516baf2d0482bdea9900dc36c5..ac821b2c49d7a223bf11904246d56922401d4279 100644 (file)
--- a/src/gtk/files.lst
+++ b/src/gtk/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 19:20, 2001/02/08
+# This file was automatically generated by tmake at 00:30, 2001/04/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
@@ -22,6 +22,7 @@ ALL_SOURCES = \
                generic/logg.cpp \
                generic/msgdlgg.cpp \
                generic/numdlgg.cpp \
+               generic/paletteg.cpp \
                generic/panelg.cpp \
                generic/printps.cpp \
                generic/prntdlgg.cpp \
@@ -95,6 +96,7 @@ ALL_SOURCES = \
                common/imagpng.cpp \
                common/imagpnm.cpp \
                common/imagtiff.cpp \
+               common/imagxpm.cpp \
                common/intl.cpp \
                common/ipcbase.cpp \
                common/layout.cpp \
@@ -182,7 +184,6 @@ ALL_SOURCES = \
                gtk/menu.cpp \
                gtk/minifram.cpp \
                gtk/notebook.cpp \
-               gtk/palette.cpp \
                gtk/pen.cpp \
                gtk/radiobox.cpp \
                gtk/radiobut.cpp \
@@ -486,7 +487,6 @@ ALL_HEADERS = \
                gtk/menuitem.h \
                gtk/minifram.h \
                gtk/notebook.h \
-               gtk/palette.h \
                gtk/pen.h \
                gtk/radiobox.h \
                gtk/radiobut.h \
@@ -530,6 +530,7 @@ ALL_HEADERS = \
                generic/listctrl.h \
                generic/msgdlgg.h \
                generic/notebook.h \
+               generic/paletteg.h \
                generic/panelg.h \
                generic/printps.h \
                generic/prntdlgg.h \
@@ -620,6 +621,7 @@ COMMONOBJS = \
                imagpng.o \
                imagpnm.o \
                imagtiff.o \
+               imagxpm.o \
                intl.o \
                ipcbase.o \
                layout.o \
@@ -727,6 +729,7 @@ COMMONDEPS = \
                imagpng.d \
                imagpnm.d \
                imagtiff.d \
+               imagxpm.d \
                intl.d \
                ipcbase.d \
                layout.d \
@@ -801,6 +804,7 @@ GENERICOBJS = \
                logg.o \
                msgdlgg.o \
                numdlgg.o \
+               paletteg.o \
                panelg.o \
                printps.o \
                prntdlgg.o \
@@ -844,6 +848,7 @@ GENERICDEPS = \
                logg.d \
                msgdlgg.d \
                numdlgg.d \
+               paletteg.d \
                panelg.d \
                printps.d \
                prntdlgg.d \
@@ -902,7 +907,6 @@ GUIOBJS = \
                menu.o \
                minifram.o \
                notebook.o \
-               palette.o \
                pen.o \
                radiobox.o \
                radiobut.o \
@@ -964,7 +968,6 @@ GUIDEPS = \
                menu.d \
                minifram.d \
                notebook.d \
-               palette.d \
                pen.d \
                radiobox.d \
                radiobut.d \

diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst
index 2119fe47e1840e516baf2d0482bdea9900dc36c5..ac821b2c49d7a223bf11904246d56922401d4279 100644 (file)
--- a/src/gtk1/files.lst
+++ b/src/gtk1/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 19:20, 2001/02/08
+# This file was automatically generated by tmake at 00:30, 2001/04/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
@@ -22,6 +22,7 @@ ALL_SOURCES = \
                generic/logg.cpp \
                generic/msgdlgg.cpp \
                generic/numdlgg.cpp \
+               generic/paletteg.cpp \
                generic/panelg.cpp \
                generic/printps.cpp \
                generic/prntdlgg.cpp \
@@ -95,6 +96,7 @@ ALL_SOURCES = \
                common/imagpng.cpp \
                common/imagpnm.cpp \
                common/imagtiff.cpp \
+               common/imagxpm.cpp \
                common/intl.cpp \
                common/ipcbase.cpp \
                common/layout.cpp \
@@ -182,7 +184,6 @@ ALL_SOURCES = \
                gtk/menu.cpp \
                gtk/minifram.cpp \
                gtk/notebook.cpp \
-               gtk/palette.cpp \
                gtk/pen.cpp \
                gtk/radiobox.cpp \
                gtk/radiobut.cpp \
@@ -486,7 +487,6 @@ ALL_HEADERS = \
                gtk/menuitem.h \
                gtk/minifram.h \
                gtk/notebook.h \
-               gtk/palette.h \
                gtk/pen.h \
                gtk/radiobox.h \
                gtk/radiobut.h \
@@ -530,6 +530,7 @@ ALL_HEADERS = \
                generic/listctrl.h \
                generic/msgdlgg.h \
                generic/notebook.h \
+               generic/paletteg.h \
                generic/panelg.h \
                generic/printps.h \
                generic/prntdlgg.h \
@@ -620,6 +621,7 @@ COMMONOBJS = \
                imagpng.o \
                imagpnm.o \
                imagtiff.o \
+               imagxpm.o \
                intl.o \
                ipcbase.o \
                layout.o \
@@ -727,6 +729,7 @@ COMMONDEPS = \
                imagpng.d \
                imagpnm.d \
                imagtiff.d \
+               imagxpm.d \
                intl.d \
                ipcbase.d \
                layout.d \
@@ -801,6 +804,7 @@ GENERICOBJS = \
                logg.o \
                msgdlgg.o \
                numdlgg.o \
+               paletteg.o \
                panelg.o \
                printps.o \
                prntdlgg.o \
@@ -844,6 +848,7 @@ GENERICDEPS = \
                logg.d \
                msgdlgg.d \
                numdlgg.d \
+               paletteg.d \
                panelg.d \
                printps.d \
                prntdlgg.d \
@@ -902,7 +907,6 @@ GUIOBJS = \
                menu.o \
                minifram.o \
                notebook.o \
-               palette.o \
                pen.o \
                radiobox.o \
                radiobut.o \
@@ -964,7 +968,6 @@ GUIDEPS = \
                menu.d \
                minifram.d \
                notebook.d \
-               palette.d \
                pen.d \
                radiobox.d \
                radiobut.d \

diff --git a/src/motif/files.lst b/src/motif/files.lst
index 81878b1fd579e36417557264ac23cbfefbdafc79..0ced77cee0728e08b9dfd2d20e61672120902e8a 100644 (file)
--- a/src/motif/files.lst
+++ b/src/motif/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 19:20, 2001/02/08
+# This file was automatically generated by tmake at 00:30, 2001/04/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
@@ -98,6 +98,7 @@ ALL_SOURCES = \
                common/imagpng.cpp \
                common/imagpnm.cpp \
                common/imagtiff.cpp \
+               common/imagxpm.cpp \
                common/intl.cpp \
                common/ipcbase.cpp \
                common/layout.cpp \
@@ -525,6 +526,7 @@ ALL_HEADERS = \
                generic/listctrl.h \
                generic/msgdlgg.h \
                generic/notebook.h \
+               generic/paletteg.h \
                generic/panelg.h \
                generic/printps.h \
                generic/prntdlgg.h \
@@ -615,6 +617,7 @@ COMMONOBJS = \
                imagpng.o \
                imagpnm.o \
                imagtiff.o \
+               imagxpm.o \
                intl.o \
                ipcbase.o \
                layout.o \
@@ -722,6 +725,7 @@ COMMONDEPS = \
                imagpng.d \
                imagpnm.d \
                imagtiff.d \
+               imagxpm.d \
                intl.d \
                ipcbase.d \
                layout.d \

diff --git a/src/msw/files.lst b/src/msw/files.lst
index 9362b4ecef39abc7ba809a0a6b007aa3d71746ae..afe050603699f19586507262b9ab73378a545717 100644 (file)
--- a/src/msw/files.lst
+++ b/src/msw/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 19:20, 2001/02/08
+# This file was automatically generated by tmake at 19:15, 2001/02/16
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index ff2944ef8c4ce59443d6c4bcd0b09f9e630518a3..0f00b93184565e92acb1664d12608ee6b46bdca1 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 19:20, 2001/02/08
+# This file was automatically generated by tmake at 00:30, 2001/04/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -172,6 +172,7 @@ COMMONOBJS = \
                $(MSWDIR)\imagpng.obj \
                $(MSWDIR)\imagpnm.obj \
                $(MSWDIR)\imagtiff.obj \
+               $(MSWDIR)\imagxpm.obj \
                $(MSWDIR)\intl.obj \
                $(MSWDIR)\ipcbase.obj \
                $(MSWDIR)\layout.obj \
@@ -713,6 +714,8 @@ $(MSWDIR)\imagpnm.obj: $(COMMDIR)\imagpnm.$(SRCSUFF)
 
 $(MSWDIR)\imagtiff.obj: $(COMMDIR)\imagtiff.$(SRCSUFF)
 
+$(MSWDIR)\imagxpm.obj: $(COMMDIR)\imagxpm.$(SRCSUFF)
+
 $(MSWDIR)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF)
 
 $(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF)
@@ -1023,8 +1026,6 @@ $(CFG): makefile.b32
 -D__WXMSW__
 -D__WINDOWS__
 -DWIN32
--DWINVER=0x0400
--D_WIN32_WINNT=0x0400
 $(OPT)
 $(DEBUG_FLAGS)
 $(WIN95FLAG)

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index c97f22283597a7be4b911b9396c1c9d32fd58fe4..90a8b10170866fe8dcffc872cfcf6ca7bf5ce7ed 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 19:20, 2001/02/08
+# This file was automatically generated by tmake at 00:30, 2001/04/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -120,8 +120,6 @@ COMMONOBJS = \
                $(MSWDIR)\ctrlsub.obj \
                $(MSWDIR)\datetime.obj \
                $(MSWDIR)\datstrm.obj \
-               $(MSWDIR)\db.obj \
-               $(MSWDIR)\dbtable.obj \
                $(MSWDIR)\dcbase.obj \
                $(MSWDIR)\dlgcmn.obj \
                $(MSWDIR)\dndcmn.obj \
@@ -508,10 +506,6 @@ $(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF)
 
 $(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)
 
-$(MSWDIR)\db.obj: $(COMMDIR)\db.$(SRCSUFF)
-
-$(MSWDIR)\dbtable.obj: $(COMMDIR)\dbtable.$(SRCSUFF)
-
 $(MSWDIR)\dcbase.obj: $(COMMDIR)\dcbase.$(SRCSUFF)
 
 $(MSWDIR)\dlgcmn.obj: $(COMMDIR)\dlgcmn.$(SRCSUFF)

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index c858177a4392240244dec045ab283b5b4087e4ef..6709b91a51c8947d895bc9d921d5a75e54c85772 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 19:20, 2001/02/08
+# This file was automatically generated by tmake at 00:30, 2001/04/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -105,8 +105,6 @@ COMMONOBJS1 = \
                $(COMMDIR)\ctrlsub.obj \
                $(COMMDIR)\datetime.obj \
                $(COMMDIR)\datstrm.obj \
-               $(COMMDIR)\db.obj \
-               $(COMMDIR)\dbtable.obj \
                $(COMMDIR)\dcbase.obj \
                $(COMMDIR)\dlgcmn.obj \
                $(COMMDIR)\dndcmn.obj \
@@ -817,16 +815,6 @@ $(COMMDIR)/datstrm.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/db.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(COMMDIR)/dbtable.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(COMMDIR)/dcbase.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index dc1890ba3db750383d2589a006dbe8e125bbe209..f08fdb1ca2f1d08fc143182429a90886beb916f0 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 19:20, 2001/02/08
+# This file was automatically generated by tmake at 00:30, 2001/04/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -152,6 +152,7 @@ COMMONOBJS  = \
                $(COMMDIR)/imagpng.$(OBJSUFF) \
                $(COMMDIR)/imagpnm.$(OBJSUFF) \
                $(COMMDIR)/imagtiff.$(OBJSUFF) \
+               $(COMMDIR)/imagxpm.$(OBJSUFF) \
                $(COMMDIR)/intl.$(OBJSUFF) \
                $(COMMDIR)/ipcbase.$(OBJSUFF) \
                $(COMMDIR)/layout.$(OBJSUFF) \
@@ -637,3 +638,4 @@ ifneq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
        -$(RM) wx.exp
 endif
 endif
+

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index c4706912c28ebd7cd17da646bd9d7efe6b9c105a..08f3e71628a190d46b6bca71cc8a08c71d8a18e3 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 19:20, 2001/02/08
+# This file was automatically generated by tmake at 00:30, 2001/04/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
@@ -109,6 +109,7 @@ COMMONOBJS = \
                $(COMMDIR)\imagpng.obj \
                $(COMMDIR)\imagpnm.obj \
                $(COMMDIR)\imagtiff.obj \
+               $(COMMDIR)\imagxpm.obj \
                $(COMMDIR)\intl.obj \
                $(COMMDIR)\ipcbase.obj \
                $(COMMDIR)\layout.obj \

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 297b4118c6e0e14dc9c288d0eae87c43e10f14a0..8a4aa27ca48178164e5a3ff1f5002bbffca5d2c7 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 19:20, 2001/02/08
+# This file was automatically generated by tmake at 00:30, 2001/04/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -127,6 +127,7 @@ NONESSENTIALOBJS= ..\generic\$D\caret.obj \
                ..\generic\$D\listctrl.obj \
                ..\generic\$D\msgdlgg.obj \
                ..\generic\$D\notebook.obj \
+               ..\generic\$D\paletteg.obj \
                ..\generic\$D\printps.obj \
                ..\generic\$D\prntdlgg.obj \
                ..\generic\$D\statline.obj \
@@ -187,6 +188,7 @@ COMMONOBJS = \
                ..\common\$D\imagpng.obj \
                ..\common\$D\imagpnm.obj \
                ..\common\$D\imagtiff.obj \
+               ..\common\$D\imagxpm.obj \
                ..\common\$D\intl.obj \
                ..\common\$D\ipcbase.obj \
                ..\common\$D\layout.obj \
@@ -379,7 +381,6 @@ setuph:
 
 dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
 
-
 $D:
     mkdir $D
 
@@ -550,16 +551,6 @@ $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\treectrl.obj /c /Tp $(MSWDIR)\treectrl.cpp
 $(CPPFLAGS2) /Od /Fo$(HTMLDIR)\$D\helpfrm.obj /c /Tp $(HTMLDIR)\helpfrm.cpp
 <<
 
-# If taking wxWindows from CVS, setup.h doesn't exist yet.
-# Actually the 'if not exist setup.h' test doesn't work
-# (copies the file anyway)
-# we'll have to comment this rule out.
-
-# $(WXDIR)\include\wx\msw\setup.h: $(WXDIR)\include\wx\msw\setup0.h
-#    cd "$(WXDIR)"\include\wx\msw
-#    if not exist setup.h copy setup0.h setup.h
-#    cd "$(WXDIR)"\src\msw
-
 ..\common\$D\y_tab.obj:     ..\common\y_tab.c ..\common\lex_yy.c
         cl @<<
 $(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 6436a9474830dbd9e6b43c8cae1d750ada5c70eb..8ca8d7dcdc38b5be546ea139b76284dacf2ffa0f 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
-# This file was automatically generated by tmake at 19:20, 2001/02/08
+# This file was automatically generated by tmake at 00:30, 2001/04/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -85,6 +85,7 @@ NONESSENTIALOBJS= caret.obj &
        listctrl.obj &
        msgdlgg.obj &
        notebook.obj &
+       paletteg.obj &
        printps.obj &
        prntdlgg.obj &
        statline.obj &
@@ -145,6 +146,7 @@ COMMONOBJS = &
        imagpng.obj &
        imagpnm.obj &
        imagtiff.obj &
+       imagxpm.obj &
        intl.obj &
        ipcbase.obj &
        layout.obj &
@@ -812,6 +814,9 @@ imagpnm.obj:     $(COMMDIR)\imagpnm.cpp
 imagtiff.obj:     $(COMMDIR)\imagtiff.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+imagxpm.obj:     $(COMMDIR)\imagxpm.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 intl.obj:     $(COMMDIR)\intl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

diff --git a/src/os2/files.lst b/src/os2/files.lst
index df11ea1fd6b7f4cd13dfa300a395ac4a893584b5..3a6e02ca5d7d5e375113365669f6b82c0d8e8862 100644 (file)
--- a/src/os2/files.lst
+++ b/src/os2/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 13:01, 2001/03/22
+# This file was automatically generated by tmake at 00:31, 2001/04/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE OS2.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
@@ -92,6 +92,7 @@ ALL_SOURCES = \
                common/imagpng.cpp \
                common/imagpnm.cpp \
                common/imagtiff.cpp \
+               common/imagxpm.cpp \
                common/intl.cpp \
                common/ipcbase.cpp \
                common/layout.cpp \
@@ -220,7 +221,6 @@ ALL_SOURCES = \
                os2/utilsexc.cpp \
                os2/wave.cpp \
                os2/window.cpp \
-               os2/xpmhand.cpp \
                html/helpctrl.cpp \
                html/helpdata.cpp \
                html/helpfrm.cpp \
@@ -548,6 +548,7 @@ ALL_HEADERS = \
                generic/listctrl.h \
                generic/msgdlgg.h \
                generic/notebook.h \
+               generic/paletteg.h \
                generic/panelg.h \
                generic/printps.h \
                generic/prntdlgg.h \
@@ -634,6 +635,7 @@ COMMONOBJS = \
                imagpng.o \
                imagpnm.o \
                imagtiff.o \
+               imagxpm.o \
                intl.o \
                ipcbase.o \
                layout.o \
@@ -741,6 +743,7 @@ COMMONDEPS = \
                imagpng.d \
                imagpnm.d \
                imagtiff.d \
+               imagxpm.d \
                intl.d \
                ipcbase.d \
                layout.d \
@@ -950,8 +953,7 @@ GUIOBJS = \
                utils.o \
                utilsexc.o \
                wave.o \
-               window.o \
-               xpmhand.o
+               window.o
 
 GUIDEPS = \
                accel.d \
@@ -1030,8 +1032,7 @@ GUIDEPS = \
                utils.d \
                utilsexc.d \
                wave.d \
-               window.d \
-               xpmhand.d
+               window.d
 
 UNIXOBJS = \