regenerated makefiles (forgot to do it after changing filelist.txt... so much for...

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

diff --git a/src/gtk/files.lst b/src/gtk/files.lst
index de848a9bb9a388467359e6e29679f6dffbd04ad7..56976ed9211ffc03765712edf1e61b13db503ff3 100644 (file)
--- a/src/gtk/files.lst
+++ b/src/gtk/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 12:56, 2001/12/31
+# This file was automatically generated by tmake at 22:59, 2002/01/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/accel.cpp \

diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst
index de848a9bb9a388467359e6e29679f6dffbd04ad7..56976ed9211ffc03765712edf1e61b13db503ff3 100644 (file)
--- a/src/gtk1/files.lst
+++ b/src/gtk1/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 12:56, 2001/12/31
+# This file was automatically generated by tmake at 22:59, 2002/01/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/accel.cpp \

diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst
index e9759792856cb6d8604472d1a084de99ab76f0e3..bb7f362cf3189e5f1adf0082018d31e9fcb5601a 100644 (file)
--- a/src/mac/carbon/files.lst
+++ b/src/mac/carbon/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:50, 2001/12/31
+# This file was automatically generated by tmake at 22:59, 2002/01/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MAC.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \

diff --git a/src/mac/files.lst b/src/mac/files.lst
index e9759792856cb6d8604472d1a084de99ab76f0e3..bb7f362cf3189e5f1adf0082018d31e9fcb5601a 100644 (file)
--- a/src/mac/files.lst
+++ b/src/mac/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:50, 2001/12/31
+# This file was automatically generated by tmake at 22:59, 2002/01/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MAC.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \

diff --git a/src/mgl/files.lst b/src/mgl/files.lst
index a77a9859135723b8c1c0e70c370cdce635da22cd..8b7852197b8f10f9b7f5be2b0d892d29eb0918d0 100644 (file)
--- a/src/mgl/files.lst
+++ b/src/mgl/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 12:56, 2001/12/31
+# This file was automatically generated by tmake at 22:59, 2002/01/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MGL.T!
 ALL_SOURCES = \
                generic/accel.cpp \

diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
index 1c6346aac205ac8fb424097d091791306b04f9c4..db53c875e38320c9f5f26200a7fbfaa0f3070c84 100644 (file)
--- a/src/mgl/makefile.wat
+++ b/src/mgl/makefile.wat
@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
-# This file was automatically generated by tmake at 11:19, 2001/12/15
+# This file was automatically generated by tmake at 22:59, 2002/01/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -89,6 +89,7 @@ GENERICOBJS= accel.obj &
 COMMONOBJS = &
        y_tab.obj &
        appcmn.obj &
+       bmpbase.obj &
        choiccmn.obj &
        clipcmn.obj &
        clntdata.obj &
@@ -209,8 +210,7 @@ COMMONOBJS = &
        wxexpr.obj &
        xpmdecod.obj &
        zipstrm.obj &
-       zstream.obj &
-       bmpbase.obj
+       zstream.obj
 
 MGLOBJS = app.obj &
        bitmap.obj &
@@ -514,6 +514,9 @@ win32.obj:     $(UNIVTHEMEDIR)\win32.cpp
 appcmn.obj:     $(COMMDIR)\appcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+bmpbase.obj:     $(COMMDIR)\bmpbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 choiccmn.obj:     $(COMMDIR)\choiccmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -877,9 +880,6 @@ zipstrm.obj:     $(COMMDIR)\zipstrm.cpp
 zstream.obj:     $(COMMDIR)\zstream.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-bmpbase.obj:     $(COMMDIR)\bmpbase.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 
 
 y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c

diff --git a/src/motif/files.lst b/src/motif/files.lst
index 3e5509e5bd3bc9a6a4f94ac13a517b95e0996c6d..f6d70b8bc81db8c0143bfac0dc305306605cc0c9 100644 (file)
--- a/src/motif/files.lst
+++ b/src/motif/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:19, 2001/12/15
+# This file was automatically generated by tmake at 22:59, 2002/01/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \

diff --git a/src/msw/files.lst b/src/msw/files.lst
index 31f4e5e841e71a2ab7c39f98e949fd83e6edec63..854d6abc8eb8acc4e31019b08648fd4377583d7e 100644 (file)
--- a/src/msw/files.lst
+++ b/src/msw/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:19, 2001/12/15
+# This file was automatically generated by tmake at 22:59, 2002/01/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
@@ -576,7 +576,6 @@ ALL_HEADERS = \
                msw/region.h \
                msw/registry.h \
                msw/scrolbar.h \
-               msw/settings.h \
                msw/setup0.h \
                msw/slider95.h \
                msw/slidrmsw.h \

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 1f1764bde27b2d83359bd8d48d7b59a4a4094fea..badf46127d2f9af87ed44c5729e0a125984413d8 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 11:19, 2001/12/15
+# This file was automatically generated by tmake at 22:59, 2002/01/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -116,6 +116,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 COMMONOBJS = \
                $(MSWDIR)\y_tab.obj \
                $(MSWDIR)\appcmn.obj \
+               $(MSWDIR)\bmpbase.obj \
                $(MSWDIR)\choiccmn.obj \
                $(MSWDIR)\clipcmn.obj \
                $(MSWDIR)\clntdata.obj \
@@ -636,6 +637,8 @@ $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
 
 $(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF)
 
+$(MSWDIR)\bmpbase.obj: $(COMMDIR)\bmpbase.$(SRCSUFF)
+
 $(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF)
 
 $(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF)

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 89ef56d89b37205de11dc8df3dbc71253b369bca..8a036285a14bfe9902adc8ad10268effb5b02c1e 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 11:19, 2001/12/15
+# This file was automatically generated by tmake at 22:59, 2002/01/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -106,6 +106,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 COMMONOBJS = \
                $(MSWDIR)\y_tab.obj \
                $(MSWDIR)\appcmn.obj \
+               $(MSWDIR)\bmpbase.obj \
                $(MSWDIR)\choiccmn.obj \
                $(MSWDIR)\clipcmn.obj \
                $(MSWDIR)\clntdata.obj \
@@ -504,6 +505,8 @@ $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
 
 $(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF)
 
+$(MSWDIR)\bmpbase.obj: $(COMMDIR)\bmpbase.$(SRCSUFF)
+
 $(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF)
 
 $(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF)

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index abeec3f4c6ff94742279741160498e0aea058e5f..34c1471ba48232c149ebcdc6e9898a97b929ea42 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:19, 2001/12/15
+# This file was automatically generated by tmake at 22:59, 2002/01/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -90,6 +90,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 COMMONOBJS1 = \
                $(COMMDIR)\y_tab.obj \
                $(COMMDIR)\appcmn.obj \
+               $(COMMDIR)\bmpbase.obj \
                $(COMMDIR)\choiccmn.obj \
                $(COMMDIR)\clipcmn.obj \
                $(COMMDIR)\clntdata.obj \
@@ -784,6 +785,11 @@ $(COMMDIR)/appcmn.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/bmpbase.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/choiccmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index c815cf36a3d07d39173a837ee1aa32e6a28f67b3..5846f0a9d1c4139c061795f84791af56819a3541 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:19, 2001/12/15
+# This file was automatically generated by tmake at 22:59, 2002/01/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -103,6 +103,7 @@ GENERICOBJS = \
 COMMONOBJS  = \
                $(COMMDIR)/y_tab.$(OBJSUFF) \
                $(COMMDIR)/appcmn.$(OBJSUFF) \
+               $(COMMDIR)/bmpbase.$(OBJSUFF) \
                $(COMMDIR)/choiccmn.$(OBJSUFF) \
                $(COMMDIR)/clipcmn.$(OBJSUFF) \
                $(COMMDIR)/clntdata.$(OBJSUFF) \

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 652cec59a406a97c93c919167dee69aad4c32065..b82487b1d1b0a178a15c3fbeee6712bbfb443576 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 11:19, 2001/12/15
+# This file was automatically generated by tmake at 22:59, 2002/01/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
@@ -59,6 +59,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 COMMONOBJS = \
                $(COMMDIR)\y_tab.obj \
                $(COMMDIR)\appcmn.obj \
+               $(COMMDIR)\bmpbase.obj \
                $(COMMDIR)\choiccmn.obj \
                $(COMMDIR)\clipcmn.obj \
                $(COMMDIR)\clntdata.obj \

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 5b4066495bc3b8869386de6edf5a0cb656df2523..26414d4a3af0a7858291954f952d99ade3813c68 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:19, 2001/12/15
+# This file was automatically generated by tmake at 22:59, 2002/01/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -138,6 +138,7 @@ NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \
 COMMONOBJS = \
                $(COMMDIR)\$D\y_tab.obj \
                $(COMMDIR)\$D\appcmn.obj \
+               $(COMMDIR)\$D\bmpbase.obj \
                $(COMMDIR)\$D\choiccmn.obj \
                $(COMMDIR)\$D\clipcmn.obj \
                $(COMMDIR)\$D\clntdata.obj \

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 3f4afd0c565f80273eb9b6c34bdbc0552b92931f..961a4ab24bb4dd939ed5f5b6c3fb3b387abbf3b5 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 11:19, 2001/12/15
+# This file was automatically generated by tmake at 22:59, 2002/01/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -97,6 +97,7 @@ NONESSENTIALOBJS= accel.obj &
 COMMONOBJS = &
        y_tab.obj &
        appcmn.obj &
+       bmpbase.obj &
        choiccmn.obj &
        clipcmn.obj &
        clntdata.obj &
@@ -724,6 +725,9 @@ window.obj:     $(MSWDIR)\window.cpp
 appcmn.obj:     $(COMMDIR)\appcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+bmpbase.obj:     $(COMMDIR)\bmpbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 choiccmn.obj:     $(COMMDIR)\choiccmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

diff --git a/src/univ/files.lst b/src/univ/files.lst
index c8b10beeaf5413f2f10ccad71057a9bafcdc6bdb..d21229af7859ba2fa9cefa7c2c48080e928f5eab 100644 (file)
--- a/src/univ/files.lst
+++ b/src/univ/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:19, 2001/12/15
+# This file was automatically generated by tmake at 22:59, 2002/01/01
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNIV.T!
 UNIVOBJS = \
                bmpbuttn.o \

diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp
index 9900f04e266671fc0776f02fbd67b2b48a3b0ef0..70986a9985c9ecb4d79bb9f484ef416b4cbe9b32 100644 (file)
--- a/src/wxUniv.dsp
+++ b/src/wxUniv.dsp
@@ -89,6 +89,10 @@ SOURCE=.\common\appcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\bmpbase.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\choiccmn.cpp
 # End Source File
 # Begin Source File

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index e2ae91032a7941a9c10011ad2a5ace971c0da2e2..87bdde9c82250835bf5d2f68539d357c11fbdcf9 100644 (file)
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -252,6 +252,10 @@ SOURCE=.\common\appcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\bmpbase.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\choiccmn.cpp
 # End Source File
 # Begin Source File
@@ -2659,10 +2663,6 @@ SOURCE=..\include\wx\msw\scrolbar.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\settings.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\slider95.h
 # End Source File
 # Begin Source File