1. fixed wxBase RPM template

2. fixed several erros in filelist.txt
3. regenarated everything

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

diff --git a/distrib/msw/tmake/baserpm.t b/distrib/msw/tmake/baserpm.t
index dc1b2ad0cbb91013521d444b981ba2e6842126ff..fe61e79027a9a7ba505db2fc48d6266a2a6a04cd 100644 (file)
--- a/distrib/msw/tmake/baserpm.t
+++ b/distrib/msw/tmake/baserpm.t
@@ -16,7 +16,7 @@
     }
 
     foreach $file (sort keys %wxUNIXINCLUDE) {
     }
 
     foreach $file (sort keys %wxUNIXINCLUDE) {

-        next unless $wxWXINCLUDE{$file} =~ /\bB\b/;
+        next unless $wxUNIXINCLUDE{$file} =~ /\bB\b/;

 
         $project{"BASE_HEADERS"} .= "include/wx/unix/" . $file . " "
     }
 
         $project{"BASE_HEADERS"} .= "include/wx/unix/" . $file . " "
     }

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 076c29ef2177e822bc092201ec142bd981ed6998..14c174afd9c6199a71e250a803c0a9f1b1ca6d04 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -118,7 +118,7 @@ ctrlsub.cpp C
 datetime.cpp   C       B
 datstrm.cpp    C       B
 db.cpp C       32,B
 datetime.cpp   C       B
 datstrm.cpp    C       B
 db.cpp C       32,B

-dbgrid.cpp     C       32,B
+dbgrid.cpp     C       32

 dbtable.cpp    C       32,B
 dcbase.cpp     C
 dircmn.cpp     C       B
 dbtable.cpp    C       32,B
 dcbase.cpp     C
 dircmn.cpp     C       B


@@ -585,7 +585,7 @@ datetime.h  W       B
 datetime.inl   W       B
 datstrm.h      W       B
 db.h   W       B
 datetime.inl   W       B
 datstrm.h      W       B
 db.h   W       B

-dbgrid.h       W       B
+dbgrid.h       W

 dbtable.h      W       B
 dc.h   W
 dcclient.h     W
 dbtable.h      W       B
 dc.h   W
 dcclient.h     W


@@ -622,7 +622,7 @@ fontenc.h   W       B
 fontenum.h     W
 fontmap.h      W       B
 fontdlg.h      W
 fontenum.h     W
 fontmap.h      W       B
 fontdlg.h      W

-fontutil.h     W       B
+fontutil.h     W

 frame.h        W
 fs_inet.h      W       B
 fs_zip.h       W       B
 frame.h        W
 fs_inet.h      W       B
 fs_zip.h       W       B


@@ -633,7 +633,7 @@ gdiobj.h    W
 geometry.h     W
 gifdecod.h     W
 xpmdecod.h     W
 geometry.h     W
 gifdecod.h     W
 xpmdecod.h     W

-dbkeyg.h       W       B
+dbkeyg.h       W

 glcanvas.h     W
 grid.h W
 gridctrl.h     W
 glcanvas.h     W
 grid.h W
 gridctrl.h     W

diff --git a/distrib/msw/tmake/makeall.sh b/distrib/msw/tmake/makeall.sh
index 8d40a8dcf63a9501a6f92ab5604430e39f48c67c..b5b73cdf7ff7c11ed06d6c2d948a21dfe66085d3 100755 (executable)
--- a/distrib/msw/tmake/makeall.sh
+++ b/distrib/msw/tmake/makeall.sh
@@ -50,6 +50,10 @@ do
            echo "Generating $topdir/src/files.lst for Configure..."
            tmake -t base wxwin.pro -o $topdir/src/files.lst ;;
 
            echo "Generating $topdir/src/files.lst for Configure..."
            tmake -t base wxwin.pro -o $topdir/src/files.lst ;;
 

+       baserpm.t)
+           echo "Generating $topdir/src/rpmfiles.lst for wxBase RPM..."
+           tmake -t baserpm wxwin.pro -o $topdir/src/rpmfiles.lst ;;
+

        gtk.t)
            echo "Generating $topdir/src/gtk/files.lst for GTK and Configure..."
            tmake -t gtk wxwin.pro -o $topdir/src/gtk/files.lst;;
        gtk.t)
            echo "Generating $topdir/src/gtk/files.lst for GTK and Configure..."
            tmake -t gtk wxwin.pro -o $topdir/src/gtk/files.lst;;

diff --git a/src/gtk/files.lst b/src/gtk/files.lst
index be8681977a289eae1209a67df5db2bffd7f47964..7baf850ba7abcaeb9247fec5e4fb968f8a117da4 100644 (file)
--- a/src/gtk/files.lst
+++ b/src/gtk/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 01:55, 2001/06/09
+# This file was automatically generated by tmake at 01:54, 2001/06/22

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \


@@ -55,6 +55,7 @@ ALL_SOURCES = \
                common/datetime.cpp \
                common/datstrm.cpp \
                common/db.cpp \
                common/datetime.cpp \
                common/datstrm.cpp \
                common/db.cpp \

