added xpmdecod.cpp

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-28 23:39:09 +00:00 · 2001-04-28 23:39:09 +00:00 · c97e7fa8db
commit c97e7fa8db
parent c3f4609ebb
13 changed files with 59 additions and 35 deletions
--- a/src/gtk/files.lst
+++ b/src/gtk/files.lst
@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 00:30, 2001/04/23
+# This file was automatically generated by tmake at 01:27, 2001/04/29
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
@ -146,6 +146,7 @@ ALL_SOURCES = \
 		common/wincmn.cpp \
 		common/wxchar.cpp \
 		common/wxexpr.cpp \
+		common/xpmdecod.cpp \
 		common/zipstrm.cpp \
 		common/zstream.cpp \
 		gtk/accel.cpp \
@ -335,6 +336,7 @@ ALL_HEADERS = \
 		imagpng.h \
 		imagpnm.h \
 		imagtiff.h \
+		imagxpm.h \
 		intl.h \
 		ioswrap.h \
 		ipcbase.h \
@ -446,6 +448,7 @@ ALL_HEADERS = \
 		wxexpr.h \
 		wxhtml.h \
 		wxprec.h \
+		xpmdecod.h \
 		xpmhand.h \
 		zipstrm.h \
 		zstream.h \
@ -671,6 +674,7 @@ COMMONOBJS = \
 		wincmn.o \
 		wxchar.o \
 		wxexpr.o \
+		xpmdecod.o \
 		zipstrm.o \
 		zstream.o

@ -779,6 +783,7 @@ COMMONDEPS = \
 		wincmn.d \
 		wxchar.d \
 		wxexpr.d \
+		xpmdecod.d \
 		zipstrm.d \
 		zstream.d

--- a/src/gtk1/files.lst
+++ b/src/gtk1/files.lst
@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 00:30, 2001/04/23
+# This file was automatically generated by tmake at 01:27, 2001/04/29
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
@ -146,6 +146,7 @@ ALL_SOURCES = \
 		common/wincmn.cpp \
 		common/wxchar.cpp \
 		common/wxexpr.cpp \
+		common/xpmdecod.cpp \
 		common/zipstrm.cpp \
 		common/zstream.cpp \
 		gtk/accel.cpp \
@ -335,6 +336,7 @@ ALL_HEADERS = \
 		imagpng.h \
 		imagpnm.h \
 		imagtiff.h \
+		imagxpm.h \
 		intl.h \
 		ioswrap.h \
 		ipcbase.h \
@ -446,6 +448,7 @@ ALL_HEADERS = \
 		wxexpr.h \
 		wxhtml.h \
 		wxprec.h \
+		xpmdecod.h \
 		xpmhand.h \
 		zipstrm.h \
 		zstream.h \
@ -671,6 +674,7 @@ COMMONOBJS = \
 		wincmn.o \
 		wxchar.o \
 		wxexpr.o \
+		xpmdecod.o \
 		zipstrm.o \
 		zstream.o

@ -779,6 +783,7 @@ COMMONDEPS = \
 		wincmn.d \
 		wxchar.d \
 		wxexpr.d \
+		xpmdecod.d \
 		zipstrm.d \
 		zstream.d

--- a/src/motif/files.lst
+++ b/src/motif/files.lst
@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 00:30, 2001/04/23
+# This file was automatically generated by tmake at 01:27, 2001/04/29
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
@ -148,6 +148,7 @@ ALL_SOURCES = \
 		common/wincmn.cpp \
 		common/wxchar.cpp \
 		common/wxexpr.cpp \
+		common/xpmdecod.cpp \
 		common/zipstrm.cpp \
 		common/zstream.cpp \
 		motif/accel.cpp \
@ -331,6 +332,7 @@ ALL_HEADERS = \
 		imagpng.h \
 		imagpnm.h \
 		imagtiff.h \
+		imagxpm.h \
 		intl.h \
 		ioswrap.h \
 		ipcbase.h \
@ -442,6 +444,7 @@ ALL_HEADERS = \
 		wxexpr.h \
 		wxhtml.h \
 		wxprec.h \
+		xpmdecod.h \
 		xpmhand.h \
 		zipstrm.h \
 		zstream.h \
@ -667,6 +670,7 @@ COMMONOBJS = \
 		wincmn.o \
 		wxchar.o \
 		wxexpr.o \
+		xpmdecod.o \
 		zipstrm.o \
 		zstream.o

@ -775,6 +779,7 @@ COMMONDEPS = \
 		wincmn.d \
 		wxchar.d \
 		wxexpr.d \
+		xpmdecod.d \
 		zipstrm.d \
 		zstream.d

--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@ -1,6 +1,6 @@


-# This file was automatically generated by tmake at 00:30, 2001/04/23
+# This file was automatically generated by tmake at 01:26, 2001/04/29
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!

 #
