From 153ecbb81caab1febc1916f5ec76b29ba09d2632 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 24 Jun 2003 01:24:12 +0000 Subject: [PATCH] regenerated project/makefiles with tmake git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/files.lst | 25 ++++-- src/gtk/files.lst | 13 +++ src/gtk1/files.lst | 13 +++ src/mac/carbon/files.lst | 13 +++ src/mac/files.lst | 13 +++ src/mgl/files.lst | 13 +++ src/mgl/makefile.wat | 12 +++ src/microwin/files.lst | 15 ++++ src/motif/files.lst | 13 +++ src/msw/files.lst | 18 ++++ src/msw/makebase.b32 | 22 +++-- src/msw/makefile.b32 | 24 ++++++ src/msw/makefile.bcc | 15 ++++ src/msw/makefile.dos | 30 +++++++ src/msw/makefile.g95 | 17 ++-- src/msw/makefile.sc | 5 ++ src/msw/makefile.vc | 5 ++ src/msw/makefile.wat | 20 +++++ src/wxBase.dsp | 2 +- src/wxUniv.dsp | 32 +++++++ src/wxWindows.dsp | 181 +++++++++++++++++---------------------- src/x11/files.lst | 13 +++ 22 files changed, 390 insertions(+), 124 deletions(-) diff --git a/src/files.lst b/src/files.lst index ed695b888b..a340d0ba36 100644 --- a/src/files.lst +++ b/src/files.lst @@ -2,7 +2,7 @@ # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T! ALL_SOURCES = \ common/init.cpp \ - common/appcmn.cpp \ + common/appbase.cpp \ common/clntdata.cpp \ common/cmdline.cpp \ common/config.cpp \ @@ -23,7 +23,7 @@ ALL_SOURCES = \ common/filefn.cpp \ common/filename.cpp \ common/filesys.cpp \ - common/fontmap.cpp \ + common/fmapbase.cpp \ common/fs_inet.cpp \ common/fs_mem.cpp \ common/fs_zip.cpp \ @@ -50,13 +50,13 @@ ALL_SOURCES = \ common/sckipc.cpp \ common/sckstrm.cpp \ common/socket.cpp \ + common/stopwatch.cpp \ common/strconv.cpp \ common/stream.cpp \ common/string.cpp \ common/sysopt.cpp \ common/textbuf.cpp \ common/textfile.cpp \ - common/timercmn.cpp \ common/tokenzr.cpp \ common/txtstrm.cpp \ common/unzip.c \ @@ -67,18 +67,21 @@ ALL_SOURCES = \ common/wxchar.cpp \ common/zipstrm.cpp \ common/zstream.cpp \ + unix/baseunix.cpp \ unix/dir.cpp \ unix/gsocket.c \ unix/mimetype.cpp \ unix/snglinst.cpp \ unix/threadpsx.cpp \ unix/utilsunx.cpp \ + msw/basemsw.cpp \ msw/dde.cpp \ msw/dir.cpp \ msw/gsocket.c \ msw/gsockmsw.c \ msw/main.cpp \ msw/mimetype.cpp \ + msw/mslu.cpp \ msw/regconf.cpp \ msw/registry.cpp \ msw/snglinst.cpp \ @@ -89,6 +92,7 @@ ALL_SOURCES = \ ALL_HEADERS = \ app.h \ + apptrait.h \ arrimpl.cpp \ buffer.h \ build.h \ @@ -119,6 +123,7 @@ ALL_HEADERS = \ filefn.h \ filename.h \ filesys.h \ + fmappriv.h \ fontenc.h \ fontmap.h \ fs_inet.h \ @@ -178,8 +183,13 @@ ALL_HEADERS = \ wxprec.h \ zipstrm.h \ zstream.h \ + unix/apptbase.h \ + unix/apptrait.h \ unix/gsockunx.h \ unix/mimetype.h \ + unix/pipe.h \ + msw/apptbase.h \ + msw/apptrait.h \ msw/dde.h \ msw/gccpriv.h \ msw/mimetype.h \ @@ -191,7 +201,7 @@ ALL_HEADERS = \ BASE_OBJS = \ init.o \ - appcmn.o \ + appbase.o \ clntdata.o \ cmdline.o \ config.o \ @@ -212,7 +222,7 @@ BASE_OBJS = \ filefn.o \ filename.o \ filesys.o \ - fontmap.o \ + fmapbase.o \ fs_inet.o \ fs_mem.o \ fs_zip.o \ @@ -239,13 +249,13 @@ BASE_OBJS = \ sckipc.o \ sckstrm.o \ socket.o \ + stopwatch.o \ strconv.o \ stream.o \ string.o \ sysopt.o \ textbuf.o \ textfile.o \ - timercmn.o \ tokenzr.o \ txtstrm.o \ unzip.o \ @@ -258,6 +268,7 @@ BASE_OBJS = \ zstream.o BASE_UNIX_OBJS = \ + baseunix.o \ dir.o \ gsocket.o \ mimetype.o \ @@ -266,12 +277,14 @@ BASE_UNIX_OBJS = \ utilsunx.o BASE_MSW_OBJS = \ + basemsw.o \ dde.o \ dir.o \ gsocket.o \ gsockmsw.o \ main.o \ mimetype.o \ + mslu.o \ regconf.o \ registry.o \ snglinst.o \ diff --git a/src/gtk/files.lst b/src/gtk/files.lst index 764c334a7c..989e4927cd 100644 --- a/src/gtk/files.lst +++ b/src/gtk/files.lst @@ -45,6 +45,7 @@ ALL_SOURCES = \ generic/treectlg.cpp \ generic/wizard.cpp \ common/accesscmn.cpp \ + common/appbase.cpp \ common/appcmn.cpp \ common/artprov.cpp \ common/artstd.cpp \ @@ -89,6 +90,7 @@ ALL_SOURCES = \ common/filename.cpp \ common/filesys.cpp \ common/fldlgcmn.cpp \ + common/fmapbase.cpp \ common/fontcmn.cpp \ common/fontmap.cpp \ common/framecmn.cpp \ @@ -150,6 +152,7 @@ ALL_SOURCES = \ common/sizer.cpp \ common/socket.cpp \ common/statbar.cpp \ + common/stopwatch.cpp \ common/strconv.cpp \ common/stream.cpp \ common/string.cpp \ @@ -240,6 +243,7 @@ ALL_SOURCES = \ gtk/wave.cpp \ gtk/win_gtk.c \ gtk/window.cpp \ + unix/baseunix.cpp \ unix/dialup.cpp \ unix/dir.cpp \ unix/fontenum.cpp \ @@ -276,6 +280,7 @@ ALL_HEADERS = \ accel.h \ access.h \ app.h \ + apptrait.h \ arrimpl.cpp \ artprov.h \ bitmap.h \ @@ -350,6 +355,7 @@ ALL_HEADERS = \ filefn.h \ filename.h \ filesys.h \ + fmappriv.h \ font.h \ fontdlg.h \ fontenc.h \ @@ -610,10 +616,13 @@ ALL_HEADERS = \ generic/timer.h \ generic/treectlg.h \ generic/wizard.h \ + unix/apptbase.h \ + unix/apptrait.h \ unix/execute.h \ unix/fontutil.h \ unix/gsockunx.h \ unix/mimetype.h \ + unix/pipe.h \ unix/taskbarx11.h \ unix/utilsx11.h \ html/forcelnk.h \ @@ -636,6 +645,7 @@ ALL_HEADERS = \ COMMONOBJS = \ accesscmn.o \ + appbase.o \ appcmn.o \ artprov.o \ artstd.o \ @@ -680,6 +690,7 @@ COMMONOBJS = \ filename.o \ filesys.o \ fldlgcmn.o \ + fmapbase.o \ fontcmn.o \ fontmap.o \ framecmn.o \ @@ -741,6 +752,7 @@ COMMONOBJS = \ sizer.o \ socket.o \ statbar.o \ + stopwatch.o \ strconv.o \ stream.o \ string.o \ @@ -951,6 +963,7 @@ GUI_LOWLEVEL_OBJS = \ window.o UNIXOBJS = \ + baseunix.o \ dialup.o \ dir.o \ fontenum.o \ diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst index 764c334a7c..989e4927cd 100644 --- a/src/gtk1/files.lst +++ b/src/gtk1/files.lst @@ -45,6 +45,7 @@ ALL_SOURCES = \ generic/treectlg.cpp \ generic/wizard.cpp \ common/accesscmn.cpp \ + common/appbase.cpp \ common/appcmn.cpp \ common/artprov.cpp \ common/artstd.cpp \ @@ -89,6 +90,7 @@ ALL_SOURCES = \ common/filename.cpp \ common/filesys.cpp \ common/fldlgcmn.cpp \ + common/fmapbase.cpp \ common/fontcmn.cpp \ common/fontmap.cpp \ common/framecmn.cpp \ @@ -150,6 +152,7 @@ ALL_SOURCES = \ common/sizer.cpp \ common/socket.cpp \ common/statbar.cpp \ + common/stopwatch.cpp \ common/strconv.cpp \ common/stream.cpp \ common/string.cpp \ @@ -240,6 +243,7 @@ ALL_SOURCES = \ gtk/wave.cpp \ gtk/win_gtk.c \ gtk/window.cpp \ + unix/baseunix.cpp \ unix/dialup.cpp \ unix/dir.cpp \ unix/fontenum.cpp \ @@ -276,6 +280,7 @@ ALL_HEADERS = \ accel.h \ access.h \ app.h \ + apptrait.h \ arrimpl.cpp \ artprov.h \ bitmap.h \ @@ -350,6 +355,7 @@ ALL_HEADERS = \ filefn.h \ filename.h \ filesys.h \ + fmappriv.h \ font.h \ fontdlg.h \ fontenc.h \ @@ -610,10 +616,13 @@ ALL_HEADERS = \ generic/timer.h \ generic/treectlg.h \ generic/wizard.h \ + unix/apptbase.h \ + unix/apptrait.h \ unix/execute.h \ unix/fontutil.h \ unix/gsockunx.h \ unix/mimetype.h \ + unix/pipe.h \ unix/taskbarx11.h \ unix/utilsx11.h \ html/forcelnk.h \ @@ -636,6 +645,7 @@ ALL_HEADERS = \ COMMONOBJS = \ accesscmn.o \ + appbase.o \ appcmn.o \ artprov.o \ artstd.o \ @@ -680,6 +690,7 @@ COMMONOBJS = \ filename.o \ filesys.o \ fldlgcmn.o \ + fmapbase.o \ fontcmn.o \ fontmap.o \ framecmn.o \ @@ -741,6 +752,7 @@ COMMONOBJS = \ sizer.o \ socket.o \ statbar.o \ + stopwatch.o \ strconv.o \ stream.o \ string.o \ @@ -951,6 +963,7 @@ GUI_LOWLEVEL_OBJS = \ window.o UNIXOBJS = \ + baseunix.o \ dialup.o \ dir.o \ fontenum.o \ diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst index c8e2c5552f..95a30a2a55 100644 --- a/src/mac/carbon/files.lst +++ b/src/mac/carbon/files.lst @@ -42,6 +42,7 @@ ALL_SOURCES = \ generic/treectlg.cpp \ generic/wizard.cpp \ common/accesscmn.cpp \ + common/appbase.cpp \ common/appcmn.cpp \ common/artprov.cpp \ common/artstd.cpp \ @@ -86,6 +87,7 @@ ALL_SOURCES = \ common/filename.cpp \ common/filesys.cpp \ common/fldlgcmn.cpp \ + common/fmapbase.cpp \ common/fontcmn.cpp \ common/fontmap.cpp \ common/framecmn.cpp \ @@ -147,6 +149,7 @@ ALL_SOURCES = \ common/sizer.cpp \ common/socket.cpp \ common/statbar.cpp \ + common/stopwatch.cpp \ common/strconv.cpp \ common/stream.cpp \ common/string.cpp \ @@ -250,6 +253,7 @@ ALL_SOURCES = \ mac/utilsexc.cpp \ mac/wave.cpp \ mac/window.cpp \ + unix/baseunix.cpp \ unix/snglinst.cpp \ unix/utilsunx.cpp \ html/helpctrl.cpp \ @@ -277,6 +281,7 @@ ALL_HEADERS = \ accel.h \ access.h \ app.h \ + apptrait.h \ arrimpl.cpp \ artprov.h \ bitmap.h \ @@ -351,6 +356,7 @@ ALL_HEADERS = \ filefn.h \ filename.h \ filesys.h \ + fmappriv.h \ font.h \ fontdlg.h \ fontenc.h \ @@ -632,10 +638,13 @@ ALL_HEADERS = \ generic/timer.h \ generic/treectlg.h \ generic/wizard.h \ + unix/apptbase.h \ + unix/apptrait.h \ unix/execute.h \ unix/fontutil.h \ unix/gsockunx.h \ unix/mimetype.h \ + unix/pipe.h \ unix/taskbarx11.h \ unix/utilsx11.h \ html/forcelnk.h \ @@ -658,6 +667,7 @@ ALL_HEADERS = \ COMMONOBJS = \ accesscmn.o \ + appbase.o \ appcmn.o \ artprov.o \ artstd.o \ @@ -702,6 +712,7 @@ COMMONOBJS = \ filename.o \ filesys.o \ fldlgcmn.o \ + fmapbase.o \ fontcmn.o \ fontmap.o \ framecmn.o \ @@ -763,6 +774,7 @@ COMMONOBJS = \ sizer.o \ socket.o \ statbar.o \ + stopwatch.o \ strconv.o \ stream.o \ string.o \ @@ -913,6 +925,7 @@ GUIOBJS = \ window.o UNIXOBJS = \ + baseunix.o \ snglinst.o \ utilsunx.o diff --git a/src/mac/files.lst b/src/mac/files.lst index c8e2c5552f..95a30a2a55 100644 --- a/src/mac/files.lst +++ b/src/mac/files.lst @@ -42,6 +42,7 @@ ALL_SOURCES = \ generic/treectlg.cpp \ generic/wizard.cpp \ common/accesscmn.cpp \ + common/appbase.cpp \ common/appcmn.cpp \ common/artprov.cpp \ common/artstd.cpp \ @@ -86,6 +87,7 @@ ALL_SOURCES = \ common/filename.cpp \ common/filesys.cpp \ common/fldlgcmn.cpp \ + common/fmapbase.cpp \ common/fontcmn.cpp \ common/fontmap.cpp \ common/framecmn.cpp \ @@ -147,6 +149,7 @@ ALL_SOURCES = \ common/sizer.cpp \ common/socket.cpp \ common/statbar.cpp \ + common/stopwatch.cpp \ common/strconv.cpp \ common/stream.cpp \ common/string.cpp \ @@ -250,6 +253,7 @@ ALL_SOURCES = \ mac/utilsexc.cpp \ mac/wave.cpp \ mac/window.cpp \ + unix/baseunix.cpp \ unix/snglinst.cpp \ unix/utilsunx.cpp \ html/helpctrl.cpp \ @@ -277,6 +281,7 @@ ALL_HEADERS = \ accel.h \ access.h \ app.h \ + apptrait.h \ arrimpl.cpp \ artprov.h \ bitmap.h \ @@ -351,6 +356,7 @@ ALL_HEADERS = \ filefn.h \ filename.h \ filesys.h \ + fmappriv.h \ font.h \ fontdlg.h \ fontenc.h \ @@ -632,10 +638,13 @@ ALL_HEADERS = \ generic/timer.h \ generic/treectlg.h \ generic/wizard.h \ + unix/apptbase.h \ + unix/apptrait.h \ unix/execute.h \ unix/fontutil.h \ unix/gsockunx.h \ unix/mimetype.h \ + unix/pipe.h \ unix/taskbarx11.h \ unix/utilsx11.h \ html/forcelnk.h \ @@ -658,6 +667,7 @@ ALL_HEADERS = \ COMMONOBJS = \ accesscmn.o \ + appbase.o \ appcmn.o \ artprov.o \ artstd.o \ @@ -702,6 +712,7 @@ COMMONOBJS = \ filename.o \ filesys.o \ fldlgcmn.o \ + fmapbase.o \ fontcmn.o \ fontmap.o \ framecmn.o \ @@ -763,6 +774,7 @@ COMMONOBJS = \ sizer.o \ socket.o \ statbar.o \ + stopwatch.o \ strconv.o \ stream.o \ string.o \ @@ -913,6 +925,7 @@ GUIOBJS = \ window.o UNIXOBJS = \ + baseunix.o \ snglinst.o \ utilsunx.o diff --git a/src/mgl/files.lst b/src/mgl/files.lst index 73cc43fac6..ae4447ff70 100644 --- a/src/mgl/files.lst +++ b/src/mgl/files.lst @@ -45,6 +45,7 @@ ALL_SOURCES = \ generic/treectlg.cpp \ generic/wizard.cpp \ common/accesscmn.cpp \ + common/appbase.cpp \ common/appcmn.cpp \ common/artprov.cpp \ common/artstd.cpp \ @@ -90,6 +91,7 @@ ALL_SOURCES = \ common/filename.cpp \ common/filesys.cpp \ common/fldlgcmn.cpp \ + common/fmapbase.cpp \ common/fontcmn.cpp \ common/fontmap.cpp \ common/framecmn.cpp \ @@ -151,6 +153,7 @@ ALL_SOURCES = \ common/sizer.cpp \ common/socket.cpp \ common/statbar.cpp \ + common/stopwatch.cpp \ common/strconv.cpp \ common/stream.cpp \ common/string.cpp \ @@ -203,6 +206,7 @@ ALL_SOURCES = \ mgl/toplevel.cpp \ mgl/utils.cpp \ mgl/window.cpp \ + unix/baseunix.cpp \ unix/dialup.cpp \ unix/dir.cpp \ unix/gsocket.c \ @@ -235,6 +239,7 @@ ALL_HEADERS = \ accel.h \ access.h \ app.h \ + apptrait.h \ arrimpl.cpp \ artprov.h \ bitmap.h \ @@ -309,6 +314,7 @@ ALL_HEADERS = \ filefn.h \ filename.h \ filesys.h \ + fmappriv.h \ font.h \ fontdlg.h \ fontenc.h \ @@ -529,10 +535,13 @@ ALL_HEADERS = \ generic/timer.h \ generic/treectlg.h \ generic/wizard.h \ + unix/apptbase.h \ + unix/apptrait.h \ unix/execute.h \ unix/fontutil.h \ unix/gsockunx.h \ unix/mimetype.h \ + unix/pipe.h \ unix/taskbarx11.h \ unix/utilsx11.h \ html/forcelnk.h \ @@ -555,6 +564,7 @@ ALL_HEADERS = \ COMMONOBJS = \ accesscmn.o \ + appbase.o \ appcmn.o \ artprov.o \ artstd.o \ @@ -600,6 +610,7 @@ COMMONOBJS = \ filename.o \ filesys.o \ fldlgcmn.o \ + fmapbase.o \ fontcmn.o \ fontmap.o \ framecmn.o \ @@ -661,6 +672,7 @@ COMMONOBJS = \ sizer.o \ socket.o \ statbar.o \ + stopwatch.o \ strconv.o \ stream.o \ string.o \ @@ -762,6 +774,7 @@ GUI_LOWLEVEL_OBJS = \ window.o UNIXOBJS = \ + baseunix.o \ dialup.o \ dir.o \ gsocket.o \ diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat index 38c898a921..118ad35b98 100644 --- a/src/mgl/makefile.wat +++ b/src/mgl/makefile.wat @@ -87,6 +87,7 @@ GENERICOBJS= accel.obj & COMMONOBJS = & y_tab.obj & accesscmn.obj & + appbase.obj & appcmn.obj & artprov.obj & artstd.obj & @@ -132,6 +133,7 @@ COMMONOBJS = & filename.obj & filesys.obj & fldlgcmn.obj & + fmapbase.obj & fontcmn.obj & fontmap.obj & framecmn.obj & @@ -193,6 +195,7 @@ COMMONOBJS = & sizer.obj & socket.obj & statbar.obj & + stopwatch.obj & strconv.obj & stream.obj & string.obj & @@ -536,6 +539,9 @@ win32.obj: $(UNIVTHEMEDIR)\win32.cpp accesscmn.obj: $(COMMDIR)\accesscmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +appbase.obj: $(COMMDIR)\appbase.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + appcmn.obj: $(COMMDIR)\appcmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -671,6 +677,9 @@ filesys.obj: $(COMMDIR)\filesys.cpp fldlgcmn.obj: $(COMMDIR)\fldlgcmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +fmapbase.obj: $(COMMDIR)\fmapbase.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + fontcmn.obj: $(COMMDIR)\fontcmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -854,6 +863,9 @@ socket.obj: $(COMMDIR)\socket.cpp statbar.obj: $(COMMDIR)\statbar.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +stopwatch.obj: $(COMMDIR)\stopwatch.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + strconv.obj: $(COMMDIR)\strconv.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< diff --git a/src/microwin/files.lst b/src/microwin/files.lst index 5b4080ea22..47b3e1719c 100644 --- a/src/microwin/files.lst +++ b/src/microwin/files.lst @@ -43,6 +43,7 @@ ALL_SOURCES = \ generic/treectlg.cpp \ generic/wizard.cpp \ common/accesscmn.cpp \ + common/appbase.cpp \ common/appcmn.cpp \ common/artprov.cpp \ common/artstd.cpp \ @@ -87,6 +88,7 @@ ALL_SOURCES = \ common/filename.cpp \ common/filesys.cpp \ common/fldlgcmn.cpp \ + common/fmapbase.cpp \ common/fontcmn.cpp \ common/fontmap.cpp \ common/framecmn.cpp \ @@ -148,6 +150,7 @@ ALL_SOURCES = \ common/sizer.cpp \ common/socket.cpp \ common/statbar.cpp \ + common/stopwatch.cpp \ common/strconv.cpp \ common/stream.cpp \ common/string.cpp \ @@ -204,6 +207,7 @@ ALL_SOURCES = \ msw/toplevel.cpp \ msw/utils.cpp \ msw/window.cpp \ + unix/baseunix.cpp \ unix/dialup.cpp \ unix/dir.cpp \ unix/gsocket.c \ @@ -235,6 +239,7 @@ ALL_HEADERS = \ accel.h \ access.h \ app.h \ + apptrait.h \ arrimpl.cpp \ artprov.h \ bitmap.h \ @@ -309,6 +314,7 @@ ALL_HEADERS = \ filefn.h \ filename.h \ filesys.h \ + fmappriv.h \ font.h \ fontdlg.h \ fontenc.h \ @@ -472,6 +478,8 @@ ALL_HEADERS = \ msw/accel.h \ msw/access.h \ msw/app.h \ + msw/apptbase.h \ + msw/apptrait.h \ msw/bitmap.h \ msw/bmpbuttn.h \ msw/brush.h \ @@ -600,10 +608,13 @@ ALL_HEADERS = \ generic/timer.h \ generic/treectlg.h \ generic/wizard.h \ + unix/apptbase.h \ + unix/apptrait.h \ unix/execute.h \ unix/fontutil.h \ unix/gsockunx.h \ unix/mimetype.h \ + unix/pipe.h \ unix/taskbarx11.h \ unix/utilsx11.h \ html/forcelnk.h \ @@ -627,6 +638,7 @@ ALL_HEADERS = \ COMMONOBJS = \ parser.o \ accesscmn.o \ + appbase.o \ appcmn.o \ artprov.o \ artstd.o \ @@ -671,6 +683,7 @@ COMMONOBJS = \ filename.o \ filesys.o \ fldlgcmn.o \ + fmapbase.o \ fontcmn.o \ fontmap.o \ framecmn.o \ @@ -732,6 +745,7 @@ COMMONOBJS = \ sizer.o \ socket.o \ statbar.o \ + stopwatch.o \ strconv.o \ stream.o \ string.o \ @@ -835,6 +849,7 @@ GUI_LOWLEVEL_OBJS = \ window.o UNIXOBJS = \ + baseunix.o \ dialup.o \ dir.o \ gsocket.o \ diff --git a/src/motif/files.lst b/src/motif/files.lst index 99b5e694f2..d74d6b09d2 100644 --- a/src/motif/files.lst +++ b/src/motif/files.lst @@ -45,6 +45,7 @@ ALL_SOURCES = \ generic/treectlg.cpp \ generic/wizard.cpp \ common/accesscmn.cpp \ + common/appbase.cpp \ common/appcmn.cpp \ common/artprov.cpp \ common/artstd.cpp \ @@ -90,6 +91,7 @@ ALL_SOURCES = \ common/filename.cpp \ common/filesys.cpp \ common/fldlgcmn.cpp \ + common/fmapbase.cpp \ common/fontcmn.cpp \ common/fontmap.cpp \ common/framecmn.cpp \ @@ -151,6 +153,7 @@ ALL_SOURCES = \ common/sizer.cpp \ common/socket.cpp \ common/statbar.cpp \ + common/stopwatch.cpp \ common/strconv.cpp \ common/stream.cpp \ common/string.cpp \ @@ -236,6 +239,7 @@ ALL_SOURCES = \ x11/pen.cpp \ x11/region.cpp \ x11/utilsx.cpp \ + unix/baseunix.cpp \ unix/dialup.cpp \ unix/dir.cpp \ unix/fontenum.cpp \ @@ -273,6 +277,7 @@ ALL_HEADERS = \ access.h \ access.h \ app.h \ + apptrait.h \ arrimpl.cpp \ artprov.h \ bitmap.h \ @@ -347,6 +352,7 @@ ALL_HEADERS = \ filefn.h \ filename.h \ filesys.h \ + fmappriv.h \ font.h \ fontdlg.h \ fontenc.h \ @@ -600,10 +606,13 @@ ALL_HEADERS = \ generic/timer.h \ generic/treectlg.h \ generic/wizard.h \ + unix/apptbase.h \ + unix/apptrait.h \ unix/execute.h \ unix/fontutil.h \ unix/gsockunx.h \ unix/mimetype.h \ + unix/pipe.h \ unix/taskbarx11.h \ unix/utilsx11.h \ html/forcelnk.h \ @@ -631,6 +640,7 @@ ALL_HEADERS = \ COMMONOBJS = \ accesscmn.o \ + appbase.o \ appcmn.o \ artprov.o \ artstd.o \ @@ -676,6 +686,7 @@ COMMONOBJS = \ filename.o \ filesys.o \ fldlgcmn.o \ + fmapbase.o \ fontcmn.o \ fontmap.o \ framecmn.o \ @@ -737,6 +748,7 @@ COMMONOBJS = \ sizer.o \ socket.o \ statbar.o \ + stopwatch.o \ strconv.o \ stream.o \ string.o \ @@ -872,6 +884,7 @@ GUIOBJS = \ utilsx.o UNIXOBJS = \ + baseunix.o \ dialup.o \ dir.o \ fontenum.o \ diff --git a/src/msw/files.lst b/src/msw/files.lst index 2421fc9735..4b54428c5b 100644 --- a/src/msw/files.lst +++ b/src/msw/files.lst @@ -30,6 +30,7 @@ ALL_SOURCES = \ generic/treectlg.cpp \ generic/wizard.cpp \ common/accesscmn.cpp \ + common/appbase.cpp \ common/appcmn.cpp \ common/artprov.cpp \ common/artstd.cpp \ @@ -74,6 +75,7 @@ ALL_SOURCES = \ common/filename.cpp \ common/filesys.cpp \ common/fldlgcmn.cpp \ + common/fmapbase.cpp \ common/fontcmn.cpp \ common/fontmap.cpp \ common/framecmn.cpp \ @@ -135,6 +137,7 @@ ALL_SOURCES = \ common/sizer.cpp \ common/socket.cpp \ common/statbar.cpp \ + common/stopwatch.cpp \ common/strconv.cpp \ common/stream.cpp \ common/string.cpp \ @@ -166,6 +169,7 @@ ALL_SOURCES = \ msw/ole/access.cpp \ msw/app.cpp \ msw/ole/automtn.cpp \ + msw/basemsw.cpp \ msw/bitmap.cpp \ msw/bmpbuttn.cpp \ msw/brush.cpp \ @@ -268,6 +272,7 @@ ALL_SOURCES = \ msw/treectrl.cpp \ msw/utils.cpp \ msw/utilsexc.cpp \ + msw/utilsgui.cpp \ msw/ole/uuid.cpp \ msw/uxtheme.cpp \ msw/volume.cpp \ @@ -298,6 +303,7 @@ ALL_HEADERS = \ accel.h \ access.h \ app.h \ + apptrait.h \ arrimpl.cpp \ artprov.h \ bitmap.h \ @@ -372,6 +378,7 @@ ALL_HEADERS = \ filefn.h \ filename.h \ filesys.h \ + fmappriv.h \ font.h \ fontdlg.h \ fontenc.h \ @@ -535,6 +542,8 @@ ALL_HEADERS = \ msw/accel.h \ msw/access.h \ msw/app.h \ + msw/apptbase.h \ + msw/apptrait.h \ msw/bitmap.h \ msw/bmpbuttn.h \ msw/brush.h \ @@ -672,10 +681,13 @@ ALL_HEADERS = \ generic/timer.h \ generic/treectlg.h \ generic/wizard.h \ + unix/apptbase.h \ + unix/apptrait.h \ unix/execute.h \ unix/fontutil.h \ unix/gsockunx.h \ unix/mimetype.h \ + unix/pipe.h \ unix/taskbarx11.h \ unix/utilsx11.h \ html/forcelnk.h \ @@ -698,6 +710,7 @@ ALL_HEADERS = \ COMMONOBJS = \ accesscmn.o \ + appbase.o \ appcmn.o \ artprov.o \ artstd.o \ @@ -742,6 +755,7 @@ COMMONOBJS = \ filename.o \ filesys.o \ fldlgcmn.o \ + fmapbase.o \ fontcmn.o \ fontmap.o \ framecmn.o \ @@ -803,6 +817,7 @@ COMMONOBJS = \ sizer.o \ socket.o \ statbar.o \ + stopwatch.o \ strconv.o \ stream.o \ string.o \ @@ -864,6 +879,7 @@ GENERICOBJS = \ GUIOBJS = \ accel.o \ app.o \ + basemsw.o \ bitmap.o \ bmpbuttn.o \ brush.o \ @@ -962,6 +978,7 @@ GUIOBJS = \ treectrl.o \ utils.o \ utilsexc.o \ + utilsgui.o \ uxtheme.o \ volume.o \ wave.o \ @@ -1016,6 +1033,7 @@ GUI_LOWLEVEL_OBJS = \ toplevel.o \ utils.o \ utilsexc.o \ + utilsgui.o \ wave.o \ window.o diff --git a/src/msw/makebase.b32 b/src/msw/makebase.b32 index 4ba86fad18..9cb1bea264 100644 --- a/src/msw/makebase.b32 +++ b/src/msw/makebase.b32 @@ -58,7 +58,7 @@ MSWDIR=. DOCDIR = $(WXDIR)\docs COMMONOBJS = \ - $(OBJ_PATH)\appcmn.obj \ + $(OBJ_PATH)\appbase.obj \ $(OBJ_PATH)\clntdata.obj \ $(OBJ_PATH)\cmdline.obj \ $(OBJ_PATH)\config.obj \ @@ -79,7 +79,7 @@ COMMONOBJS = \ $(OBJ_PATH)\filefn.obj \ $(OBJ_PATH)\filename.obj \ $(OBJ_PATH)\filesys.obj \ - $(OBJ_PATH)\fontmap.obj \ + $(OBJ_PATH)\fmapbase.obj \ $(OBJ_PATH)\fs_inet.obj \ $(OBJ_PATH)\fs_mem.obj \ $(OBJ_PATH)\fs_zip.obj \ @@ -106,13 +106,13 @@ COMMONOBJS = \ $(OBJ_PATH)\sckipc.obj \ $(OBJ_PATH)\sckstrm.obj \ $(OBJ_PATH)\socket.obj \ + $(OBJ_PATH)\stopwatch.obj \ $(OBJ_PATH)\strconv.obj \ $(OBJ_PATH)\stream.obj \ $(OBJ_PATH)\string.obj \ $(OBJ_PATH)\sysopt.obj \ $(OBJ_PATH)\textbuf.obj \ $(OBJ_PATH)\textfile.obj \ - $(OBJ_PATH)\timercmn.obj \ $(OBJ_PATH)\tokenzr.obj \ $(OBJ_PATH)\txtstrm.obj \ $(OBJ_PATH)\unzip.obj \ @@ -125,12 +125,14 @@ COMMONOBJS = \ $(OBJ_PATH)\zstream.obj \ $(OBJ_PATH)\init.obj -MSWOBJS = $(OBJ_PATH)\dde.obj \ +MSWOBJS = $(OBJ_PATH)\basemsw.obj \ + $(OBJ_PATH)\dde.obj \ $(OBJ_PATH)\dir.obj \ $(OBJ_PATH)\gsocket.obj \ $(OBJ_PATH)\gsockmsw.obj \ $(OBJ_PATH)\main.obj \ $(OBJ_PATH)\mimetype.obj \ + $(OBJ_PATH)\mslu.obj \ $(OBJ_PATH)\regconf.obj \ $(OBJ_PATH)\registry.obj \ $(OBJ_PATH)\snglinst.obj \ @@ -195,6 +197,8 @@ dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\includ version.res: brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc +$(OBJ_PATH)\basemsw.obj: $(MSWDIR)\basemsw.$(SRCSUFF) + $(OBJ_PATH)\dde.obj: $(MSWDIR)\dde.$(SRCSUFF) $(OBJ_PATH)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF) @@ -207,6 +211,8 @@ $(OBJ_PATH)\main.obj: $(MSWDIR)\main.$(SRCSUFF) $(OBJ_PATH)\mimetype.obj: $(MSWDIR)\mimetype.$(SRCSUFF) +$(OBJ_PATH)\mslu.obj: $(MSWDIR)\mslu.$(SRCSUFF) + $(OBJ_PATH)\regconf.obj: $(MSWDIR)\regconf.$(SRCSUFF) $(OBJ_PATH)\registry.obj: $(MSWDIR)\registry.$(SRCSUFF) @@ -226,7 +232,7 @@ $(OBJ_PATH)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF) ######################################################## # Common objects (always compiled) -$(OBJ_PATH)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF) +$(OBJ_PATH)\appbase.obj: $(COMMDIR)\appbase.$(SRCSUFF) $(OBJ_PATH)\clntdata.obj: $(COMMDIR)\clntdata.$(SRCSUFF) @@ -268,7 +274,7 @@ $(OBJ_PATH)\filename.obj: $(COMMDIR)\filename.$(SRCSUFF) $(OBJ_PATH)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF) -$(OBJ_PATH)\fontmap.obj: $(COMMDIR)\fontmap.$(SRCSUFF) +$(OBJ_PATH)\fmapbase.obj: $(COMMDIR)\fmapbase.$(SRCSUFF) $(OBJ_PATH)\fs_inet.obj: $(COMMDIR)\fs_inet.$(SRCSUFF) @@ -322,6 +328,8 @@ $(OBJ_PATH)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF) $(OBJ_PATH)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF) +$(OBJ_PATH)\stopwatch.obj: $(COMMDIR)\stopwatch.$(SRCSUFF) + $(OBJ_PATH)\strconv.obj: $(COMMDIR)\strconv.$(SRCSUFF) $(OBJ_PATH)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF) @@ -334,8 +342,6 @@ $(OBJ_PATH)\textbuf.obj: $(COMMDIR)\textbuf.$(SRCSUFF) $(OBJ_PATH)\textfile.obj: $(COMMDIR)\textfile.$(SRCSUFF) -$(OBJ_PATH)\timercmn.obj: $(COMMDIR)\timercmn.$(SRCSUFF) - $(OBJ_PATH)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF) $(OBJ_PATH)\txtstrm.obj: $(COMMDIR)\txtstrm.$(SRCSUFF) diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 33ce3400d2..7623ca7f60 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -104,6 +104,7 @@ MSWOBJS = $(OBJ_PATH)\accel.obj \ $(OBJ_PATH)\access.obj \ $(OBJ_PATH)\app.obj \ $(OBJ_PATH)\automtn.obj \ + $(OBJ_PATH)\basemsw.obj \ $(OBJ_PATH)\bitmap.obj \ $(OBJ_PATH)\bmpbuttn.obj \ $(OBJ_PATH)\brush.obj \ @@ -206,6 +207,7 @@ MSWOBJS = $(OBJ_PATH)\accel.obj \ $(OBJ_PATH)\treectrl.obj \ $(OBJ_PATH)\utils.obj \ $(OBJ_PATH)\utilsexc.obj \ + $(OBJ_PATH)\utilsgui.obj \ $(OBJ_PATH)\uuid.obj \ $(OBJ_PATH)\uxtheme.obj \ $(OBJ_PATH)\volume.obj \ @@ -255,6 +257,7 @@ GENERICUNIVOBJS= $(OBJ_PATH)\accel.obj \ MSWUNIVOBJS = $(OBJ_PATH)\app.obj \ $(OBJ_PATH)\automtn.obj \ + $(OBJ_PATH)\basemsw.obj \ $(OBJ_PATH)\bitmap.obj \ $(OBJ_PATH)\brush.obj \ $(OBJ_PATH)\caret.obj \ @@ -294,6 +297,7 @@ MSWUNIVOBJS = $(OBJ_PATH)\app.obj \ $(OBJ_PATH)\main.obj \ $(OBJ_PATH)\mimetype.obj \ $(OBJ_PATH)\minifram.obj \ + $(OBJ_PATH)\mslu.obj \ $(OBJ_PATH)\oleutils.obj \ $(OBJ_PATH)\palette.obj \ $(OBJ_PATH)\pen.obj \ @@ -310,6 +314,7 @@ MSWUNIVOBJS = $(OBJ_PATH)\app.obj \ $(OBJ_PATH)\toplevel.obj \ $(OBJ_PATH)\utils.obj \ $(OBJ_PATH)\utilsexc.obj \ + $(OBJ_PATH)\utilsgui.obj \ $(OBJ_PATH)\uuid.obj \ $(OBJ_PATH)\volume.obj \ $(OBJ_PATH)\wave.obj \ @@ -377,6 +382,7 @@ HTMLOBJS = $(OBJ_PATH)\helpctrl.obj \ COMMONOBJS = \ $(OBJ_PATH)\accesscmn.obj \ + $(OBJ_PATH)\appbase.obj \ $(OBJ_PATH)\appcmn.obj \ $(OBJ_PATH)\artprov.obj \ $(OBJ_PATH)\artstd.obj \ @@ -421,6 +427,7 @@ COMMONOBJS = \ $(OBJ_PATH)\filename.obj \ $(OBJ_PATH)\filesys.obj \ $(OBJ_PATH)\fldlgcmn.obj \ + $(OBJ_PATH)\fmapbase.obj \ $(OBJ_PATH)\fontcmn.obj \ $(OBJ_PATH)\fontmap.obj \ $(OBJ_PATH)\framecmn.obj \ @@ -482,6 +489,7 @@ COMMONOBJS = \ $(OBJ_PATH)\sizer.obj \ $(OBJ_PATH)\socket.obj \ $(OBJ_PATH)\statbar.obj \ + $(OBJ_PATH)\stopwatch.obj \ $(OBJ_PATH)\strconv.obj \ $(OBJ_PATH)\stream.obj \ $(OBJ_PATH)\string.obj \ @@ -580,6 +588,8 @@ $(OBJ_PATH)\app.obj: $(MSWDIR)\app.$(SRCSUFF) $(OBJ_PATH)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF) +$(OBJ_PATH)\basemsw.obj: $(MSWDIR)\basemsw.$(SRCSUFF) + $(OBJ_PATH)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF) $(OBJ_PATH)\brush.obj: $(MSWDIR)\brush.$(SRCSUFF) @@ -658,6 +668,8 @@ $(OBJ_PATH)\mimetype.obj: $(MSWDIR)\mimetype.$(SRCSUFF) $(OBJ_PATH)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF) +$(OBJ_PATH)\mslu.obj: $(MSWDIR)\mslu.$(SRCSUFF) + $(OBJ_PATH)\oleutils.obj: $(OLEDIR)\oleutils.$(SRCSUFF) $(OBJ_PATH)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF) @@ -690,6 +702,8 @@ $(OBJ_PATH)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF) $(OBJ_PATH)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF) +$(OBJ_PATH)\utilsgui.obj: $(MSWDIR)\utilsgui.$(SRCSUFF) + $(OBJ_PATH)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF) $(OBJ_PATH)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF) @@ -713,6 +727,8 @@ $(OBJ_PATH)\app.obj: $(MSWDIR)\app.$(SRCSUFF) $(OBJ_PATH)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF) +$(OBJ_PATH)\basemsw.obj: $(MSWDIR)\basemsw.$(SRCSUFF) + $(OBJ_PATH)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF) $(OBJ_PATH)\bmpbuttn.obj: $(MSWDIR)\bmpbuttn.$(SRCSUFF) @@ -917,6 +933,8 @@ $(OBJ_PATH)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF) $(OBJ_PATH)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF) +$(OBJ_PATH)\utilsgui.obj: $(MSWDIR)\utilsgui.$(SRCSUFF) + $(OBJ_PATH)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF) $(OBJ_PATH)\uxtheme.obj: $(MSWDIR)\uxtheme.$(SRCSUFF) @@ -1022,6 +1040,8 @@ $(OBJ_PATH)\win32.obj: $(UNIVTHEMEDIR)\win32.$(SRCSUFF) $(OBJ_PATH)\accesscmn.obj: $(COMMDIR)\accesscmn.$(SRCSUFF) +$(OBJ_PATH)\appbase.obj: $(COMMDIR)\appbase.$(SRCSUFF) + $(OBJ_PATH)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF) $(OBJ_PATH)\artprov.obj: $(COMMDIR)\artprov.$(SRCSUFF) @@ -1110,6 +1130,8 @@ $(OBJ_PATH)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF) $(OBJ_PATH)\fldlgcmn.obj: $(COMMDIR)\fldlgcmn.$(SRCSUFF) +$(OBJ_PATH)\fmapbase.obj: $(COMMDIR)\fmapbase.$(SRCSUFF) + $(OBJ_PATH)\fontcmn.obj: $(COMMDIR)\fontcmn.$(SRCSUFF) $(OBJ_PATH)\fontmap.obj: $(COMMDIR)\fontmap.$(SRCSUFF) @@ -1232,6 +1254,8 @@ $(OBJ_PATH)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF) $(OBJ_PATH)\statbar.obj: $(COMMDIR)\statbar.$(SRCSUFF) +$(OBJ_PATH)\stopwatch.obj: $(COMMDIR)\stopwatch.$(SRCSUFF) + $(OBJ_PATH)\strconv.obj: $(COMMDIR)\strconv.$(SRCSUFF) $(OBJ_PATH)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF) diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index 21283eb4f1..25f951f989 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -104,6 +104,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ COMMONOBJS = \ $(MSWDIR)\accesscmn.obj \ + $(MSWDIR)\appbase.obj \ $(MSWDIR)\appcmn.obj \ $(MSWDIR)\artprov.obj \ $(MSWDIR)\artstd.obj \ @@ -145,6 +146,7 @@ COMMONOBJS = \ $(MSWDIR)\filename.obj \ $(MSWDIR)\filesys.obj \ $(MSWDIR)\fldlgcmn.obj \ + $(MSWDIR)\fmapbase.obj \ $(MSWDIR)\fontcmn.obj \ $(MSWDIR)\fontmap.obj \ $(MSWDIR)\framecmn.obj \ @@ -191,6 +193,7 @@ COMMONOBJS = \ $(MSWDIR)\settcmn.obj \ $(MSWDIR)\sizer.obj \ $(MSWDIR)\statbar.obj \ + $(MSWDIR)\stopwatch.obj \ $(MSWDIR)\strconv.obj \ $(MSWDIR)\stream.obj \ $(MSWDIR)\string.obj \ @@ -221,6 +224,7 @@ COMMONOBJS = \ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\app.obj \ + $(MSWDIR)\basemsw.obj \ $(MSWDIR)\bitmap.obj \ $(MSWDIR)\bmpbuttn.obj \ $(MSWDIR)\brush.obj \ @@ -301,6 +305,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\toplevel.obj \ $(MSWDIR)\utils.obj \ $(MSWDIR)\utilsexc.obj \ + $(MSWDIR)\utilsgui.obj \ $(MSWDIR)\uxtheme.obj \ $(MSWDIR)\volume.obj \ $(MSWDIR)\wave.obj \ @@ -330,6 +335,8 @@ $(MSWDIR)\accel.obj: $(MSWDIR)\accel.$(SRCSUFF) $(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF) +$(MSWDIR)\basemsw.obj: $(MSWDIR)\basemsw.$(SRCSUFF) + $(MSWDIR)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF) $(MSWDIR)\bmpbuttn.obj: $(MSWDIR)\bmpbuttn.$(SRCSUFF) @@ -490,6 +497,8 @@ $(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF) $(MSWDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF) +$(MSWDIR)\utilsgui.obj: $(MSWDIR)\utilsgui.$(SRCSUFF) + $(MSWDIR)\uxtheme.obj: $(MSWDIR)\uxtheme.$(SRCSUFF) $(MSWDIR)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF) @@ -505,6 +514,8 @@ $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF) $(MSWDIR)\accesscmn.obj: $(COMMDIR)\accesscmn.$(SRCSUFF) +$(MSWDIR)\appbase.obj: $(COMMDIR)\appbase.$(SRCSUFF) + $(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF) $(MSWDIR)\artprov.obj: $(COMMDIR)\artprov.$(SRCSUFF) @@ -587,6 +598,8 @@ $(MSWDIR)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF) $(MSWDIR)\fldlgcmn.obj: $(COMMDIR)\fldlgcmn.$(SRCSUFF) +$(MSWDIR)\fmapbase.obj: $(COMMDIR)\fmapbase.$(SRCSUFF) + $(MSWDIR)\fontcmn.obj: $(COMMDIR)\fontcmn.$(SRCSUFF) $(MSWDIR)\fontmap.obj: $(COMMDIR)\fontmap.$(SRCSUFF) @@ -679,6 +692,8 @@ $(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF) $(MSWDIR)\statbar.obj: $(COMMDIR)\statbar.$(SRCSUFF) +$(MSWDIR)\stopwatch.obj: $(COMMDIR)\stopwatch.$(SRCSUFF) + $(MSWDIR)\strconv.obj: $(COMMDIR)\strconv.$(SRCSUFF) $(MSWDIR)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF) diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index 70d1302663..2b349b74ca 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -88,6 +88,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \ # we can't have all objects in one list because the library becomes too big COMMONOBJS1 = \ $(COMMDIR)\accesscmn.obj \ + $(COMMDIR)\appbase.obj \ $(COMMDIR)\appcmn.obj \ $(COMMDIR)\artprov.obj \ $(COMMDIR)\artstd.obj \ @@ -130,6 +131,7 @@ COMMONOBJS1 = \ $(COMMDIR)\filename.obj \ $(COMMDIR)\filesys.obj \ $(COMMDIR)\fldlgcmn.obj \ + $(COMMDIR)\fmapbase.obj \ $(COMMDIR)\fontcmn.obj \ $(COMMDIR)\fontmap.obj \ $(COMMDIR)\framecmn.obj \ @@ -178,6 +180,7 @@ COMMONOBJS2 = \ $(COMMDIR)\settcmn.obj \ $(COMMDIR)\sizer.obj \ $(COMMDIR)\statbar.obj \ + $(COMMDIR)\stopwatch.obj \ $(COMMDIR)\strconv.obj \ $(COMMDIR)\stream.obj \ $(COMMDIR)\string.obj \ @@ -208,6 +211,7 @@ COMMONOBJS2 = \ # we can't have all objects in one list because the library becomes too big MSWOBJS1 = $(MSWDIR)\accel.obj \ $(MSWDIR)\app.obj \ + $(MSWDIR)\basemsw.obj \ $(MSWDIR)\bitmap.obj \ $(MSWDIR)\bmpbuttn.obj \ $(MSWDIR)\brush.obj \ @@ -289,6 +293,7 @@ MSWOBJS2 = $(MSWDIR)\palette.obj \ $(MSWDIR)\toplevel.obj \ $(MSWDIR)\utils.obj \ $(MSWDIR)\utilsexc.obj \ + $(MSWDIR)\utilsgui.obj \ $(MSWDIR)\uxtheme.obj \ $(MSWDIR)\volume.obj \ $(MSWDIR)\wave.obj \ @@ -375,6 +380,11 @@ $(MSWDIR)/app.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(MSWDIR)/basemsw.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(MSWDIR)/bitmap.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -775,6 +785,11 @@ $(MSWDIR)/utilsexc.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(MSWDIR)/utilsgui.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(MSWDIR)/uxtheme.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -800,6 +815,11 @@ $(COMMDIR)/accesscmn.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/appbase.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/appcmn.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -1010,6 +1030,11 @@ $(COMMDIR)/fldlgcmn.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/fmapbase.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/fontcmn.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -1240,6 +1265,11 @@ $(COMMDIR)/statbar.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/stopwatch.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/strconv.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index aebd230f38..a0c1924acb 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -107,11 +107,10 @@ GENERICOBJS = \ $(GENDIR)/wizard.$(OBJSUFF) COMMONOBJS_BASE = \ - $(COMMDIR)/appcmn.$(OBJSUFF) \ + $(COMMDIR)/appbase.$(OBJSUFF) \ $(COMMDIR)/clntdata.$(OBJSUFF) \ $(COMMDIR)/cmdline.$(OBJSUFF) \ $(COMMDIR)/config.$(OBJSUFF) \ - $(COMMDIR)/datacmn.$(OBJSUFF) \ $(COMMDIR)/datetime.$(OBJSUFF) \ $(COMMDIR)/datstrm.$(OBJSUFF) \ $(COMMDIR)/db.$(OBJSUFF) \ @@ -129,7 +128,7 @@ COMMONOBJS_BASE = \ $(COMMDIR)/filefn.$(OBJSUFF) \ $(COMMDIR)/filename.$(OBJSUFF) \ $(COMMDIR)/filesys.$(OBJSUFF) \ - $(COMMDIR)/fontmap.$(OBJSUFF) \ + $(COMMDIR)/fmapbase.$(OBJSUFF) \ $(COMMDIR)/fs_inet.$(OBJSUFF) \ $(COMMDIR)/fs_mem.$(OBJSUFF) \ $(COMMDIR)/fs_zip.$(OBJSUFF) \ @@ -156,13 +155,13 @@ COMMONOBJS_BASE = \ $(COMMDIR)/sckipc.$(OBJSUFF) \ $(COMMDIR)/sckstrm.$(OBJSUFF) \ $(COMMDIR)/socket.$(OBJSUFF) \ + $(COMMDIR)/stopwatch.$(OBJSUFF) \ $(COMMDIR)/strconv.$(OBJSUFF) \ $(COMMDIR)/stream.$(OBJSUFF) \ $(COMMDIR)/string.$(OBJSUFF) \ $(COMMDIR)/sysopt.$(OBJSUFF) \ $(COMMDIR)/textbuf.$(OBJSUFF) \ $(COMMDIR)/textfile.$(OBJSUFF) \ - $(COMMDIR)/timercmn.$(OBJSUFF) \ $(COMMDIR)/tokenzr.$(OBJSUFF) \ $(COMMDIR)/txtstrm.$(OBJSUFF) \ $(COMMDIR)/unzip.$(OBJSUFF) \ @@ -180,6 +179,7 @@ COMMONOBJS_BASEONLY = \ COMMONOBJS = \ $(COMMONOBJS_BASE) \ $(COMMDIR)/accesscmn.$(OBJSUFF) \ + $(COMMDIR)/appcmn.$(OBJSUFF) \ $(COMMDIR)/artprov.$(OBJSUFF) \ $(COMMDIR)/artstd.$(OBJSUFF) \ $(COMMDIR)/choiccmn.$(OBJSUFF) \ @@ -190,6 +190,7 @@ COMMONOBJS = \ $(COMMDIR)/cshelp.$(OBJSUFF) \ $(COMMDIR)/ctrlcmn.$(OBJSUFF) \ $(COMMDIR)/ctrlsub.$(OBJSUFF) \ + $(COMMDIR)/datacmn.$(OBJSUFF) \ $(COMMDIR)/dbgrid.$(OBJSUFF) \ $(COMMDIR)/dcbase.$(OBJSUFF) \ $(COMMDIR)/dlgcmn.$(OBJSUFF) \ @@ -203,6 +204,7 @@ COMMONOBJS = \ $(COMMDIR)/fddlgcmn.$(OBJSUFF) \ $(COMMDIR)/fldlgcmn.$(OBJSUFF) \ $(COMMDIR)/fontcmn.$(OBJSUFF) \ + $(COMMDIR)/fontmap.$(OBJSUFF) \ $(COMMDIR)/framecmn.$(OBJSUFF) \ $(COMMDIR)/gaugecmn.$(OBJSUFF) \ $(COMMDIR)/gdicmn.$(OBJSUFF) \ @@ -239,6 +241,7 @@ COMMONOBJS = \ $(COMMDIR)/taskbarcmn.$(OBJSUFF) \ $(COMMDIR)/tbarbase.$(OBJSUFF) \ $(COMMDIR)/textcmn.$(OBJSUFF) \ + $(COMMDIR)/timercmn.$(OBJSUFF) \ $(COMMDIR)/toplvcmn.$(OBJSUFF) \ $(COMMDIR)/treebase.$(OBJSUFF) \ $(COMMDIR)/valgen.$(OBJSUFF) \ @@ -270,12 +273,14 @@ HTMLOBJS = \ $(HTMLDIR)/winpars.$(OBJSUFF) MSWOBJS_BASE = \ - $(MSWDIR)/dde.$(OBJSUFF) \ + $(MSWDIR)/basemsw.$(OBJSUFF) \ + $(MSWDIR)/dde.$(OBJSUFF) \ $(MSWDIR)/dir.$(OBJSUFF) \ $(MSWDIR)/gsocket.$(OBJSUFF) \ $(MSWDIR)/gsockmsw.$(OBJSUFF) \ $(MSWDIR)/main.$(OBJSUFF) \ $(MSWDIR)/mimetype.$(OBJSUFF) \ + $(MSWDIR)/mslu.$(OBJSUFF) \ $(MSWDIR)/regconf.$(OBJSUFF) \ $(MSWDIR)/registry.$(OBJSUFF) \ $(MSWDIR)/snglinst.$(OBJSUFF) \ @@ -341,7 +346,6 @@ MSWOBJS = \ $(MSWDIR)/metafile.$(OBJSUFF) \ $(MSWDIR)/minifram.$(OBJSUFF) \ $(MSWDIR)/msgdlg.$(OBJSUFF) \ - $(MSWDIR)/mslu.$(OBJSUFF) \ $(MSWDIR)/nativdlg.$(OBJSUFF) \ $(MSWDIR)/notebook.$(OBJSUFF) \ $(MSWDIR)/ownerdrw.$(OBJSUFF) \ @@ -373,6 +377,7 @@ MSWOBJS = \ $(MSWDIR)/tooltip.$(OBJSUFF) \ $(MSWDIR)/toplevel.$(OBJSUFF) \ $(MSWDIR)/treectrl.$(OBJSUFF) \ + $(MSWDIR)/utilsgui.$(OBJSUFF) \ $(MSWDIR)/uxtheme.$(OBJSUFF) \ $(MSWDIR)/wave.$(OBJSUFF) \ $(MSWDIR)/window.$(OBJSUFF) diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index ea8662e775..bb32241e8b 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -58,6 +58,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \ $(GENDIR)\wizard.obj COMMONOBJS = $(COMMDIR)\accesscmn.obj \ + $(COMMDIR)\appbase.obj \ $(COMMDIR)\appcmn.obj \ $(COMMDIR)\artprov.obj \ $(COMMDIR)\artstd.obj \ @@ -102,6 +103,7 @@ COMMONOBJS = $(COMMDIR)\accesscmn.obj \ $(COMMDIR)\filename.obj \ $(COMMDIR)\filesys.obj \ $(COMMDIR)\fldlgcmn.obj \ + $(COMMDIR)\fmapbase.obj \ $(COMMDIR)\fontcmn.obj \ $(COMMDIR)\fontmap.obj \ $(COMMDIR)\framecmn.obj \ @@ -163,6 +165,7 @@ COMMONOBJS = $(COMMDIR)\accesscmn.obj \ $(COMMDIR)\sizer.obj \ $(COMMDIR)\socket.obj \ $(COMMDIR)\statbar.obj \ + $(COMMDIR)\stopwatch.obj \ $(COMMDIR)\strconv.obj \ $(COMMDIR)\stream.obj \ $(COMMDIR)\string.obj \ @@ -216,6 +219,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\ole\access.obj \ $(MSWDIR)\app.obj \ $(MSWDIR)\ole\automtn.obj \ + $(MSWDIR)\basemsw.obj \ $(MSWDIR)\bitmap.obj \ $(MSWDIR)\bmpbuttn.obj \ $(MSWDIR)\brush.obj \ @@ -318,6 +322,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\treectrl.obj \ $(MSWDIR)\utils.obj \ $(MSWDIR)\utilsexc.obj \ + $(MSWDIR)\utilsgui.obj \ $(MSWDIR)\ole\uuid.obj \ $(MSWDIR)\uxtheme.obj \ $(MSWDIR)\volume.obj \ diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 15d850b600..500d68191d 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -133,6 +133,7 @@ NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \ COMMONOBJS = \ $(COMMDIR)\$D\accesscmn.obj \ + $(COMMDIR)\$D\appbase.obj \ $(COMMDIR)\$D\appcmn.obj \ $(COMMDIR)\$D\artprov.obj \ $(COMMDIR)\$D\artstd.obj \ @@ -177,6 +178,7 @@ COMMONOBJS = \ $(COMMDIR)\$D\filename.obj \ $(COMMDIR)\$D\filesys.obj \ $(COMMDIR)\$D\fldlgcmn.obj \ + $(COMMDIR)\$D\fmapbase.obj \ $(COMMDIR)\$D\fontcmn.obj \ $(COMMDIR)\$D\fontmap.obj \ $(COMMDIR)\$D\framecmn.obj \ @@ -238,6 +240,7 @@ COMMONOBJS = \ $(COMMDIR)\$D\sizer.obj \ $(COMMDIR)\$D\socket.obj \ $(COMMDIR)\$D\statbar.obj \ + $(COMMDIR)\$D\stopwatch.obj \ $(COMMDIR)\$D\strconv.obj \ $(COMMDIR)\$D\stream.obj \ $(COMMDIR)\$D\string.obj \ @@ -270,6 +273,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \ $(OLEDIR)\$D\access.obj \ $(MSWDIR)\$D\app.obj \ $(OLEDIR)\$D\automtn.obj \ + $(MSWDIR)\$D\basemsw.obj \ $(MSWDIR)\$D\bitmap.obj \ $(MSWDIR)\$D\bmpbuttn.obj \ $(MSWDIR)\$D\brush.obj \ @@ -372,6 +376,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \ $(MSWDIR)\$D\treectrl.obj \ $(MSWDIR)\$D\utils.obj \ $(MSWDIR)\$D\utilsexc.obj \ + $(MSWDIR)\$D\utilsgui.obj \ $(OLEDIR)\$D\uuid.obj \ $(MSWDIR)\$D\uxtheme.obj \ $(MSWDIR)\$D\volume.obj \ diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index fcea70618c..74dbefa628 100644 --- a/src/msw/makefile.wat +++ b/src/msw/makefile.wat @@ -78,6 +78,7 @@ NONESSENTIALOBJS= $(OUTPUTDIR)\accel.obj & COMMONOBJS = & $(OUTPUTDIR)\accesscmn.obj & + $(OUTPUTDIR)\appbase.obj & $(OUTPUTDIR)\appcmn.obj & $(OUTPUTDIR)\artprov.obj & $(OUTPUTDIR)\artstd.obj & @@ -122,6 +123,7 @@ COMMONOBJS = & $(OUTPUTDIR)\filename.obj & $(OUTPUTDIR)\filesys.obj & $(OUTPUTDIR)\fldlgcmn.obj & + $(OUTPUTDIR)\fmapbase.obj & $(OUTPUTDIR)\fontcmn.obj & $(OUTPUTDIR)\fontmap.obj & $(OUTPUTDIR)\framecmn.obj & @@ -183,6 +185,7 @@ COMMONOBJS = & $(OUTPUTDIR)\sizer.obj & $(OUTPUTDIR)\socket.obj & $(OUTPUTDIR)\statbar.obj & + $(OUTPUTDIR)\stopwatch.obj & $(OUTPUTDIR)\strconv.obj & $(OUTPUTDIR)\stream.obj & $(OUTPUTDIR)\string.obj & @@ -215,6 +218,7 @@ MSWOBJS = $(OUTPUTDIR)\accel.obj & $(OUTPUTDIR)\access.obj & $(OUTPUTDIR)\app.obj & $(OUTPUTDIR)\automtn.obj & + $(OUTPUTDIR)\basemsw.obj & $(OUTPUTDIR)\bitmap.obj & $(OUTPUTDIR)\bmpbuttn.obj & $(OUTPUTDIR)\brush.obj & @@ -317,6 +321,7 @@ MSWOBJS = $(OUTPUTDIR)\accel.obj & $(OUTPUTDIR)\treectrl.obj & $(OUTPUTDIR)\utils.obj & $(OUTPUTDIR)\utilsexc.obj & + $(OUTPUTDIR)\utilsgui.obj & $(OUTPUTDIR)\uuid.obj & $(OUTPUTDIR)\uxtheme.obj & $(OUTPUTDIR)\volume.obj & @@ -390,6 +395,9 @@ $(OUTPUTDIR)\app.obj: $(MSWDIR)\app.cpp $(OUTPUTDIR)\automtn.obj: $(OLEDIR)\automtn.cpp *$(CXX) $(CXXFLAGS) $< +$(OUTPUTDIR)\basemsw.obj: $(MSWDIR)\basemsw.cpp + *$(CXX) $(CXXFLAGS) $< + $(OUTPUTDIR)\bitmap.obj: $(MSWDIR)\bitmap.cpp *$(CXX) $(CXXFLAGS) $< @@ -696,6 +704,9 @@ $(OUTPUTDIR)\utils.obj: $(MSWDIR)\utils.cpp $(OUTPUTDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.cpp *$(CXX) $(CXXFLAGS) $< +$(OUTPUTDIR)\utilsgui.obj: $(MSWDIR)\utilsgui.cpp + *$(CXX) $(CXXFLAGS) $< + $(OUTPUTDIR)\uuid.obj: $(OLEDIR)\uuid.cpp *$(CXX) $(CXXFLAGS) $< @@ -719,6 +730,9 @@ $(OUTPUTDIR)\window.obj: $(MSWDIR)\window.cpp $(OUTPUTDIR)\accesscmn.obj: $(COMMDIR)\accesscmn.cpp *$(CXX) $(CXXFLAGS) $< +$(OUTPUTDIR)\appbase.obj: $(COMMDIR)\appbase.cpp + *$(CXX) $(CXXFLAGS) $< + $(OUTPUTDIR)\appcmn.obj: $(COMMDIR)\appcmn.cpp *$(CXX) $(CXXFLAGS) $< @@ -851,6 +865,9 @@ $(OUTPUTDIR)\filesys.obj: $(COMMDIR)\filesys.cpp $(OUTPUTDIR)\fldlgcmn.obj: $(COMMDIR)\fldlgcmn.cpp *$(CXX) $(CXXFLAGS) $< +$(OUTPUTDIR)\fmapbase.obj: $(COMMDIR)\fmapbase.cpp + *$(CXX) $(CXXFLAGS) $< + $(OUTPUTDIR)\fontcmn.obj: $(COMMDIR)\fontcmn.cpp *$(CXX) $(CXXFLAGS) $< @@ -1034,6 +1051,9 @@ $(OUTPUTDIR)\socket.obj: $(COMMDIR)\socket.cpp $(OUTPUTDIR)\statbar.obj: $(COMMDIR)\statbar.cpp *$(CXX) $(CXXFLAGS) $< +$(OUTPUTDIR)\stopwatch.obj: $(COMMDIR)\stopwatch.cpp + *$(CXX) $(CXXFLAGS) $< + $(OUTPUTDIR)\strconv.obj: $(COMMDIR)\strconv.cpp *$(CXX) $(CXXFLAGS) $< diff --git a/src/wxBase.dsp b/src/wxBase.dsp index 1001534bf7..db4d2606ab 100644 --- a/src/wxBase.dsp +++ b/src/wxBase.dsp @@ -525,7 +525,7 @@ SOURCE=.\msw\dummy.cpp # End Source File # Begin Source File -SOURCE=.\msw\console.cpp +SOURCE=.\msw\basemsw.cpp # End Source File # Begin Source File diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp index f423fa1662..866b4f6be0 100644 --- a/src/wxUniv.dsp +++ b/src/wxUniv.dsp @@ -89,6 +89,10 @@ SOURCE=.\common\accesscmn.cpp # End Source File # Begin Source File +SOURCE=.\common\appbase.cpp +# End Source File +# Begin Source File + SOURCE=.\common\appcmn.cpp # End Source File # Begin Source File @@ -265,6 +269,10 @@ SOURCE=.\common\fldlgcmn.cpp # End Source File # Begin Source File +SOURCE=.\common\fmapbase.cpp +# End Source File +# Begin Source File + SOURCE=.\common\fontcmn.cpp # End Source File # Begin Source File @@ -509,6 +517,10 @@ SOURCE=.\common\statbar.cpp # End Source File # Begin Source File +SOURCE=.\common\stopwatch.cpp +# End Source File +# Begin Source File + SOURCE=.\common\strconv.cpp # End Source File # Begin Source File @@ -888,6 +900,10 @@ SOURCE=.\msw\app.cpp # End Source File # Begin Source File +SOURCE=.\msw\basemsw.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\bitmap.cpp # End Source File # Begin Source File @@ -1024,6 +1040,10 @@ SOURCE=.\msw\minifram.cpp # End Source File # Begin Source File +SOURCE=.\msw\mslu.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\palette.cpp # End Source File # Begin Source File @@ -1084,6 +1104,10 @@ SOURCE=.\msw\utilsexc.cpp # End Source File # Begin Source File +SOURCE=.\msw\utilsgui.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\volume.cpp # End Source File # Begin Source File @@ -1339,6 +1363,10 @@ SOURCE=..\include\wx\app.h # End Source File # Begin Source File +SOURCE=..\include\wx\apptrait.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\artprov.h # End Source File # Begin Source File @@ -1631,6 +1659,10 @@ SOURCE=..\include\wx\filesys.h # End Source File # Begin Source File +SOURCE=..\include\wx\fmappriv.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\font.h # End Source File # Begin Source File diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 88b96267b3..3c1b42fccc 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -2,8 +2,8 @@ # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 # TARGTYPE "Win32 (x86) Static Library" 0x0104 +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 CFG=wxWindows - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, @@ -32,6 +32,8 @@ CFG=wxWindows - Win32 Debug # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe !IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL" @@ -46,13 +48,10 @@ CFG=wxWindows - Win32 Debug # PROP Intermediate_Dir "../ReleaseUnicodeDll" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D "__WXBASE__" /Yu"wx/wxprec.h" /FD /c -MTL=midl.exe +# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "__WXBASE__" /Yu"wx/wxprec.h" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /i "../include" /d "NDEBUG" BSC32=bscmake.exe @@ -75,20 +74,17 @@ LINK32=link.exe # PROP Intermediate_Dir "../DebugUnicodeDll" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D "__WXBASE__" /Yu"wx/wxprec.h" /FD /c -MTL=midl.exe +# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "__WXBASE__" /Yu"wx/wxprec.h" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "../include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250ud.dll" /pdbtype:sept +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw250ud.dll" # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.dll" !ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode" @@ -103,10 +99,8 @@ LINK32=link.exe # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../ReleaseUnicode" # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D "__WXBASE__" /Yu"wx/wxprec.h" /FD /c -RSC=rc.exe +# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "_UNICODE" /D "UNICODE" /D "__WXBASE__" /Yu"wx/wxprec.h" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -128,10 +122,8 @@ LIB32=link.exe -lib # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../DebugUnicode" # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_DEBUG" /D "__WXDEBUG__" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D "__WXBASE__" /Yu"wx/wxprec.h" /FD /c -RSC=rc.exe +# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "_DEBUG" /D "__WXDEBUG__" /D WINVER=0x0400 /D "STRICT" /D "_UNICODE" /D "UNICODE" /D "__WXBASE__" /Yu"wx/wxprec.h" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -154,13 +146,10 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "../ReleaseDll" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D "__WXBASE__" /Yu"wx/wxprec.h" /FD /c -MTL=midl.exe +# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /D "__WXBASE__" /Yu"wx/wxprec.h" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /i "../include" /d "NDEBUG" BSC32=bscmake.exe @@ -183,20 +172,17 @@ LINK32=link.exe # PROP Intermediate_Dir "../DebugDll" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D "__WXBASE__" /Yu"wx/wxprec.h" /FD /c -MTL=midl.exe +# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /D "__WXBASE__" /Yu"wx/wxprec.h" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "../include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250d.dll" /pdbtype:sept +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw250d.dll" # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250d.dll" !ELSEIF "$(CFG)" == "wxWindows - Win32 Release" @@ -211,10 +197,8 @@ LINK32=link.exe # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../Release" # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D "__WXBASE__" /Yu"wx/wxprec.h" /FD /c -RSC=rc.exe +# ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "__WXBASE__" /Yu"wx/wxprec.h" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -236,10 +220,8 @@ LIB32=link.exe -lib # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../Debug" # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D "__WXBASE__" /Yu"wx/wxprec.h" /FD /c -RSC=rc.exe +# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "_DEBUG" /D "__WXDEBUG__" /D WINVER=0x0400 /D "STRICT" /D "__WXBASE__" /Yu"wx/wxprec.h" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -414,11 +396,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 @@ -759,11 +736,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 @@ -810,6 +782,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" @@ -926,6 +910,7 @@ SOURCE=.\generic\treectlg.cpp SOURCE=.\generic\wizard.cpp # End Source File + # End Group # Begin Group "wxHTML Files" @@ -1010,42 +995,16 @@ SOURCE=.\html\m_tables.cpp SOURCE=.\html\winpars.cpp # End Source File + # End Group # Begin Group "MSW Files" # PROP Default_Filter "" -# Begin Group "OLE Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\msw\ole\access.cpp -# End Source File -# Begin Source File - -SOURCE=.\msw\ole\automtn.cpp -# End Source File # Begin Source File -SOURCE=.\msw\ole\dataobj.cpp -# End Source File -# Begin Source File - -SOURCE=.\msw\ole\dropsrc.cpp -# End Source File -# Begin Source File - -SOURCE=.\msw\ole\droptgt.cpp -# End Source File -# Begin Source File - -SOURCE=.\msw\ole\oleutils.cpp -# End Source File -# Begin Source File - -SOURCE=.\msw\ole\uuid.cpp +SOURCE=.\msw\dummy.cpp +# ADD CPP /Yc"wx/wxprec.h" # End Source File -# End Group # Begin Source File SOURCE=.\msw\accel.cpp @@ -1172,11 +1131,6 @@ SOURCE=.\msw\dragimag.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\enhmeta.cpp # End Source File # Begin Source File @@ -1229,16 +1183,6 @@ SOURCE=.\msw\glcanvas.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 -# End Source File -# Begin Source File - SOURCE=.\msw\helpbest.cpp # End Source File # Begin Source File @@ -1477,6 +1421,51 @@ SOURCE=.\msw\wave.cpp SOURCE=.\msw\window.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 +# End Source File + +# Begin Group "OLE Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\msw\ole\access.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\automtn.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\dataobj.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\dropsrc.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\droptgt.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\oleutils.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\uuid.cpp +# End Source File + +# End Group # End Group # Begin Group "Headers" @@ -1487,9 +1476,7 @@ SOURCE=.\msw\window.cpp # Begin Source File SOURCE=..\include\wx\msw\setup.h - !IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL" - # Begin Custom Build - Creating ..\lib\mswdllu\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1497,9 +1484,7 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswdllu\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL" - # Begin Custom Build - Creating ..\lib\mswdllud\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1507,9 +1492,7 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswdllud\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode" - # Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1517,9 +1500,7 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswu\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode" - # Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1527,9 +1508,7 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswud\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Release DLL" - # Begin Custom Build - Creating ..\lib\mswdll\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1537,9 +1516,7 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswdll\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL" - # Begin Custom Build - Creating ..\lib\mswdlld\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1547,9 +1524,7 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswdlld\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Release" - # Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1557,9 +1532,7 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\msw\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug" - # Begin Custom Build - Creating ..\lib\mswd\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1567,9 +1540,7 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswd\wx\setup.h # End Custom Build - !ENDIF - # End Source File # End Group # Begin Group "Common" @@ -2519,6 +2490,7 @@ SOURCE=..\include\wx\zipstrm.h SOURCE=..\include\wx\zstream.h # End Source File + # End Group # Begin Group "MSW" @@ -2895,6 +2867,7 @@ SOURCE=..\include\wx\msw\window.h SOURCE=..\include\wx\msw\winundef.h # End Source File + # End Group # Begin Group "Generic" @@ -3055,6 +3028,7 @@ SOURCE=..\include\wx\generic\treectlg.h SOURCE=..\include\wx\generic\wizard.h # End Source File + # End Group # Begin Group "HTML" @@ -3111,6 +3085,7 @@ SOURCE=..\include\wx\html\m_templ.h SOURCE=..\include\wx\html\winpars.h # End Source File + # End Group # End Group # End Target diff --git a/src/x11/files.lst b/src/x11/files.lst index ab87a2abfd..d2f8943cb4 100644 --- a/src/x11/files.lst +++ b/src/x11/files.lst @@ -77,6 +77,7 @@ ALL_SOURCES = \ generic/treectlg.cpp \ generic/wizard.cpp \ common/accesscmn.cpp \ + common/appbase.cpp \ common/appcmn.cpp \ common/artprov.cpp \ common/artstd.cpp \ @@ -122,6 +123,7 @@ ALL_SOURCES = \ common/filename.cpp \ common/filesys.cpp \ common/fldlgcmn.cpp \ + common/fmapbase.cpp \ common/fontcmn.cpp \ common/fontmap.cpp \ common/framecmn.cpp \ @@ -183,6 +185,7 @@ ALL_SOURCES = \ common/sizer.cpp \ common/socket.cpp \ common/statbar.cpp \ + common/stopwatch.cpp \ common/strconv.cpp \ common/stream.cpp \ common/string.cpp \ @@ -210,6 +213,7 @@ ALL_SOURCES = \ common/xpmdecod.cpp \ common/zipstrm.cpp \ common/zstream.cpp \ + unix/baseunix.cpp \ unix/dialup.cpp \ unix/dir.cpp \ unix/fontenum.cpp \ @@ -246,6 +250,7 @@ ALL_HEADERS = \ accel.h \ access.h \ app.h \ + apptrait.h \ arrimpl.cpp \ artprov.h \ bitmap.h \ @@ -320,6 +325,7 @@ ALL_HEADERS = \ filefn.h \ filename.h \ filesys.h \ + fmappriv.h \ font.h \ fontdlg.h \ fontenc.h \ @@ -588,10 +594,13 @@ ALL_HEADERS = \ generic/timer.h \ generic/treectlg.h \ generic/wizard.h \ + unix/apptbase.h \ + unix/apptrait.h \ unix/execute.h \ unix/fontutil.h \ unix/gsockunx.h \ unix/mimetype.h \ + unix/pipe.h \ unix/taskbarx11.h \ unix/utilsx11.h \ html/forcelnk.h \ @@ -648,6 +657,7 @@ GUI_LOWLEVEL_OBJS = \ COMMONOBJS = \ accesscmn.o \ + appbase.o \ appcmn.o \ artprov.o \ artstd.o \ @@ -693,6 +703,7 @@ COMMONOBJS = \ filename.o \ filesys.o \ fldlgcmn.o \ + fmapbase.o \ fontcmn.o \ fontmap.o \ framecmn.o \ @@ -754,6 +765,7 @@ COMMONOBJS = \ sizer.o \ socket.o \ statbar.o \ + stopwatch.o \ strconv.o \ stream.o \ string.o \ @@ -828,6 +840,7 @@ GENERICOBJS = \ wizard.o UNIXOBJS = \ + baseunix.o \ dialup.o \ dir.o \ fontenum.o \ -- 2.45.2