From da906b9742d866a56bfc1fef27143eb1ad5c4814 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 5 Sep 2002 20:54:30 +0000 Subject: [PATCH] Added effects.h to filelist.txt so it will get installed, fixed a syntax problem in makeall.sh, regenerated all makefiles and etc. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/filelist.txt | 1 + distrib/msw/tmake/makeall.sh | 16 +++--- src/gtk/files.lst | 2 + src/gtk1/files.lst | 2 + src/mac/carbon/files.lst | 2 + src/mac/files.lst | 2 + src/mgl/files.lst | 1 + src/microwin/files.lst | 4 ++ src/motif/files.lst | 4 ++ src/msw/files.lst | 2 + src/msw/makefile.bcc | 3 ++ src/msw/makefile.dos | 6 +++ src/msw/makefile.vc | 1 + src/msw/makefile.wat | 1 + src/wxUniv.dsp | 99 ++++++++++++++++++---------------- src/wxWindows.dsp | 12 +++++ src/x11/files.lst | 7 +-- 17 files changed, 107 insertions(+), 58 deletions(-) diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index 6ec7717d78..df9570e842 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -813,6 +813,7 @@ dragimag.h WXH dynarray.h WXH Base dynlib.h WXH Base dynload.h WXH Base +effects.h WXH encconv.h WXH Base event.h WXH Base expr.h WXH diff --git a/distrib/msw/tmake/makeall.sh b/distrib/msw/tmake/makeall.sh index b8e4935f19..c5c366503c 100755 --- a/distrib/msw/tmake/makeall.sh +++ b/distrib/msw/tmake/makeall.sh @@ -8,7 +8,7 @@ # Version: $Id$ # # This creates the makefiles for all compilers from the templates using -# tmake. The tmake executable should be in the path. +# tmake. The tmake executable should be in the path. # Assume we are in distrib/msw/tmake # @@ -16,13 +16,13 @@ topdir="../../.." srcdir="$topdir/src" mswdir="$srcdir/msw" -for tname in `ls *.t` +for tname in `ls *.t` do case $tname in b32.t) echo "Generating $mswdir/makefile.b32 for Borland C++ (32 bits)..." - ./tmake -t b32 wxwin.pro -o $mswdir/makefile.b32 ;; - ./tmake -t b32univ wxwin.pro -o $mswdir/makeuniv.b32 ;; + ./tmake -t b32 wxwin.pro -o $mswdir/makefile.b32 + ./tmake -t b32univ wxwin.pro -o $mswdir/makeuniv.b32 ./tmake -t b32base wxwin.pro -o $mswdir/makebase.b32 ;; bcc.t) @@ -41,19 +41,19 @@ do echo "Generating $mswdir/makefile.sc for Symantec C++..." ./tmake -t sc wxwin.pro -o $mswdir/makefile.sc;; - vc.t) + vc.t) echo "Generating $mswdir/makefile.vc for Visual C++ 4.0..." ./tmake -t vc wxwin.pro -o $mswdir/makefile.vc;; - vc6msw.t) + vc6msw.t) echo "Generating $srcdir/wxWindows.dsp for Visual C++ 6.0..." ./tmake -t vc6msw wxwin.pro -o $srcdir/wxWindows.dsp;; - vc6base.t) + vc6base.t) echo "Generating $srcdir/wxBase.dsp for Visual C++ 6.0..." ./tmake -t vc6base wxwin.pro -o $srcdir/wxBase.dsp;; - vc6univ.t) + vc6univ.t) echo "Generating $srcdir/wxUniv.dsp for Visual C++ 6.0..." ./tmake -t vc6univ wxwin.pro -o $srcdir/wxUniv.dsp;; diff --git a/src/gtk/files.lst b/src/gtk/files.lst index d8323ea30b..c0f8ea3bc2 100644 --- a/src/gtk/files.lst +++ b/src/gtk/files.lst @@ -336,6 +336,7 @@ ALL_HEADERS = \ dynarray.h \ dynlib.h \ dynload.h \ + effects.h \ encconv.h \ event.h \ expr.h \ @@ -593,6 +594,7 @@ ALL_HEADERS = \ generic/imaglist.h \ generic/laywin.h \ generic/listctrl.h \ + generic/mdig.cpp \ generic/msgdlgg.h \ generic/notebook.h \ generic/paletteg.h \ diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst index d8323ea30b..c0f8ea3bc2 100644 --- a/src/gtk1/files.lst +++ b/src/gtk1/files.lst @@ -336,6 +336,7 @@ ALL_HEADERS = \ dynarray.h \ dynlib.h \ dynload.h \ + effects.h \ encconv.h \ event.h \ expr.h \ @@ -593,6 +594,7 @@ ALL_HEADERS = \ generic/imaglist.h \ generic/laywin.h \ generic/listctrl.h \ + generic/mdig.cpp \ generic/msgdlgg.h \ generic/notebook.h \ generic/paletteg.h \ diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst index cb1af12e18..009570dcbb 100644 --- a/src/mac/carbon/files.lst +++ b/src/mac/carbon/files.lst @@ -342,6 +342,7 @@ ALL_HEADERS = \ dynarray.h \ dynlib.h \ dynload.h \ + effects.h \ encconv.h \ event.h \ expr.h \ @@ -620,6 +621,7 @@ ALL_HEADERS = \ generic/imaglist.h \ generic/laywin.h \ generic/listctrl.h \ + generic/mdig.cpp \ generic/msgdlgg.h \ generic/notebook.h \ generic/paletteg.h \ diff --git a/src/mac/files.lst b/src/mac/files.lst index cb1af12e18..009570dcbb 100644 --- a/src/mac/files.lst +++ b/src/mac/files.lst @@ -342,6 +342,7 @@ ALL_HEADERS = \ dynarray.h \ dynlib.h \ dynload.h \ + effects.h \ encconv.h \ event.h \ expr.h \ @@ -620,6 +621,7 @@ ALL_HEADERS = \ generic/imaglist.h \ generic/laywin.h \ generic/listctrl.h \ + generic/mdig.cpp \ generic/msgdlgg.h \ generic/notebook.h \ generic/paletteg.h \ diff --git a/src/mgl/files.lst b/src/mgl/files.lst index ffa1a3837a..ff689b82fe 100644 --- a/src/mgl/files.lst +++ b/src/mgl/files.lst @@ -298,6 +298,7 @@ ALL_HEADERS = \ dynarray.h \ dynlib.h \ dynload.h \ + effects.h \ encconv.h \ event.h \ expr.h \ diff --git a/src/microwin/files.lst b/src/microwin/files.lst index 210d326f2b..aeb212d346 100644 --- a/src/microwin/files.lst +++ b/src/microwin/files.lst @@ -23,6 +23,7 @@ ALL_SOURCES = \ generic/laywin.cpp \ generic/listctrl.cpp \ generic/logg.cpp \ + generic/mdig.cpp \ generic/msgdlgg.cpp \ generic/numdlgg.cpp \ generic/panelg.cpp \ @@ -297,6 +298,7 @@ ALL_HEADERS = \ dynarray.h \ dynlib.h \ dynload.h \ + effects.h \ encconv.h \ event.h \ expr.h \ @@ -587,6 +589,7 @@ ALL_HEADERS = \ generic/imaglist.h \ generic/laywin.h \ generic/listctrl.h \ + generic/mdig.cpp \ generic/msgdlgg.h \ generic/notebook.h \ generic/paletteg.h \ @@ -785,6 +788,7 @@ GENERICOBJS = \ laywin.o \ listctrl.o \ logg.o \ + mdig.o \ msgdlgg.o \ numdlgg.o \ panelg.o \ diff --git a/src/motif/files.lst b/src/motif/files.lst index 27fc13c888..4e74793472 100644 --- a/src/motif/files.lst +++ b/src/motif/files.lst @@ -22,6 +22,7 @@ ALL_SOURCES = \ generic/laywin.cpp \ generic/listctrl.cpp \ generic/logg.cpp \ + generic/mdig.cpp \ generic/msgdlgg.cpp \ generic/notebook.cpp \ generic/numdlgg.cpp \ @@ -327,6 +328,7 @@ ALL_HEADERS = \ dynarray.h \ dynlib.h \ dynload.h \ + effects.h \ encconv.h \ event.h \ expr.h \ @@ -581,6 +583,7 @@ ALL_HEADERS = \ generic/imaglist.h \ generic/laywin.h \ generic/listctrl.h \ + generic/mdig.cpp \ generic/msgdlgg.h \ generic/notebook.h \ generic/paletteg.h \ @@ -777,6 +780,7 @@ GENERICOBJS = \ laywin.o \ listctrl.o \ logg.o \ + mdig.o \ msgdlgg.o \ notebook.o \ numdlgg.o \ diff --git a/src/msw/files.lst b/src/msw/files.lst index 7432e2c270..a4d6e527bf 100644 --- a/src/msw/files.lst +++ b/src/msw/files.lst @@ -359,6 +359,7 @@ ALL_HEADERS = \ dynarray.h \ dynlib.h \ dynload.h \ + effects.h \ encconv.h \ event.h \ expr.h \ @@ -657,6 +658,7 @@ ALL_HEADERS = \ generic/imaglist.h \ generic/laywin.h \ generic/listctrl.h \ + generic/mdig.cpp \ generic/msgdlgg.h \ generic/notebook.h \ generic/paletteg.h \ diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index fd24a013db..b1f9affb98 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -81,6 +81,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ $(MSWDIR)\laywin.obj \ $(MSWDIR)\listctrl.obj \ $(MSWDIR)\logg.obj \ + $(MSWDIR)\mdig.obj \ $(MSWDIR)\notebook.obj \ $(MSWDIR)\numdlgg.obj \ $(MSWDIR)\panelg.obj \ @@ -778,6 +779,8 @@ $(MSWDIR)\listctrl.obj: $(GENDIR)\listctrl.$(SRCSUFF) $(MSWDIR)\logg.obj: $(GENDIR)\logg.$(SRCSUFF) +$(MSWDIR)\mdig.obj: $(GENDIR)\mdig.$(SRCSUFF) + $(MSWDIR)\notebook.obj: $(GENDIR)\notebook.$(SRCSUFF) $(MSWDIR)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF) diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index eaa572fa39..0590bdf3b9 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -64,6 +64,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \ $(GENDIR)\laywin.obj \ $(GENDIR)\listctrl.obj \ $(GENDIR)\logg.obj \ + $(GENDIR)\mdig.obj \ $(GENDIR)\notebook.obj \ $(GENDIR)\numdlgg.obj \ $(GENDIR)\panelg.obj \ @@ -1442,6 +1443,11 @@ $(GENDIR)/logg.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(GENDIR)/mdig.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(GENDIR)/notebook.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index c4843def62..b765ac772b 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -129,6 +129,7 @@ NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \ $(GENDIR)\$D\helphtml.obj \ $(GENDIR)\$D\imaglist.obj \ $(GENDIR)\$D\listctrl.obj \ + $(GENDIR)\$D\mdig.obj \ $(GENDIR)\$D\msgdlgg.obj \ $(GENDIR)\$D\notebook.obj \ $(GENDIR)\$D\tabg.obj diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index cef1a7df01..d3ccc4b0e0 100644 --- a/src/msw/makefile.wat +++ b/src/msw/makefile.wat @@ -86,6 +86,7 @@ NONESSENTIALOBJS= accel.obj & helphtml.obj & imaglist.obj & listctrl.obj & + mdig.obj & msgdlgg.obj & notebook.obj & paletteg.obj & diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp index db54216826..b967226f77 100644 --- a/src/wxUniv.dsp +++ b/src/wxUniv.dsp @@ -49,7 +49,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo +# ADD LIB32 /nologo /out:"..\lib\wxuniv.lib" !ELSEIF "$(CFG)" == "wxUniv - Win32 Debug" @@ -221,11 +221,6 @@ SOURCE=.\common\event.cpp # End Source File # Begin Source File -SOURCE=.\common\extended.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - SOURCE=.\common\fddlgcmn.cpp # End Source File # Begin Source File @@ -554,11 +549,6 @@ SOURCE=.\common\txtstrm.cpp # End Source File # Begin Source File -SOURCE=.\common\unzip.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - SOURCE=.\common\url.cpp # End Source File # Begin Source File @@ -609,6 +599,18 @@ SOURCE=.\common\zipstrm.cpp SOURCE=.\common\zstream.cpp # End Source File + +# Begin Source File + +SOURCE=.\common\extended.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=.\common\unzip.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File + # End Group # Begin Group "Generic Files" @@ -687,10 +689,6 @@ SOURCE=.\generic\helphtml.cpp # End Source File # Begin Source File -SOURCE=.\generic\imaglist.cpp -# End Source File -# Begin Source File - SOURCE=.\generic\laywin.cpp # End Source File # Begin Source File @@ -793,6 +791,7 @@ SOURCE=.\generic\treelay.cpp SOURCE=.\generic\wizard.cpp # End Source File + # End Group # Begin Group "wxHTML Files" @@ -881,12 +880,18 @@ SOURCE=.\html\m_tables.cpp SOURCE=.\html\winpars.cpp # End Source File + # End Group # Begin Group "MSW Files" # PROP Default_Filter "" # Begin Source File +SOURCE=.\msw\dummy.cpp +# ADD CPP /Yc"wx/wxprec.h" +# End Source File +# Begin Source File + SOURCE=.\msw\app.cpp # End Source File # Begin Source File @@ -951,11 +956,6 @@ SOURCE=.\msw\dir.cpp # End Source File # Begin Source File -SOURCE=.\msw\dummy.cpp -# ADD CPP /Yc"wx/wxprec.h" -# End Source File -# Begin Source File - SOURCE=.\msw\evtloop.cpp # End Source File # Begin Source File @@ -980,17 +980,11 @@ SOURCE=.\msw\gdiobj.cpp # End Source File # Begin Source File -SOURCE=.\msw\gsocket.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\msw\gsockmsw.c -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=.\msw\icon.cpp # End Source File # Begin Source File -SOURCE=.\msw\icon.cpp +SOURCE=.\msw\imaglist.cpp # End Source File # Begin Source File @@ -1060,26 +1054,22 @@ SOURCE=.\msw\volume.cpp SOURCE=.\msw\window.cpp # End Source File -# End Group -# Begin Group "Universal Files" - -# PROP Default_Filter "" -# Begin Group "Theme Files" -# PROP Default_Filter "" # Begin Source File -SOURCE=.\univ\themes\gtk.cpp +SOURCE=.\msw\gsocket.c +# SUBTRACT CPP /YX /Yc /Yu # End Source File # Begin Source File -SOURCE=.\univ\themes\metal.cpp +SOURCE=.\msw\gsockmsw.c +# SUBTRACT CPP /YX /Yc /Yu # End Source File -# Begin Source File -SOURCE=.\univ\themes\win32.cpp -# End Source File # End Group +# Begin Group "Universal Files" + +# PROP Default_Filter "" # Begin Source File SOURCE=.\univ\bmpbuttn.cpp @@ -1216,6 +1206,24 @@ SOURCE=.\univ\topluniv.cpp SOURCE=.\univ\winuniv.cpp # End Source File + +# Begin Group "Theme Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\univ\themes\gtk.cpp +# End Source File +# Begin Source File + +SOURCE=.\univ\themes\metal.cpp +# End Source File +# Begin Source File + +SOURCE=.\univ\themes\win32.cpp +# End Source File + +# End Group # End Group # Begin Group "Headers" @@ -1226,9 +1234,7 @@ SOURCE=.\univ\winuniv.cpp # Begin Source File SOURCE=..\include\wx\univ\setup.h - !IF "$(CFG)" == "wxUniv - Win32 Release" - # Begin Custom Build - Creating lib\univ\wx\setup.h from $(InputPath) InputPath=..\include\wx\univ\setup.h @@ -1236,9 +1242,7 @@ InputPath=..\include\wx\univ\setup.h copy "$(InputPath)" ..\lib\univ\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxUniv - Win32 Debug" - # Begin Custom Build - Creating lib\univd\wx\setup.h from $(InputPath) InputPath=..\include\wx\univ\setup.h @@ -1246,9 +1250,7 @@ InputPath=..\include\wx\univ\setup.h copy "$(InputPath)" ..\lib\univd\wx\setup.h # End Custom Build - !ENDIF - # End Source File # End Group # Begin Group "Common" @@ -1508,6 +1510,10 @@ SOURCE=..\include\wx\dynload.h # End Source File # Begin Source File +SOURCE=..\include\wx\effects.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\encconv.h # End Source File # Begin Source File @@ -2198,6 +2204,7 @@ SOURCE=..\include\wx\zipstrm.h SOURCE=..\include\wx\zstream.h # End Source File + # End Group # Begin Group "MSW" @@ -2362,6 +2369,7 @@ SOURCE=..\include\wx\generic\treectlg.h SOURCE=..\include\wx\generic\wizard.h # End Source File + # End Group # Begin Group "HTML" @@ -2418,6 +2426,7 @@ SOURCE=..\include\wx\html\m_templ.h SOURCE=..\include\wx\html\winpars.h # End Source File + # End Group # Begin Group "Universal" diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 07d260cc58..c4c81f4046 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -1786,6 +1786,10 @@ SOURCE=..\include\wx\dynload.h # End Source File # Begin Source File +SOURCE=..\include\wx\effects.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\encconv.h # End Source File # Begin Source File @@ -2022,6 +2026,10 @@ SOURCE=..\include\wx\list.h # End Source File # Begin Source File +SOURCE=..\include\wx\listbase.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\listbox.h # End Source File # Begin Source File @@ -2988,6 +2996,10 @@ SOURCE=..\include\wx\generic\splitter.h # End Source File # Begin Source File +SOURCE=..\include\wx\generic\statline.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\generic\statusbr.h # End Source File # Begin Source File diff --git a/src/x11/files.lst b/src/x11/files.lst index 74ca34d4ac..c02cac0985 100644 --- a/src/x11/files.lst +++ b/src/x11/files.lst @@ -307,6 +307,7 @@ ALL_HEADERS = \ dynarray.h \ dynlib.h \ dynload.h \ + effects.h \ encconv.h \ event.h \ expr.h \ @@ -482,7 +483,6 @@ ALL_HEADERS = \ xpmdecod.h \ zipstrm.h \ zstream.h \ - x11/accel.h \ x11/app.h \ x11/bitmap.h \ x11/brush.h \ @@ -503,7 +503,6 @@ ALL_HEADERS = \ x11/glcanvas.h \ x11/icon.h \ x11/joystick.h \ - x11/mdi.h \ x11/minifram.h \ x11/palette.h \ x11/pen.h \ @@ -511,9 +510,7 @@ ALL_HEADERS = \ x11/private.h \ x11/region.h \ x11/reparent.h \ - x11/settings.h \ x11/textctrl.h \ - x11/toolbar.h \ x11/toplevel.h \ x11/window.h \ univ/app.h \ @@ -574,7 +571,7 @@ ALL_HEADERS = \ generic/imaglist.h \ generic/laywin.h \ generic/listctrl.h \ - generic/mdig.h \ + generic/mdig.cpp \ generic/msgdlgg.h \ generic/notebook.h \ generic/paletteg.h \ -- 2.45.2