@ -223,6 +223,7 @@ COMMONOBJS = \
 		$(MSWDIR)\wincmn.obj \
 		$(MSWDIR)\wxchar.obj \
 		$(MSWDIR)\wxexpr.obj \
+		$(MSWDIR)\xpmdecod.obj \
 		$(MSWDIR)\zipstrm.obj \
 		$(MSWDIR)\zstream.obj

@ -816,6 +817,8 @@ $(MSWDIR)\wxchar.obj: $(COMMDIR)\wxchar.$(SRCSUFF)

 $(MSWDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.$(SRCSUFF)

+$(MSWDIR)\xpmdecod.obj: $(COMMDIR)\xpmdecod.$(SRCSUFF)
+
 $(MSWDIR)\zipstrm.obj: $(COMMDIR)\zipstrm.$(SRCSUFF)

 $(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@ -1,6 +1,6 @@


-# This file was automatically generated by tmake at 00:30, 2001/04/23
+# This file was automatically generated by tmake at 01:26, 2001/04/29
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!

 #
@ -193,6 +193,7 @@ COMMONOBJS = \
 		$(MSWDIR)\wincmn.obj \
 		$(MSWDIR)\wxchar.obj \
 		$(MSWDIR)\wxexpr.obj \
+		$(MSWDIR)\xpmdecod.obj \
 		$(MSWDIR)\zipstrm.obj \
 		$(MSWDIR)\zstream.obj \
 		${MSWDIR}\resourc2.obj
@ -652,6 +653,8 @@ $(MSWDIR)\wxchar.obj: $(COMMDIR)\wxchar.$(SRCSUFF)

 $(MSWDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.$(SRCSUFF)

+$(MSWDIR)\xpmdecod.obj: $(COMMDIR)\xpmdecod.$(SRCSUFF)
+
 $(MSWDIR)\zipstrm.obj: $(COMMDIR)\zipstrm.$(SRCSUFF)

 $(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 00:30, 2001/04/23
+# This file was automatically generated by tmake at 01:26, 2001/04/29
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!

 #
@ -181,6 +181,7 @@ COMMONOBJS2 = \
 		$(COMMDIR)\wincmn.obj \
 		$(COMMDIR)\wxchar.obj \
 		$(COMMDIR)\wxexpr.obj \
+		$(COMMDIR)\xpmdecod.obj \
 		$(COMMDIR)\zipstrm.obj \
 		$(COMMDIR)\zstream.obj

@ -1185,6 +1186,11 @@ $(COMMDIR)/wxexpr.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<

+$(COMMDIR)/xpmdecod.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/zipstrm.obj:     $*.$(SRCSUFF)
        cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 00:30, 2001/04/23
+# This file was automatically generated by tmake at 01:26, 2001/04/29
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!

 #
@ -202,6 +202,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/wincmn.$(OBJSUFF) \
 		$(COMMDIR)/wxchar.$(OBJSUFF) \
 		$(COMMDIR)/wxexpr.$(OBJSUFF) \
+		$(COMMDIR)/xpmdecod.$(OBJSUFF) \
 		$(COMMDIR)/zipstrm.$(OBJSUFF) \
 		$(COMMDIR)/zstream.$(OBJSUFF)

--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@ -1,6 +1,6 @@


-# This file was automatically generated by tmake at 00:30, 2001/04/23
+# This file was automatically generated by tmake at 01:26, 2001/04/29
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!

 # Symantec C++ makefile for the msw objects
@ -160,6 +160,7 @@ COMMONOBJS = \
 		$(COMMDIR)\wincmn.obj \
 		$(COMMDIR)\wxchar.obj \
 		$(COMMDIR)\wxexpr.obj \
+		$(COMMDIR)\xpmdecod.obj \
 		$(COMMDIR)\zipstrm.obj \
 		$(COMMDIR)\zstream.obj

--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 00:30, 2001/04/23
+# This file was automatically generated by tmake at 01:26, 2001/04/29
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!

 # File:     makefile.vc
@ -239,6 +239,7 @@ COMMONOBJS = \
 		..\common\$D\wincmn.obj \
 		..\common\$D\wxchar.obj \
 		..\common\$D\wxexpr.obj \
+		..\common\$D\xpmdecod.obj \
 		..\common\$D\zipstrm.obj \
 		..\common\$D\zstream.obj

@ -665,7 +666,7 @@ clean: $(PERIPH_CLEAN_TARGET)


 # Making documents
-docs:   allhlp allhtml allpdfrtf allhtb allhtmlhelp
+docs:   allhlp allhtml allpdfrtf htb htmlhelp
 alldocs: docs
 hlp:    wxhlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp
@ -684,15 +685,11 @@ referencps:	$(WXDIR)\docs\ps\referenc.ps
 allhlp: wxhlp
        cd $(WXDIR)\utils\dialoged\src
        nmake -f makefile.vc hlp
-        cd $(WXDIR)\utils\tex2rtf\src
-        nmake -f makefile.vc hlp
        cd $(THISDIR)

 allhtml: wxhtml
        cd $(WXDIR)\utils\dialoged\src
        nmake -f makefile.vc html
-        cd $(WXDIR)\utils\tex2rtf\src
-        nmake -f makefile.vc html
        cd $(THISDIR)

 allps: wxps referencps
@ -703,29 +700,12 @@ allps: wxps referencps
 allpdfrtf: pdfrtf
        cd $(WXDIR)\utils\dialoged\src
        nmake -f makefile.vc pdfrtf
-        cd $(WXDIR)\utils\tex2rtf\src
-        nmake -f makefile.vc pdfrtf
-        cd $(THISDIR)
-
-allhtmlhelp: htmlhelp
-        cd $(WXDIR)\utils\dialoged\src
-        nmake -f makefile.vc htmlhelp
-        cd $(WXDIR)\utils\tex2rtf\src
-        nmake -f makefile.vc htmlhelp
-        cd $(THISDIR)
-
-allhtb: htb
-        cd $(WXDIR)\utils\dialoged\src
-        nmake -f makefile.vc htb
-        cd $(WXDIR)\utils\tex2rtf\src
-        nmake -f makefile.vc htb
        cd $(THISDIR)

 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
        cd $(DOCDIR)/latex/wx
        -erase wx.ph
        hc wx
-        -mkdir $(DOCDIR)\winhelp
        -erase $(DOCDIR)\winhelp\wx.hlp
        -erase $(DOCDIR)\winhelp\wx.cnt
        move wx.hlp $(DOCDIR)\winhelp\wx.hlp
@ -752,7 +732,6 @@ $(DOCDIR)/latex/techref/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex

 $(DOCDIR)/pdf/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
        cd $(DOCDIR)\latex\wx
-        -mkdir $(DOCDIR)\pdf
        -copy *.wmf $(DOCDIR)\pdf
        -copy *.bmp $(DOCDIR)\pdf
        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
@ -767,7 +746,6 @@ $(DOCDIR)/pdf/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex

 $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex
        cd $(DOCDIR)\latex\wx
-        -mkdir $(DOCDIR)\html
        -mkdir $(DOCDIR)\html\wx
        copy *.gif $(DOCDIR)\html\wx
        -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html
--- 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 00:30, 2001/04/23
+# This file was automatically generated by tmake at 01:26, 2001/04/29
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!

 #
@ -197,6 +197,7 @@ COMMONOBJS = &
 	wincmn.obj &
 	wxchar.obj &
 	wxexpr.obj &
+	xpmdecod.obj &
 	zipstrm.obj &
 	zstream.obj

@ -967,6 +968,9 @@ wxchar.obj:     $(COMMDIR)\wxchar.cpp
 wxexpr.obj:     $(COMMDIR)\wxexpr.cpp
  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<

+xpmdecod.obj:     $(COMMDIR)\xpmdecod.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 zipstrm.obj:     $(COMMDIR)\zipstrm.cpp
  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<

--- a/src/os2/files.lst
+++ b/src/os2/files.lst
@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 00:31, 2001/04/23
+# This file was automatically generated by tmake at 01:27, 2001/04/29
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE OS2.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
@ -142,6 +142,7 @@ ALL_SOURCES = \
 		common/wincmn.cpp \
 		common/wxchar.cpp \
 		common/wxexpr.cpp \
+		common/xpmdecod.cpp \
 		common/zipstrm.cpp \
 		common/zstream.cpp \
 		os2/accel.cpp \
@ -341,6 +342,7 @@ ALL_HEADERS = \
 		imagpng.h \
 		imagpnm.h \
 		imagtiff.h \
+		imagxpm.h \
 		intl.h \
 		ioswrap.h \
 		ipcbase.h \
@ -452,6 +454,7 @@ ALL_HEADERS = \
 		wxexpr.h \
 		wxhtml.h \
 		wxprec.h \
+		xpmdecod.h \
 		xpmhand.h \
 		zipstrm.h \
 		zstream.h \
@ -685,6 +688,7 @@ COMMONOBJS = \
 		wincmn.o \
 		wxchar.o \
 		wxexpr.o \
+		xpmdecod.o \
 		zipstrm.o \
 		zstream.o

@ -793,6 +797,7 @@ COMMONDEPS = \
 		wincmn.d \
 		wxchar.d \
 		wxexpr.d \
+		xpmdecod.d \
 		zipstrm.d \
 		zstream.d

--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@ -249,6 +249,10 @@ SOURCE=.\common\gifdecod.cpp
 # End Source File
 # Begin Source File

+SOURCE=.\common\xpmdecod.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\hash.cpp
 # End Source File
 # Begin Source File
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@ -256,6 +256,10 @@ SOURCE=.\common\gifdecod.cpp
 # End Source File
 # Begin Source File

+SOURCE=.\common\xpmdecod.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\hash.cpp
 # End Source File
 # Begin Source File