+               common/dbgrid.cpp \

                common/dbtable.cpp \
                common/dcbase.cpp \
                common/dircmn.cpp \
                common/dbtable.cpp \
                common/dcbase.cpp \
                common/dircmn.cpp \


@@ -274,6 +275,8 @@ ALL_HEADERS = \
                datetime.inl \
                datstrm.h \
                db.h \
                datetime.inl \
                datstrm.h \
                db.h \

+               dbgrid.h \
+               dbkeyg.h \

                dbtable.h \
                dc.h \
                dcclient.h \
                dbtable.h \
                dc.h \
                dcclient.h \


@@ -589,6 +592,7 @@ COMMONOBJS = \
                datetime.o \
                datstrm.o \
                db.o \
                datetime.o \
                datstrm.o \
                db.o \

+               dbgrid.o \

                dbtable.o \
                dcbase.o \
                dircmn.o \
                dbtable.o \
                dcbase.o \
                dircmn.o \


@@ -699,6 +703,7 @@ COMMONDEPS = \
                datetime.d \
                datstrm.d \
                db.d \
                datetime.d \
                datstrm.d \
                db.d \

+               dbgrid.d \

                dbtable.d \
                dcbase.d \
                dircmn.d \
                dbtable.d \
                dcbase.d \
                dircmn.d \

diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst
index be8681977a289eae1209a67df5db2bffd7f47964..7baf850ba7abcaeb9247fec5e4fb968f8a117da4 100644 (file)
--- a/src/gtk1/files.lst
+++ b/src/gtk1/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 01:55, 2001/06/09
+# This file was automatically generated by tmake at 01:54, 2001/06/22

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \


@@ -55,6 +55,7 @@ ALL_SOURCES = \
                common/datetime.cpp \
                common/datstrm.cpp \
                common/db.cpp \
                common/datetime.cpp \
                common/datstrm.cpp \
                common/db.cpp \

+               common/dbgrid.cpp \

                common/dbtable.cpp \
                common/dcbase.cpp \
                common/dircmn.cpp \
                common/dbtable.cpp \
                common/dcbase.cpp \
                common/dircmn.cpp \


@@ -274,6 +275,8 @@ ALL_HEADERS = \
                datetime.inl \
                datstrm.h \
                db.h \
                datetime.inl \
                datstrm.h \
                db.h \

+               dbgrid.h \
+               dbkeyg.h \

                dbtable.h \
                dc.h \
                dcclient.h \
                dbtable.h \
                dc.h \
                dcclient.h \


@@ -589,6 +592,7 @@ COMMONOBJS = \
                datetime.o \
                datstrm.o \
                db.o \
                datetime.o \
                datstrm.o \
                db.o \

+               dbgrid.o \

                dbtable.o \
                dcbase.o \
                dircmn.o \
                dbtable.o \
                dcbase.o \
                dircmn.o \


@@ -699,6 +703,7 @@ COMMONDEPS = \
                datetime.d \
                datstrm.d \
                db.d \
                datetime.d \
                datstrm.d \
                db.d \

+               dbgrid.d \

                dbtable.d \
                dcbase.d \
                dircmn.d \
                dbtable.d \
                dcbase.d \
                dircmn.d \

diff --git a/src/motif/files.lst b/src/motif/files.lst
index 12f64ce9c8ed179bf18b4b8fc7a4c182e423f425..e4e413850ef69998e5796afe45e9d48b5a499473 100644 (file)
--- a/src/motif/files.lst
+++ b/src/motif/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 01:55, 2001/06/09
+# This file was automatically generated by tmake at 01:54, 2001/06/22

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \


@@ -58,6 +58,7 @@ ALL_SOURCES = \
                common/datetime.cpp \
                common/datstrm.cpp \
                common/db.cpp \
                common/datetime.cpp \
                common/datstrm.cpp \
                common/db.cpp \

+               common/dbgrid.cpp \

                common/dbtable.cpp \
                common/dcbase.cpp \
                common/dircmn.cpp \
                common/dbtable.cpp \
                common/dcbase.cpp \
                common/dircmn.cpp \


@@ -270,6 +271,8 @@ ALL_HEADERS = \
                datetime.inl \
                datstrm.h \
                db.h \
                datetime.inl \
                datstrm.h \
                db.h \

+               dbgrid.h \
+               dbkeyg.h \

                dbtable.h \
                dc.h \
                dcclient.h \
                dbtable.h \
                dc.h \
                dcclient.h \


@@ -584,6 +587,7 @@ COMMONOBJS = \
                datetime.o \
                datstrm.o \
                db.o \
                datetime.o \
                datstrm.o \
                db.o \

+               dbgrid.o \

                dbtable.o \
                dcbase.o \
                dircmn.o \
                dbtable.o \
                dcbase.o \
                dircmn.o \


@@ -694,6 +698,7 @@ COMMONDEPS = \
                datetime.d \
                datstrm.d \
                db.d \
                datetime.d \
                datstrm.d \
                db.d \

+               dbgrid.d \

                dbtable.d \
                dcbase.d \
                dircmn.d \
                dbtable.d \
                dcbase.d \
                dircmn.d \

diff --git a/src/msw/files.lst b/src/msw/files.lst
index 0850dd3eaa89c4b3e007406b44ebcfa44a52ca30..8b4610c2cece9ea6b2406722f63784a675f57c43 100644 (file)
--- a/src/msw/files.lst
+++ b/src/msw/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 01:55, 2001/06/09
+# This file was automatically generated by tmake at 01:54, 2001/06/22

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \


@@ -41,6 +41,7 @@ ALL_SOURCES = \
                common/datetime.cpp \
                common/datstrm.cpp \
                common/db.cpp \
                common/datetime.cpp \
                common/datstrm.cpp \
                common/db.cpp \

+               common/dbgrid.cpp \

                common/dbtable.cpp \
                common/dcbase.cpp \
                common/dircmn.cpp \
                common/dbtable.cpp \
                common/dcbase.cpp \
                common/dircmn.cpp \


@@ -293,6 +294,8 @@ ALL_HEADERS = \
                datetime.inl \
                datstrm.h \
                db.h \
                datetime.inl \
                datstrm.h \
                db.h \

+               dbgrid.h \
+               dbkeyg.h \

                dbtable.h \
                dc.h \
                dcclient.h \
                dbtable.h \
                dc.h \
                dcclient.h \


@@ -638,6 +641,7 @@ COMMONOBJS = \
                datetime.o \
                datstrm.o \
                db.o \
                datetime.o \
                datstrm.o \
                db.o \

+               dbgrid.o \

                dbtable.o \
                dcbase.o \
                dircmn.o \
                dbtable.o \
                dcbase.o \
                dircmn.o \


@@ -748,6 +752,7 @@ COMMONDEPS = \
                datetime.d \
                datstrm.d \
                db.d \
                datetime.d \
                datstrm.d \
                db.d \

+               dbgrid.d \

                dbtable.d \
                dcbase.d \
                dircmn.d \
                dbtable.d \
                dcbase.d \
                dircmn.d \

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index ee5ae396f935172f9a63cdba7f79037559ac7f26..a3ca0fc79a5d5447ebb8ad907ef480ba1d7ba603 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
 
 

-# This file was automatically generated by tmake at 01:55, 2001/06/09
+# This file was automatically generated by tmake at 01:54, 2001/06/22

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index bcff224380262139043a0bab693fa6b8fca554e0..2aeda58e4c4845dad4edd4177046727a51ebd085 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
 
 

-# This file was automatically generated by tmake at 01:55, 2001/06/09
+# This file was automatically generated by tmake at 01:54, 2001/06/22

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index daddd243451fdb0590501b31ca066feb3d7b5816..23d41910babd096e86ff919afccd38e40a27634c 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 01:55, 2001/06/09
+# This file was automatically generated by tmake at 01:54, 2001/06/22

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #


@@ -1372,11 +1372,6 @@ $(GENDIR)/wizard.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 

-test.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS2) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-

 
 
 $(COMMDIR)/y_tab.obj:     $*.c $(COMMDIR)/lex_yy.c
 
 
 $(COMMDIR)/y_tab.obj:     $*.c $(COMMDIR)/lex_yy.c

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 142d9ec6868b928bc62514ce0f0c1ccd4cba7f8e..b28fb4cc82378ff8b192f890e71186c005b8e97e 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 01:55, 2001/06/09
+# This file was automatically generated by tmake at 01:54, 2001/06/22

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 8013b3ca6dce003233e2b7e5ccc3e1f2275e2ddb..6c031036309da017ca0ea9676e6dfc50fa0e2e71 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
 
 

-# This file was automatically generated by tmake at 01:55, 2001/06/09
+# This file was automatically generated by tmake at 01:54, 2001/06/22

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects


@@ -68,6 +68,7 @@ COMMONOBJS = \
                $(COMMDIR)\datetime.obj \
                $(COMMDIR)\datstrm.obj \
                $(COMMDIR)\db.obj \
                $(COMMDIR)\datetime.obj \
                $(COMMDIR)\datstrm.obj \
                $(COMMDIR)\db.obj \

+               $(COMMDIR)\dbgrid.obj \

                $(COMMDIR)\dbtable.obj \
                $(COMMDIR)\dcbase.obj \
                $(COMMDIR)\dircmn.obj \
                $(COMMDIR)\dbtable.obj \
                $(COMMDIR)\dcbase.obj \
                $(COMMDIR)\dircmn.obj \

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index fbe2600a9d6a704111e49d2bc4089a46e6550f93..6327e87a4bdd3dbaa66e48078d2f64a8f9550a47 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 01:55, 2001/06/09
+# This file was automatically generated by tmake at 01:54, 2001/06/22

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc