From 936f635341e9b92b37db93cc7781d564babbe25f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 15 Mar 2008 16:53:06 +0000 Subject: [PATCH] rename fobr95.{cpp,h} files to foobar.{cpp,h} git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 256 +++++++++---------- build/bakefiles/files.bkl | 16 +- build/msw/makefile.bcc | 240 +++++++++++------- build/msw/makefile.gcc | 280 ++++++++++++++------- build/msw/makefile.vc | 240 +++++++++++------- build/msw/makefile.wat | 280 ++++++++++++++------- build/msw/wx_core.dsp | 36 +-- build/msw/wx_vc7_core.vcproj | 30 +-- include/wx/gauge.h | 3 +- include/wx/msw/{gauge95.h => gauge.h} | 35 ++- include/wx/msw/{slider95.h => slider.h} | 10 +- include/wx/msw/{statbr95.h => statusbar.h} | 24 +- include/wx/msw/{tbar95.h => toolbar.h} | 0 include/wx/slider.h | 2 +- include/wx/statusbr.h | 4 +- include/wx/toolbar.h | 2 +- src/msw/{gauge95.cpp => gauge.cpp} | 52 ++-- src/msw/mdi.cpp | 4 - src/msw/{slider95.cpp => slider.cpp} | 0 src/msw/{statbr95.cpp => statusbar.cpp} | 44 ++-- src/msw/{tbar95.cpp => toolbar.cpp} | 2 +- 21 files changed, 920 insertions(+), 640 deletions(-) rename include/wx/msw/{gauge95.h => gauge.h} (71%) rename include/wx/msw/{slider95.h => slider.h} (95%) rename include/wx/msw/{statbr95.h => statusbar.h} (81%) rename include/wx/msw/{tbar95.h => toolbar.h} (100%) rename src/msw/{gauge95.cpp => gauge.cpp} (86%) rename src/msw/{slider95.cpp => slider.cpp} (100%) rename src/msw/{statbr95.cpp => statusbar.cpp} (91%) rename src/msw/{tbar95.cpp => toolbar.cpp} (99%) diff --git a/Makefile.in b/Makefile.in index d6e2212c76..f63eaa3370 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2663,7 +2663,7 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/filedlg.h \ wx/msw/font.h \ wx/msw/frame.h \ - wx/msw/gauge95.h \ + wx/msw/gauge.h \ wx/msw/gdiimage.h \ wx/msw/icon.h \ wx/msw/imaglist.h \ @@ -2696,16 +2696,16 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/rcdefs.h \ wx/msw/scrolbar.h \ wx/msw/setup0.h \ - wx/msw/slider95.h \ + wx/msw/slider.h \ wx/msw/spinbutt.h \ wx/msw/spinctrl.h \ wx/msw/statbmp.h \ wx/msw/statbox.h \ - wx/msw/statbr95.h \ + wx/msw/statusbar.h \ wx/msw/statline.h \ wx/msw/stattext.h \ wx/msw/tabctrl.h \ - wx/msw/tbar95.h \ + wx/msw/toolbar.h \ wx/msw/textctrl.h \ wx/msw/textentry.h \ wx/msw/tglbtn.h \ @@ -2861,7 +2861,7 @@ COND_TOOLKIT_WINCE_GUI_HDR = \ wx/msw/filedlg.h \ wx/msw/font.h \ wx/msw/frame.h \ - wx/msw/gauge95.h \ + wx/msw/gauge.h \ wx/msw/gdiimage.h \ wx/msw/icon.h \ wx/msw/imaglist.h \ @@ -2894,16 +2894,16 @@ COND_TOOLKIT_WINCE_GUI_HDR = \ wx/msw/rcdefs.h \ wx/msw/scrolbar.h \ wx/msw/setup0.h \ - wx/msw/slider95.h \ + wx/msw/slider.h \ wx/msw/spinbutt.h \ wx/msw/spinctrl.h \ wx/msw/statbmp.h \ wx/msw/statbox.h \ - wx/msw/statbr95.h \ + wx/msw/statusbar.h \ wx/msw/statline.h \ wx/msw/stattext.h \ wx/msw/tabctrl.h \ - wx/msw/tbar95.h \ + wx/msw/toolbar.h \ wx/msw/textctrl.h \ wx/msw/textentry.h \ wx/msw/tglbtn.h \ @@ -4823,7 +4823,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_dragimag.o \ monodll_filedlg.o \ monodll_frame.o \ - monodll_gauge95.o \ + monodll_gauge.o \ monodll_iniconf.o \ monodll_listbox.o \ monodll_listctrl.o \ @@ -4840,16 +4840,16 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_radiobox.o \ monodll_radiobut.o \ monodll_scrolbar.o \ - monodll_slider95.o \ + monodll_slider.o \ monodll_spinbutt.o \ monodll_spinctrl.o \ monodll_statbmp.o \ monodll_statbox.o \ - monodll_statbr95.o \ + monodll_statusbar.o \ monodll_statline.o \ monodll_stattext.o \ monodll_tabctrl.o \ - monodll_tbar95.o \ + monodll_toolbar.o \ monodll_textctrl.o \ monodll_textentry.o \ monodll_tglbtn.o \ @@ -4965,7 +4965,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \ monodll_dragimag.o \ monodll_filedlg.o \ monodll_frame.o \ - monodll_gauge95.o \ + monodll_gauge.o \ monodll_iniconf.o \ monodll_listbox.o \ monodll_listctrl.o \ @@ -4982,16 +4982,16 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \ monodll_radiobox.o \ monodll_radiobut.o \ monodll_scrolbar.o \ - monodll_slider95.o \ + monodll_slider.o \ monodll_spinbutt.o \ monodll_spinctrl.o \ monodll_statbmp.o \ monodll_statbox.o \ - monodll_statbr95.o \ + monodll_statusbar.o \ monodll_statline.o \ monodll_stattext.o \ monodll_tabctrl.o \ - monodll_tbar95.o \ + monodll_toolbar.o \ monodll_textctrl.o \ monodll_textentry.o \ monodll_tglbtn.o \ @@ -6730,7 +6730,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_dragimag.o \ monolib_filedlg.o \ monolib_frame.o \ - monolib_gauge95.o \ + monolib_gauge.o \ monolib_iniconf.o \ monolib_listbox.o \ monolib_listctrl.o \ @@ -6747,16 +6747,16 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_radiobox.o \ monolib_radiobut.o \ monolib_scrolbar.o \ - monolib_slider95.o \ + monolib_slider.o \ monolib_spinbutt.o \ monolib_spinctrl.o \ monolib_statbmp.o \ monolib_statbox.o \ - monolib_statbr95.o \ + monolib_statusbar.o \ monolib_statline.o \ monolib_stattext.o \ monolib_tabctrl.o \ - monolib_tbar95.o \ + monolib_toolbar.o \ monolib_textctrl.o \ monolib_textentry.o \ monolib_tglbtn.o \ @@ -6872,7 +6872,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \ monolib_dragimag.o \ monolib_filedlg.o \ monolib_frame.o \ - monolib_gauge95.o \ + monolib_gauge.o \ monolib_iniconf.o \ monolib_listbox.o \ monolib_listctrl.o \ @@ -6889,16 +6889,16 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \ monolib_radiobox.o \ monolib_radiobut.o \ monolib_scrolbar.o \ - monolib_slider95.o \ + monolib_slider.o \ monolib_spinbutt.o \ monolib_spinctrl.o \ monolib_statbmp.o \ monolib_statbox.o \ - monolib_statbr95.o \ + monolib_statusbar.o \ monolib_statline.o \ monolib_stattext.o \ monolib_tabctrl.o \ - monolib_tbar95.o \ + monolib_toolbar.o \ monolib_textctrl.o \ monolib_textentry.o \ monolib_tglbtn.o \ @@ -8930,7 +8930,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_dragimag.o \ coredll_filedlg.o \ coredll_frame.o \ - coredll_gauge95.o \ + coredll_gauge.o \ coredll_iniconf.o \ coredll_listbox.o \ coredll_listctrl.o \ @@ -8947,16 +8947,16 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_radiobox.o \ coredll_radiobut.o \ coredll_scrolbar.o \ - coredll_slider95.o \ + coredll_slider.o \ coredll_spinbutt.o \ coredll_spinctrl.o \ coredll_statbmp.o \ coredll_statbox.o \ - coredll_statbr95.o \ + coredll_statusbar.o \ coredll_statline.o \ coredll_stattext.o \ coredll_tabctrl.o \ - coredll_tbar95.o \ + coredll_toolbar.o \ coredll_textctrl.o \ coredll_textentry.o \ coredll_tglbtn.o \ @@ -9072,7 +9072,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \ coredll_dragimag.o \ coredll_filedlg.o \ coredll_frame.o \ - coredll_gauge95.o \ + coredll_gauge.o \ coredll_iniconf.o \ coredll_listbox.o \ coredll_listctrl.o \ @@ -9089,16 +9089,16 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \ coredll_radiobox.o \ coredll_radiobut.o \ coredll_scrolbar.o \ - coredll_slider95.o \ + coredll_slider.o \ coredll_spinbutt.o \ coredll_spinctrl.o \ coredll_statbmp.o \ coredll_statbox.o \ - coredll_statbr95.o \ + coredll_statusbar.o \ coredll_statline.o \ coredll_stattext.o \ coredll_tabctrl.o \ - coredll_tbar95.o \ + coredll_toolbar.o \ coredll_textctrl.o \ coredll_textentry.o \ coredll_tglbtn.o \ @@ -10427,7 +10427,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_dragimag.o \ corelib_filedlg.o \ corelib_frame.o \ - corelib_gauge95.o \ + corelib_gauge.o \ corelib_iniconf.o \ corelib_listbox.o \ corelib_listctrl.o \ @@ -10444,16 +10444,16 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_radiobox.o \ corelib_radiobut.o \ corelib_scrolbar.o \ - corelib_slider95.o \ + corelib_slider.o \ corelib_spinbutt.o \ corelib_spinctrl.o \ corelib_statbmp.o \ corelib_statbox.o \ - corelib_statbr95.o \ + corelib_statusbar.o \ corelib_statline.o \ corelib_stattext.o \ corelib_tabctrl.o \ - corelib_tbar95.o \ + corelib_toolbar.o \ corelib_textctrl.o \ corelib_textentry.o \ corelib_tglbtn.o \ @@ -10569,7 +10569,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \ corelib_dragimag.o \ corelib_filedlg.o \ corelib_frame.o \ - corelib_gauge95.o \ + corelib_gauge.o \ corelib_iniconf.o \ corelib_listbox.o \ corelib_listctrl.o \ @@ -10586,16 +10586,16 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \ corelib_radiobox.o \ corelib_radiobut.o \ corelib_scrolbar.o \ - corelib_slider95.o \ + corelib_slider.o \ corelib_spinbutt.o \ corelib_spinctrl.o \ corelib_statbmp.o \ corelib_statbox.o \ - corelib_statbr95.o \ + corelib_statusbar.o \ corelib_statline.o \ corelib_stattext.o \ corelib_tabctrl.o \ - corelib_tbar95.o \ + corelib_toolbar.o \ corelib_textctrl.o \ corelib_textentry.o \ corelib_tglbtn.o \ @@ -16701,6 +16701,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/mac/carbon/gauge.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/gauge.cpp @@ -16944,6 +16950,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/motif/slider.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/slider.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/msw/slider.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/msw/slider.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/mac/carbon/slider.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/slider.cpp @@ -17304,6 +17316,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/mac/carbon/toolbar.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/toolbar.cpp @@ -17328,12 +17346,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gauge95.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gauge95.cpp - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp @@ -17379,17 +17391,11 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_slider95.o: $(srcdir)/src/msw/slider95.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/slider95.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_slider95.o: $(srcdir)/src/msw/slider95.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/slider95.cpp - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statbr95.o: $(srcdir)/src/msw/statbr95.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbr95.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_statbr95.o: $(srcdir)/src/msw/statbr95.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbr95.cpp +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp @@ -17403,12 +17409,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_tbar95.o: $(srcdir)/src/msw/tbar95.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tbar95.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_tbar95.o: $(srcdir)/src/msw/tbar95.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tbar95.cpp - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp @@ -21216,6 +21216,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/mac/carbon/gauge.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/gauge.cpp @@ -21459,6 +21465,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/motif/slider.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/slider.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/msw/slider.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/msw/slider.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/mac/carbon/slider.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/slider.cpp @@ -21819,6 +21831,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/mac/carbon/toolbar.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/toolbar.cpp @@ -21843,12 +21861,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gauge95.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gauge95.cpp - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp @@ -21894,17 +21906,11 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_slider95.o: $(srcdir)/src/msw/slider95.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/slider95.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_slider95.o: $(srcdir)/src/msw/slider95.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/slider95.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statbr95.o: $(srcdir)/src/msw/statbr95.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbr95.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_statbr95.o: $(srcdir)/src/msw/statbr95.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbr95.cpp +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp @@ -21918,12 +21924,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_tbar95.o: $(srcdir)/src/msw/tbar95.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tbar95.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_tbar95.o: $(srcdir)/src/msw/tbar95.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tbar95.cpp - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp @@ -26325,6 +26325,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/motif/gauge.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/msw/gauge.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/msw/gauge.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/mac/carbon/gauge.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/gauge.cpp @@ -26568,6 +26574,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/motif/slider.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/slider.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/msw/slider.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/msw/slider.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/mac/carbon/slider.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/slider.cpp @@ -26928,6 +26940,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/mac/carbon/toolbar.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/toolbar.cpp @@ -26952,12 +26970,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gauge95.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gauge95.cpp - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp @@ -27003,17 +27015,11 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_slider95.o: $(srcdir)/src/msw/slider95.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/slider95.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_slider95.o: $(srcdir)/src/msw/slider95.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/slider95.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statbr95.o: $(srcdir)/src/msw/statbr95.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbr95.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_statbr95.o: $(srcdir)/src/msw/statbr95.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbr95.cpp +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp @@ -27027,12 +27033,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_tbar95.o: $(srcdir)/src/msw/tbar95.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tbar95.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_tbar95.o: $(srcdir)/src/msw/tbar95.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tbar95.cpp - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp @@ -29397,6 +29397,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/motif/gauge.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/msw/gauge.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/msw/gauge.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/mac/carbon/gauge.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/gauge.cpp @@ -29640,6 +29646,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/motif/slider.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/slider.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/msw/slider.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/msw/slider.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/mac/carbon/slider.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/slider.cpp @@ -30000,6 +30012,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/mac/carbon/toolbar.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/toolbar.cpp @@ -30024,12 +30042,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gauge95.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gauge95.cpp - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp @@ -30075,17 +30087,11 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_slider95.o: $(srcdir)/src/msw/slider95.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/slider95.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_slider95.o: $(srcdir)/src/msw/slider95.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/slider95.cpp - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statbr95.o: $(srcdir)/src/msw/statbr95.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbr95.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_statbr95.o: $(srcdir)/src/msw/statbr95.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbr95.cpp +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp @@ -30099,12 +30105,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_tbar95.o: $(srcdir)/src/msw/tbar95.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tbar95.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_tbar95.o: $(srcdir)/src/msw/tbar95.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tbar95.cpp - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index c49c61dddc..ca98e7d094 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -1667,7 +1667,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/dragimag.cpp src/msw/filedlg.cpp src/msw/frame.cpp - src/msw/gauge95.cpp + src/msw/gauge.cpp src/msw/iniconf.cpp src/msw/listbox.cpp src/msw/listctrl.cpp @@ -1684,16 +1684,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/radiobox.cpp src/msw/radiobut.cpp src/msw/scrolbar.cpp - src/msw/slider95.cpp + src/msw/slider.cpp src/msw/spinbutt.cpp src/msw/spinctrl.cpp src/msw/statbmp.cpp src/msw/statbox.cpp - src/msw/statbr95.cpp + src/msw/statusbar.cpp src/msw/statline.cpp src/msw/stattext.cpp src/msw/tabctrl.cpp - src/msw/tbar95.cpp + src/msw/toolbar.cpp src/msw/textctrl.cpp src/msw/textentry.cpp src/msw/tglbtn.cpp @@ -1735,7 +1735,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/msw/filedlg.h wx/msw/font.h wx/msw/frame.h - wx/msw/gauge95.h + wx/msw/gauge.h wx/msw/gdiimage.h wx/msw/icon.h wx/msw/imaglist.h @@ -1768,16 +1768,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/msw/rcdefs.h wx/msw/scrolbar.h wx/msw/setup0.h - wx/msw/slider95.h + wx/msw/slider.h wx/msw/spinbutt.h wx/msw/spinctrl.h wx/msw/statbmp.h wx/msw/statbox.h - wx/msw/statbr95.h + wx/msw/statusbar.h wx/msw/statline.h wx/msw/stattext.h wx/msw/tabctrl.h - wx/msw/tbar95.h + wx/msw/toolbar.h wx/msw/textctrl.h wx/msw/textentry.h wx/msw/tglbtn.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 4f7686360c..e86526d16a 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1542,7 +1542,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dragimag.obj \ $(OBJS)\monodll_filedlg.obj \ $(OBJS)\monodll_frame.obj \ - $(OBJS)\monodll_gauge95.obj \ + $(OBJS)\monodll_gauge.obj \ $(OBJS)\monodll_iniconf.obj \ $(OBJS)\monodll_listbox.obj \ $(OBJS)\monodll_listctrl.obj \ @@ -1559,16 +1559,16 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_radiobox.obj \ $(OBJS)\monodll_radiobut.obj \ $(OBJS)\monodll_scrolbar.obj \ - $(OBJS)\monodll_slider95.obj \ + $(OBJS)\monodll_slider.obj \ $(OBJS)\monodll_spinbutt.obj \ $(OBJS)\monodll_spinctrl.obj \ $(OBJS)\monodll_statbmp.obj \ $(OBJS)\monodll_statbox.obj \ - $(OBJS)\monodll_statbr95.obj \ + $(OBJS)\monodll_statusbar.obj \ $(OBJS)\monodll_statline.obj \ $(OBJS)\monodll_stattext.obj \ $(OBJS)\monodll_tabctrl.obj \ - $(OBJS)\monodll_tbar95.obj \ + $(OBJS)\monodll_toolbar.obj \ $(OBJS)\monodll_textctrl.obj \ $(OBJS)\monodll_textentry.obj \ $(OBJS)\monodll_tglbtn.obj \ @@ -2186,7 +2186,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dragimag.obj \ $(OBJS)\monolib_filedlg.obj \ $(OBJS)\monolib_frame.obj \ - $(OBJS)\monolib_gauge95.obj \ + $(OBJS)\monolib_gauge.obj \ $(OBJS)\monolib_iniconf.obj \ $(OBJS)\monolib_listbox.obj \ $(OBJS)\monolib_listctrl.obj \ @@ -2203,16 +2203,16 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_radiobox.obj \ $(OBJS)\monolib_radiobut.obj \ $(OBJS)\monolib_scrolbar.obj \ - $(OBJS)\monolib_slider95.obj \ + $(OBJS)\monolib_slider.obj \ $(OBJS)\monolib_spinbutt.obj \ $(OBJS)\monolib_spinctrl.obj \ $(OBJS)\monolib_statbmp.obj \ $(OBJS)\monolib_statbox.obj \ - $(OBJS)\monolib_statbr95.obj \ + $(OBJS)\monolib_statusbar.obj \ $(OBJS)\monolib_statline.obj \ $(OBJS)\monolib_stattext.obj \ $(OBJS)\monolib_tabctrl.obj \ - $(OBJS)\monolib_tbar95.obj \ + $(OBJS)\monolib_toolbar.obj \ $(OBJS)\monolib_textctrl.obj \ $(OBJS)\monolib_textentry.obj \ $(OBJS)\monolib_tglbtn.obj \ @@ -2745,7 +2745,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dragimag.obj \ $(OBJS)\coredll_filedlg.obj \ $(OBJS)\coredll_frame.obj \ - $(OBJS)\coredll_gauge95.obj \ + $(OBJS)\coredll_gauge.obj \ $(OBJS)\coredll_iniconf.obj \ $(OBJS)\coredll_listbox.obj \ $(OBJS)\coredll_listctrl.obj \ @@ -2762,16 +2762,16 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_radiobox.obj \ $(OBJS)\coredll_radiobut.obj \ $(OBJS)\coredll_scrolbar.obj \ - $(OBJS)\coredll_slider95.obj \ + $(OBJS)\coredll_slider.obj \ $(OBJS)\coredll_spinbutt.obj \ $(OBJS)\coredll_spinctrl.obj \ $(OBJS)\coredll_statbmp.obj \ $(OBJS)\coredll_statbox.obj \ - $(OBJS)\coredll_statbr95.obj \ + $(OBJS)\coredll_statusbar.obj \ $(OBJS)\coredll_statline.obj \ $(OBJS)\coredll_stattext.obj \ $(OBJS)\coredll_tabctrl.obj \ - $(OBJS)\coredll_tbar95.obj \ + $(OBJS)\coredll_toolbar.obj \ $(OBJS)\coredll_textctrl.obj \ $(OBJS)\coredll_textentry.obj \ $(OBJS)\coredll_tglbtn.obj \ @@ -3210,7 +3210,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dragimag.obj \ $(OBJS)\corelib_filedlg.obj \ $(OBJS)\corelib_frame.obj \ - $(OBJS)\corelib_gauge95.obj \ + $(OBJS)\corelib_gauge.obj \ $(OBJS)\corelib_iniconf.obj \ $(OBJS)\corelib_listbox.obj \ $(OBJS)\corelib_listctrl.obj \ @@ -3227,16 +3227,16 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_radiobox.obj \ $(OBJS)\corelib_radiobut.obj \ $(OBJS)\corelib_scrolbar.obj \ - $(OBJS)\corelib_slider95.obj \ + $(OBJS)\corelib_slider.obj \ $(OBJS)\corelib_spinbutt.obj \ $(OBJS)\corelib_spinctrl.obj \ $(OBJS)\corelib_statbmp.obj \ $(OBJS)\corelib_statbox.obj \ - $(OBJS)\corelib_statbr95.obj \ + $(OBJS)\corelib_statusbar.obj \ $(OBJS)\corelib_statline.obj \ $(OBJS)\corelib_stattext.obj \ $(OBJS)\corelib_tabctrl.obj \ - $(OBJS)\corelib_tbar95.obj \ + $(OBJS)\corelib_toolbar.obj \ $(OBJS)\corelib_textctrl.obj \ $(OBJS)\corelib_textentry.obj \ $(OBJS)\corelib_tglbtn.obj \ @@ -5542,9 +5542,6 @@ $(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp $(OBJS)\monodll_frame.obj: ..\..\src\msw\frame.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\frame.cpp -$(OBJS)\monodll_gauge95.obj: ..\..\src\msw\gauge95.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge95.cpp - $(OBJS)\monodll_iniconf.obj: ..\..\src\msw\iniconf.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp @@ -5572,21 +5569,15 @@ $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp $(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp -$(OBJS)\monodll_slider95.obj: ..\..\src\msw\slider95.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider95.cpp - $(OBJS)\monodll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp -$(OBJS)\monodll_statbr95.obj: ..\..\src\msw\statbr95.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbr95.cpp +$(OBJS)\monodll_statusbar.obj: ..\..\src\msw\statusbar.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp $(OBJS)\monodll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tabctrl.cpp -$(OBJS)\monodll_tbar95.obj: ..\..\src\msw\tbar95.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tbar95.cpp - $(OBJS)\monodll_textentry.obj: ..\..\src\msw\textentry.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textentry.cpp @@ -5626,9 +5617,6 @@ $(OBJS)\monodll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp $(OBJS)\monodll_framuniv.obj: ..\..\src\univ\framuniv.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp -$(OBJS)\monodll_gauge.obj: ..\..\src\univ\gauge.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp - $(OBJS)\monodll_inpcons.obj: ..\..\src\univ\inpcons.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp @@ -5641,18 +5629,12 @@ $(OBJS)\monodll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp $(OBJS)\monodll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp -$(OBJS)\monodll_slider.obj: ..\..\src\univ\slider.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp - $(OBJS)\monodll_stdrend.obj: ..\..\src\univ\stdrend.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp $(OBJS)\monodll_theme.obj: ..\..\src\univ\theme.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\theme.cpp -$(OBJS)\monodll_toolbar.obj: ..\..\src\univ\toolbar.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp - $(OBJS)\monodll_topluniv.obj: ..\..\src\univ\topluniv.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp @@ -6350,6 +6332,16 @@ $(OBJS)\monodll_dialog.obj: ..\..\src\univ\dialog.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\dialog.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monodll_gauge.obj: ..\..\src\msw\gauge.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monodll_gauge.obj: ..\..\src\univ\gauge.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monodll_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listbox.cpp @@ -6420,6 +6412,16 @@ $(OBJS)\monodll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monodll_slider.obj: ..\..\src\msw\slider.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monodll_slider.obj: ..\..\src\univ\slider.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monodll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp @@ -6470,6 +6472,16 @@ $(OBJS)\monodll_stattext.obj: ..\..\src\univ\stattext.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stattext.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monodll_toolbar.obj: ..\..\src\msw\toolbar.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monodll_toolbar.obj: ..\..\src\univ\toolbar.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monodll_textctrl.obj: ..\..\src\msw\textctrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp @@ -7651,9 +7663,6 @@ $(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp $(OBJS)\monolib_frame.obj: ..\..\src\msw\frame.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\frame.cpp -$(OBJS)\monolib_gauge95.obj: ..\..\src\msw\gauge95.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge95.cpp - $(OBJS)\monolib_iniconf.obj: ..\..\src\msw\iniconf.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp @@ -7681,21 +7690,15 @@ $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp $(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp -$(OBJS)\monolib_slider95.obj: ..\..\src\msw\slider95.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider95.cpp - $(OBJS)\monolib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp -$(OBJS)\monolib_statbr95.obj: ..\..\src\msw\statbr95.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbr95.cpp +$(OBJS)\monolib_statusbar.obj: ..\..\src\msw\statusbar.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp $(OBJS)\monolib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tabctrl.cpp -$(OBJS)\monolib_tbar95.obj: ..\..\src\msw\tbar95.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tbar95.cpp - $(OBJS)\monolib_textentry.obj: ..\..\src\msw\textentry.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textentry.cpp @@ -7735,9 +7738,6 @@ $(OBJS)\monolib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp $(OBJS)\monolib_framuniv.obj: ..\..\src\univ\framuniv.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp -$(OBJS)\monolib_gauge.obj: ..\..\src\univ\gauge.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp - $(OBJS)\monolib_inpcons.obj: ..\..\src\univ\inpcons.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp @@ -7750,18 +7750,12 @@ $(OBJS)\monolib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp $(OBJS)\monolib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp -$(OBJS)\monolib_slider.obj: ..\..\src\univ\slider.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp - $(OBJS)\monolib_stdrend.obj: ..\..\src\univ\stdrend.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp $(OBJS)\monolib_theme.obj: ..\..\src\univ\theme.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\theme.cpp -$(OBJS)\monolib_toolbar.obj: ..\..\src\univ\toolbar.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp - $(OBJS)\monolib_topluniv.obj: ..\..\src\univ\topluniv.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp @@ -8459,6 +8453,16 @@ $(OBJS)\monolib_dialog.obj: ..\..\src\univ\dialog.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\dialog.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monolib_gauge.obj: ..\..\src\msw\gauge.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monolib_gauge.obj: ..\..\src\univ\gauge.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monolib_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listbox.cpp @@ -8529,6 +8533,16 @@ $(OBJS)\monolib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monolib_slider.obj: ..\..\src\msw\slider.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monolib_slider.obj: ..\..\src\univ\slider.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monolib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp @@ -8579,6 +8593,16 @@ $(OBJS)\monolib_stattext.obj: ..\..\src\univ\stattext.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stattext.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monolib_toolbar.obj: ..\..\src\msw\toolbar.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monolib_toolbar.obj: ..\..\src\univ\toolbar.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monolib_textctrl.obj: ..\..\src\msw\textctrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp @@ -10144,9 +10168,6 @@ $(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp $(OBJS)\coredll_frame.obj: ..\..\src\msw\frame.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\frame.cpp -$(OBJS)\coredll_gauge95.obj: ..\..\src\msw\gauge95.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge95.cpp - $(OBJS)\coredll_iniconf.obj: ..\..\src\msw\iniconf.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp @@ -10174,21 +10195,15 @@ $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp $(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp -$(OBJS)\coredll_slider95.obj: ..\..\src\msw\slider95.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider95.cpp - $(OBJS)\coredll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp -$(OBJS)\coredll_statbr95.obj: ..\..\src\msw\statbr95.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbr95.cpp +$(OBJS)\coredll_statusbar.obj: ..\..\src\msw\statusbar.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp $(OBJS)\coredll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tabctrl.cpp -$(OBJS)\coredll_tbar95.obj: ..\..\src\msw\tbar95.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tbar95.cpp - $(OBJS)\coredll_textentry.obj: ..\..\src\msw\textentry.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textentry.cpp @@ -10228,9 +10243,6 @@ $(OBJS)\coredll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp $(OBJS)\coredll_framuniv.obj: ..\..\src\univ\framuniv.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp -$(OBJS)\coredll_gauge.obj: ..\..\src\univ\gauge.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp - $(OBJS)\coredll_inpcons.obj: ..\..\src\univ\inpcons.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp @@ -10243,18 +10255,12 @@ $(OBJS)\coredll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp $(OBJS)\coredll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp -$(OBJS)\coredll_slider.obj: ..\..\src\univ\slider.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp - $(OBJS)\coredll_stdrend.obj: ..\..\src\univ\stdrend.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp $(OBJS)\coredll_theme.obj: ..\..\src\univ\theme.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\theme.cpp -$(OBJS)\coredll_toolbar.obj: ..\..\src\univ\toolbar.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp - $(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp @@ -10628,6 +10634,16 @@ $(OBJS)\coredll_dialog.obj: ..\..\src\univ\dialog.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\dialog.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\coredll_gauge.obj: ..\..\src\msw\gauge.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\coredll_gauge.obj: ..\..\src\univ\gauge.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\coredll_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listbox.cpp @@ -10698,6 +10714,16 @@ $(OBJS)\coredll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\coredll_slider.obj: ..\..\src\msw\slider.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\coredll_slider.obj: ..\..\src\univ\slider.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\coredll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp @@ -10748,6 +10774,16 @@ $(OBJS)\coredll_stattext.obj: ..\..\src\univ\stattext.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stattext.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\coredll_toolbar.obj: ..\..\src\msw\toolbar.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\coredll_toolbar.obj: ..\..\src\univ\toolbar.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\coredll_textctrl.obj: ..\..\src\msw\textctrl.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp @@ -11458,9 +11494,6 @@ $(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp $(OBJS)\corelib_frame.obj: ..\..\src\msw\frame.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\frame.cpp -$(OBJS)\corelib_gauge95.obj: ..\..\src\msw\gauge95.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge95.cpp - $(OBJS)\corelib_iniconf.obj: ..\..\src\msw\iniconf.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp @@ -11488,21 +11521,15 @@ $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp $(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp -$(OBJS)\corelib_slider95.obj: ..\..\src\msw\slider95.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider95.cpp - $(OBJS)\corelib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp -$(OBJS)\corelib_statbr95.obj: ..\..\src\msw\statbr95.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbr95.cpp +$(OBJS)\corelib_statusbar.obj: ..\..\src\msw\statusbar.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp $(OBJS)\corelib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tabctrl.cpp -$(OBJS)\corelib_tbar95.obj: ..\..\src\msw\tbar95.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tbar95.cpp - $(OBJS)\corelib_textentry.obj: ..\..\src\msw\textentry.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textentry.cpp @@ -11542,9 +11569,6 @@ $(OBJS)\corelib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp $(OBJS)\corelib_framuniv.obj: ..\..\src\univ\framuniv.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp -$(OBJS)\corelib_gauge.obj: ..\..\src\univ\gauge.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp - $(OBJS)\corelib_inpcons.obj: ..\..\src\univ\inpcons.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp @@ -11557,18 +11581,12 @@ $(OBJS)\corelib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp $(OBJS)\corelib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp -$(OBJS)\corelib_slider.obj: ..\..\src\univ\slider.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp - $(OBJS)\corelib_stdrend.obj: ..\..\src\univ\stdrend.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp $(OBJS)\corelib_theme.obj: ..\..\src\univ\theme.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\theme.cpp -$(OBJS)\corelib_toolbar.obj: ..\..\src\univ\toolbar.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp - $(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp @@ -11942,6 +11960,16 @@ $(OBJS)\corelib_dialog.obj: ..\..\src\univ\dialog.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\dialog.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\corelib_gauge.obj: ..\..\src\msw\gauge.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\corelib_gauge.obj: ..\..\src\univ\gauge.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\corelib_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listbox.cpp @@ -12012,6 +12040,16 @@ $(OBJS)\corelib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\corelib_slider.obj: ..\..\src\msw\slider.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\corelib_slider.obj: ..\..\src\univ\slider.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\corelib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp @@ -12062,6 +12100,16 @@ $(OBJS)\corelib_stattext.obj: ..\..\src\univ\stattext.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stattext.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\corelib_toolbar.obj: ..\..\src\msw\toolbar.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\corelib_toolbar.obj: ..\..\src\univ\toolbar.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\corelib_textctrl.obj: ..\..\src\msw\textctrl.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 2ca4fe96f5..b810e60ff1 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1559,7 +1559,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dragimag.o \ $(OBJS)\monodll_filedlg.o \ $(OBJS)\monodll_frame.o \ - $(OBJS)\monodll_gauge95.o \ + $(OBJS)\monodll_gauge.o \ $(OBJS)\monodll_iniconf.o \ $(OBJS)\monodll_listbox.o \ $(OBJS)\monodll_listctrl.o \ @@ -1576,16 +1576,16 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_radiobox.o \ $(OBJS)\monodll_radiobut.o \ $(OBJS)\monodll_scrolbar.o \ - $(OBJS)\monodll_slider95.o \ + $(OBJS)\monodll_slider.o \ $(OBJS)\monodll_spinbutt.o \ $(OBJS)\monodll_spinctrl.o \ $(OBJS)\monodll_statbmp.o \ $(OBJS)\monodll_statbox.o \ - $(OBJS)\monodll_statbr95.o \ + $(OBJS)\monodll_statusbar.o \ $(OBJS)\monodll_statline.o \ $(OBJS)\monodll_stattext.o \ $(OBJS)\monodll_tabctrl.o \ - $(OBJS)\monodll_tbar95.o \ + $(OBJS)\monodll_toolbar.o \ $(OBJS)\monodll_textctrl.o \ $(OBJS)\monodll_textentry.o \ $(OBJS)\monodll_tglbtn.o \ @@ -2209,7 +2209,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dragimag.o \ $(OBJS)\monolib_filedlg.o \ $(OBJS)\monolib_frame.o \ - $(OBJS)\monolib_gauge95.o \ + $(OBJS)\monolib_gauge.o \ $(OBJS)\monolib_iniconf.o \ $(OBJS)\monolib_listbox.o \ $(OBJS)\monolib_listctrl.o \ @@ -2226,16 +2226,16 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_radiobox.o \ $(OBJS)\monolib_radiobut.o \ $(OBJS)\monolib_scrolbar.o \ - $(OBJS)\monolib_slider95.o \ + $(OBJS)\monolib_slider.o \ $(OBJS)\monolib_spinbutt.o \ $(OBJS)\monolib_spinctrl.o \ $(OBJS)\monolib_statbmp.o \ $(OBJS)\monolib_statbox.o \ - $(OBJS)\monolib_statbr95.o \ + $(OBJS)\monolib_statusbar.o \ $(OBJS)\monolib_statline.o \ $(OBJS)\monolib_stattext.o \ $(OBJS)\monolib_tabctrl.o \ - $(OBJS)\monolib_tbar95.o \ + $(OBJS)\monolib_toolbar.o \ $(OBJS)\monolib_textctrl.o \ $(OBJS)\monolib_textentry.o \ $(OBJS)\monolib_tglbtn.o \ @@ -2784,7 +2784,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dragimag.o \ $(OBJS)\coredll_filedlg.o \ $(OBJS)\coredll_frame.o \ - $(OBJS)\coredll_gauge95.o \ + $(OBJS)\coredll_gauge.o \ $(OBJS)\coredll_iniconf.o \ $(OBJS)\coredll_listbox.o \ $(OBJS)\coredll_listctrl.o \ @@ -2801,16 +2801,16 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_radiobox.o \ $(OBJS)\coredll_radiobut.o \ $(OBJS)\coredll_scrolbar.o \ - $(OBJS)\coredll_slider95.o \ + $(OBJS)\coredll_slider.o \ $(OBJS)\coredll_spinbutt.o \ $(OBJS)\coredll_spinctrl.o \ $(OBJS)\coredll_statbmp.o \ $(OBJS)\coredll_statbox.o \ - $(OBJS)\coredll_statbr95.o \ + $(OBJS)\coredll_statusbar.o \ $(OBJS)\coredll_statline.o \ $(OBJS)\coredll_stattext.o \ $(OBJS)\coredll_tabctrl.o \ - $(OBJS)\coredll_tbar95.o \ + $(OBJS)\coredll_toolbar.o \ $(OBJS)\coredll_textctrl.o \ $(OBJS)\coredll_textentry.o \ $(OBJS)\coredll_tglbtn.o \ @@ -3257,7 +3257,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dragimag.o \ $(OBJS)\corelib_filedlg.o \ $(OBJS)\corelib_frame.o \ - $(OBJS)\corelib_gauge95.o \ + $(OBJS)\corelib_gauge.o \ $(OBJS)\corelib_iniconf.o \ $(OBJS)\corelib_listbox.o \ $(OBJS)\corelib_listctrl.o \ @@ -3274,16 +3274,16 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_radiobox.o \ $(OBJS)\corelib_radiobut.o \ $(OBJS)\corelib_scrolbar.o \ - $(OBJS)\corelib_slider95.o \ + $(OBJS)\corelib_slider.o \ $(OBJS)\corelib_spinbutt.o \ $(OBJS)\corelib_spinctrl.o \ $(OBJS)\corelib_statbmp.o \ $(OBJS)\corelib_statbox.o \ - $(OBJS)\corelib_statbr95.o \ + $(OBJS)\corelib_statusbar.o \ $(OBJS)\corelib_statline.o \ $(OBJS)\corelib_stattext.o \ $(OBJS)\corelib_tabctrl.o \ - $(OBJS)\corelib_tbar95.o \ + $(OBJS)\corelib_toolbar.o \ $(OBJS)\corelib_textctrl.o \ $(OBJS)\corelib_textentry.o \ $(OBJS)\corelib_tglbtn.o \ @@ -5684,9 +5684,6 @@ $(OBJS)\monodll_filedlg.o: ../../src/msw/filedlg.cpp $(OBJS)\monodll_frame.o: ../../src/msw/frame.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_gauge95.o: ../../src/msw/gauge95.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monodll_iniconf.o: ../../src/msw/iniconf.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -5714,21 +5711,15 @@ $(OBJS)\monodll_access.o: ../../src/msw/ole/access.cpp $(OBJS)\monodll_ownerdrw.o: ../../src/msw/ownerdrw.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_slider95.o: ../../src/msw/slider95.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monodll_spinctrl.o: ../../src/msw/spinctrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_statbr95.o: ../../src/msw/statbr95.cpp +$(OBJS)\monodll_statusbar.o: ../../src/msw/statusbar.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\monodll_tabctrl.o: ../../src/msw/tabctrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_tbar95.o: ../../src/msw/tbar95.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monodll_textentry.o: ../../src/msw/textentry.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -5768,9 +5759,6 @@ $(OBJS)\monodll_ctrlrend.o: ../../src/univ/ctrlrend.cpp $(OBJS)\monodll_framuniv.o: ../../src/univ/framuniv.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_gauge.o: ../../src/univ/gauge.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monodll_inpcons.o: ../../src/univ/inpcons.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -5783,18 +5771,12 @@ $(OBJS)\monodll_scrarrow.o: ../../src/univ/scrarrow.cpp $(OBJS)\monodll_scrthumb.o: ../../src/univ/scrthumb.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_slider.o: ../../src/univ/slider.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monodll_stdrend.o: ../../src/univ/stdrend.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\monodll_theme.o: ../../src/univ/theme.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_toolbar.o: ../../src/univ/toolbar.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monodll_topluniv.o: ../../src/univ/topluniv.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -6528,6 +6510,20 @@ $(OBJS)\monodll_dialog.o: ../../src/univ/dialog.cpp endif endif +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),0) +$(OBJS)\monodll_gauge.o: ../../src/msw/gauge.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif +endif + +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),1) +$(OBJS)\monodll_gauge.o: ../../src/univ/gauge.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\monodll_listbox.o: ../../src/msw/listbox.cpp @@ -6626,6 +6622,20 @@ $(OBJS)\monodll_scrolbar.o: ../../src/univ/scrolbar.cpp endif endif +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),0) +$(OBJS)\monodll_slider.o: ../../src/msw/slider.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif +endif + +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),1) +$(OBJS)\monodll_slider.o: ../../src/univ/slider.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\monodll_spinbutt.o: ../../src/msw/spinbutt.cpp @@ -6696,6 +6706,20 @@ $(OBJS)\monodll_stattext.o: ../../src/univ/stattext.cpp endif endif +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),0) +$(OBJS)\monodll_toolbar.o: ../../src/msw/toolbar.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif +endif + +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),1) +$(OBJS)\monodll_toolbar.o: ../../src/univ/toolbar.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\monodll_textctrl.o: ../../src/msw/textctrl.cpp @@ -7895,9 +7919,6 @@ $(OBJS)\monolib_filedlg.o: ../../src/msw/filedlg.cpp $(OBJS)\monolib_frame.o: ../../src/msw/frame.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_gauge95.o: ../../src/msw/gauge95.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monolib_iniconf.o: ../../src/msw/iniconf.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -7925,21 +7946,15 @@ $(OBJS)\monolib_access.o: ../../src/msw/ole/access.cpp $(OBJS)\monolib_ownerdrw.o: ../../src/msw/ownerdrw.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_slider95.o: ../../src/msw/slider95.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monolib_spinctrl.o: ../../src/msw/spinctrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_statbr95.o: ../../src/msw/statbr95.cpp +$(OBJS)\monolib_statusbar.o: ../../src/msw/statusbar.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\monolib_tabctrl.o: ../../src/msw/tabctrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_tbar95.o: ../../src/msw/tbar95.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monolib_textentry.o: ../../src/msw/textentry.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -7979,9 +7994,6 @@ $(OBJS)\monolib_ctrlrend.o: ../../src/univ/ctrlrend.cpp $(OBJS)\monolib_framuniv.o: ../../src/univ/framuniv.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_gauge.o: ../../src/univ/gauge.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monolib_inpcons.o: ../../src/univ/inpcons.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -7994,18 +8006,12 @@ $(OBJS)\monolib_scrarrow.o: ../../src/univ/scrarrow.cpp $(OBJS)\monolib_scrthumb.o: ../../src/univ/scrthumb.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_slider.o: ../../src/univ/slider.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monolib_stdrend.o: ../../src/univ/stdrend.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\monolib_theme.o: ../../src/univ/theme.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_toolbar.o: ../../src/univ/toolbar.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monolib_topluniv.o: ../../src/univ/topluniv.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -8739,6 +8745,20 @@ $(OBJS)\monolib_dialog.o: ../../src/univ/dialog.cpp endif endif +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),0) +$(OBJS)\monolib_gauge.o: ../../src/msw/gauge.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif +endif + +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),1) +$(OBJS)\monolib_gauge.o: ../../src/univ/gauge.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\monolib_listbox.o: ../../src/msw/listbox.cpp @@ -8837,6 +8857,20 @@ $(OBJS)\monolib_scrolbar.o: ../../src/univ/scrolbar.cpp endif endif +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),0) +$(OBJS)\monolib_slider.o: ../../src/msw/slider.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif +endif + +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),1) +$(OBJS)\monolib_slider.o: ../../src/univ/slider.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\monolib_spinbutt.o: ../../src/msw/spinbutt.cpp @@ -8907,6 +8941,20 @@ $(OBJS)\monolib_stattext.o: ../../src/univ/stattext.cpp endif endif +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),0) +$(OBJS)\monolib_toolbar.o: ../../src/msw/toolbar.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif +endif + +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),1) +$(OBJS)\monolib_toolbar.o: ../../src/univ/toolbar.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\monolib_textctrl.o: ../../src/msw/textctrl.cpp @@ -10490,9 +10538,6 @@ $(OBJS)\coredll_filedlg.o: ../../src/msw/filedlg.cpp $(OBJS)\coredll_frame.o: ../../src/msw/frame.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\coredll_gauge95.o: ../../src/msw/gauge95.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\coredll_iniconf.o: ../../src/msw/iniconf.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -10520,21 +10565,15 @@ $(OBJS)\coredll_access.o: ../../src/msw/ole/access.cpp $(OBJS)\coredll_ownerdrw.o: ../../src/msw/ownerdrw.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\coredll_slider95.o: ../../src/msw/slider95.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\coredll_spinctrl.o: ../../src/msw/spinctrl.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\coredll_statbr95.o: ../../src/msw/statbr95.cpp +$(OBJS)\coredll_statusbar.o: ../../src/msw/statusbar.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\coredll_tabctrl.o: ../../src/msw/tabctrl.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\coredll_tbar95.o: ../../src/msw/tbar95.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\coredll_textentry.o: ../../src/msw/textentry.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -10574,9 +10613,6 @@ $(OBJS)\coredll_ctrlrend.o: ../../src/univ/ctrlrend.cpp $(OBJS)\coredll_framuniv.o: ../../src/univ/framuniv.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\coredll_gauge.o: ../../src/univ/gauge.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\coredll_inpcons.o: ../../src/univ/inpcons.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -10589,18 +10625,12 @@ $(OBJS)\coredll_scrarrow.o: ../../src/univ/scrarrow.cpp $(OBJS)\coredll_scrthumb.o: ../../src/univ/scrthumb.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\coredll_slider.o: ../../src/univ/slider.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\coredll_stdrend.o: ../../src/univ/stdrend.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\coredll_theme.o: ../../src/univ/theme.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\coredll_toolbar.o: ../../src/univ/toolbar.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\coredll_topluniv.o: ../../src/univ/topluniv.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11010,6 +11040,20 @@ $(OBJS)\coredll_dialog.o: ../../src/univ/dialog.cpp endif endif +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),0) +$(OBJS)\coredll_gauge.o: ../../src/msw/gauge.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif +endif + +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),1) +$(OBJS)\coredll_gauge.o: ../../src/univ/gauge.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\coredll_listbox.o: ../../src/msw/listbox.cpp @@ -11108,6 +11152,20 @@ $(OBJS)\coredll_scrolbar.o: ../../src/univ/scrolbar.cpp endif endif +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),0) +$(OBJS)\coredll_slider.o: ../../src/msw/slider.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif +endif + +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),1) +$(OBJS)\coredll_slider.o: ../../src/univ/slider.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\coredll_spinbutt.o: ../../src/msw/spinbutt.cpp @@ -11178,6 +11236,20 @@ $(OBJS)\coredll_stattext.o: ../../src/univ/stattext.cpp endif endif +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),0) +$(OBJS)\coredll_toolbar.o: ../../src/msw/toolbar.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif +endif + +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),1) +$(OBJS)\coredll_toolbar.o: ../../src/univ/toolbar.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\coredll_textctrl.o: ../../src/msw/textctrl.cpp @@ -11904,9 +11976,6 @@ $(OBJS)\corelib_filedlg.o: ../../src/msw/filedlg.cpp $(OBJS)\corelib_frame.o: ../../src/msw/frame.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\corelib_gauge95.o: ../../src/msw/gauge95.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\corelib_iniconf.o: ../../src/msw/iniconf.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -11934,21 +12003,15 @@ $(OBJS)\corelib_access.o: ../../src/msw/ole/access.cpp $(OBJS)\corelib_ownerdrw.o: ../../src/msw/ownerdrw.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\corelib_slider95.o: ../../src/msw/slider95.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\corelib_spinctrl.o: ../../src/msw/spinctrl.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\corelib_statbr95.o: ../../src/msw/statbr95.cpp +$(OBJS)\corelib_statusbar.o: ../../src/msw/statusbar.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\corelib_tabctrl.o: ../../src/msw/tabctrl.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\corelib_tbar95.o: ../../src/msw/tbar95.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\corelib_textentry.o: ../../src/msw/textentry.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -11988,9 +12051,6 @@ $(OBJS)\corelib_ctrlrend.o: ../../src/univ/ctrlrend.cpp $(OBJS)\corelib_framuniv.o: ../../src/univ/framuniv.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\corelib_gauge.o: ../../src/univ/gauge.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\corelib_inpcons.o: ../../src/univ/inpcons.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -12003,18 +12063,12 @@ $(OBJS)\corelib_scrarrow.o: ../../src/univ/scrarrow.cpp $(OBJS)\corelib_scrthumb.o: ../../src/univ/scrthumb.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\corelib_slider.o: ../../src/univ/slider.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\corelib_stdrend.o: ../../src/univ/stdrend.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\corelib_theme.o: ../../src/univ/theme.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\corelib_toolbar.o: ../../src/univ/toolbar.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\corelib_topluniv.o: ../../src/univ/topluniv.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -12424,6 +12478,20 @@ $(OBJS)\corelib_dialog.o: ../../src/univ/dialog.cpp endif endif +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),0) +$(OBJS)\corelib_gauge.o: ../../src/msw/gauge.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif +endif + +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),1) +$(OBJS)\corelib_gauge.o: ../../src/univ/gauge.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\corelib_listbox.o: ../../src/msw/listbox.cpp @@ -12522,6 +12590,20 @@ $(OBJS)\corelib_scrolbar.o: ../../src/univ/scrolbar.cpp endif endif +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),0) +$(OBJS)\corelib_slider.o: ../../src/msw/slider.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif +endif + +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),1) +$(OBJS)\corelib_slider.o: ../../src/univ/slider.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\corelib_spinbutt.o: ../../src/msw/spinbutt.cpp @@ -12592,6 +12674,20 @@ $(OBJS)\corelib_stattext.o: ../../src/univ/stattext.cpp endif endif +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),0) +$(OBJS)\corelib_toolbar.o: ../../src/msw/toolbar.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif +endif + +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),1) +$(OBJS)\corelib_toolbar.o: ../../src/univ/toolbar.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\corelib_textctrl.o: ../../src/msw/textctrl.cpp diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index d5a3c2bf91..a4a99aae7a 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1716,7 +1716,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dragimag.obj \ $(OBJS)\monodll_filedlg.obj \ $(OBJS)\monodll_frame.obj \ - $(OBJS)\monodll_gauge95.obj \ + $(OBJS)\monodll_gauge.obj \ $(OBJS)\monodll_iniconf.obj \ $(OBJS)\monodll_listbox.obj \ $(OBJS)\monodll_listctrl.obj \ @@ -1733,16 +1733,16 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_radiobox.obj \ $(OBJS)\monodll_radiobut.obj \ $(OBJS)\monodll_scrolbar.obj \ - $(OBJS)\monodll_slider95.obj \ + $(OBJS)\monodll_slider.obj \ $(OBJS)\monodll_spinbutt.obj \ $(OBJS)\monodll_spinctrl.obj \ $(OBJS)\monodll_statbmp.obj \ $(OBJS)\monodll_statbox.obj \ - $(OBJS)\monodll_statbr95.obj \ + $(OBJS)\monodll_statusbar.obj \ $(OBJS)\monodll_statline.obj \ $(OBJS)\monodll_stattext.obj \ $(OBJS)\monodll_tabctrl.obj \ - $(OBJS)\monodll_tbar95.obj \ + $(OBJS)\monodll_toolbar.obj \ $(OBJS)\monodll_textctrl.obj \ $(OBJS)\monodll_textentry.obj \ $(OBJS)\monodll_tglbtn.obj \ @@ -2366,7 +2366,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dragimag.obj \ $(OBJS)\monolib_filedlg.obj \ $(OBJS)\monolib_frame.obj \ - $(OBJS)\monolib_gauge95.obj \ + $(OBJS)\monolib_gauge.obj \ $(OBJS)\monolib_iniconf.obj \ $(OBJS)\monolib_listbox.obj \ $(OBJS)\monolib_listctrl.obj \ @@ -2383,16 +2383,16 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_radiobox.obj \ $(OBJS)\monolib_radiobut.obj \ $(OBJS)\monolib_scrolbar.obj \ - $(OBJS)\monolib_slider95.obj \ + $(OBJS)\monolib_slider.obj \ $(OBJS)\monolib_spinbutt.obj \ $(OBJS)\monolib_spinctrl.obj \ $(OBJS)\monolib_statbmp.obj \ $(OBJS)\monolib_statbox.obj \ - $(OBJS)\monolib_statbr95.obj \ + $(OBJS)\monolib_statusbar.obj \ $(OBJS)\monolib_statline.obj \ $(OBJS)\monolib_stattext.obj \ $(OBJS)\monolib_tabctrl.obj \ - $(OBJS)\monolib_tbar95.obj \ + $(OBJS)\monolib_toolbar.obj \ $(OBJS)\monolib_textctrl.obj \ $(OBJS)\monolib_textentry.obj \ $(OBJS)\monolib_tglbtn.obj \ @@ -2955,7 +2955,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dragimag.obj \ $(OBJS)\coredll_filedlg.obj \ $(OBJS)\coredll_frame.obj \ - $(OBJS)\coredll_gauge95.obj \ + $(OBJS)\coredll_gauge.obj \ $(OBJS)\coredll_iniconf.obj \ $(OBJS)\coredll_listbox.obj \ $(OBJS)\coredll_listctrl.obj \ @@ -2972,16 +2972,16 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_radiobox.obj \ $(OBJS)\coredll_radiobut.obj \ $(OBJS)\coredll_scrolbar.obj \ - $(OBJS)\coredll_slider95.obj \ + $(OBJS)\coredll_slider.obj \ $(OBJS)\coredll_spinbutt.obj \ $(OBJS)\coredll_spinctrl.obj \ $(OBJS)\coredll_statbmp.obj \ $(OBJS)\coredll_statbox.obj \ - $(OBJS)\coredll_statbr95.obj \ + $(OBJS)\coredll_statusbar.obj \ $(OBJS)\coredll_statline.obj \ $(OBJS)\coredll_stattext.obj \ $(OBJS)\coredll_tabctrl.obj \ - $(OBJS)\coredll_tbar95.obj \ + $(OBJS)\coredll_toolbar.obj \ $(OBJS)\coredll_textctrl.obj \ $(OBJS)\coredll_textentry.obj \ $(OBJS)\coredll_tglbtn.obj \ @@ -3426,7 +3426,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dragimag.obj \ $(OBJS)\corelib_filedlg.obj \ $(OBJS)\corelib_frame.obj \ - $(OBJS)\corelib_gauge95.obj \ + $(OBJS)\corelib_gauge.obj \ $(OBJS)\corelib_iniconf.obj \ $(OBJS)\corelib_listbox.obj \ $(OBJS)\corelib_listctrl.obj \ @@ -3443,16 +3443,16 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_radiobox.obj \ $(OBJS)\corelib_radiobut.obj \ $(OBJS)\corelib_scrolbar.obj \ - $(OBJS)\corelib_slider95.obj \ + $(OBJS)\corelib_slider.obj \ $(OBJS)\corelib_spinbutt.obj \ $(OBJS)\corelib_spinctrl.obj \ $(OBJS)\corelib_statbmp.obj \ $(OBJS)\corelib_statbox.obj \ - $(OBJS)\corelib_statbr95.obj \ + $(OBJS)\corelib_statusbar.obj \ $(OBJS)\corelib_statline.obj \ $(OBJS)\corelib_stattext.obj \ $(OBJS)\corelib_tabctrl.obj \ - $(OBJS)\corelib_tbar95.obj \ + $(OBJS)\corelib_toolbar.obj \ $(OBJS)\corelib_textctrl.obj \ $(OBJS)\corelib_textentry.obj \ $(OBJS)\corelib_tglbtn.obj \ @@ -5874,9 +5874,6 @@ $(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp $(OBJS)\monodll_frame.obj: ..\..\src\msw\frame.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\frame.cpp -$(OBJS)\monodll_gauge95.obj: ..\..\src\msw\gauge95.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge95.cpp - $(OBJS)\monodll_iniconf.obj: ..\..\src\msw\iniconf.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp @@ -5904,21 +5901,15 @@ $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp $(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp -$(OBJS)\monodll_slider95.obj: ..\..\src\msw\slider95.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider95.cpp - $(OBJS)\monodll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp -$(OBJS)\monodll_statbr95.obj: ..\..\src\msw\statbr95.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbr95.cpp +$(OBJS)\monodll_statusbar.obj: ..\..\src\msw\statusbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp $(OBJS)\monodll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tabctrl.cpp -$(OBJS)\monodll_tbar95.obj: ..\..\src\msw\tbar95.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tbar95.cpp - $(OBJS)\monodll_textentry.obj: ..\..\src\msw\textentry.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textentry.cpp @@ -5958,9 +5949,6 @@ $(OBJS)\monodll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp $(OBJS)\monodll_framuniv.obj: ..\..\src\univ\framuniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp -$(OBJS)\monodll_gauge.obj: ..\..\src\univ\gauge.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp - $(OBJS)\monodll_inpcons.obj: ..\..\src\univ\inpcons.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp @@ -5973,18 +5961,12 @@ $(OBJS)\monodll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp $(OBJS)\monodll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp -$(OBJS)\monodll_slider.obj: ..\..\src\univ\slider.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp - $(OBJS)\monodll_stdrend.obj: ..\..\src\univ\stdrend.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp $(OBJS)\monodll_theme.obj: ..\..\src\univ\theme.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\theme.cpp -$(OBJS)\monodll_toolbar.obj: ..\..\src\univ\toolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp - $(OBJS)\monodll_topluniv.obj: ..\..\src\univ\topluniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp @@ -6682,6 +6664,16 @@ $(OBJS)\monodll_dialog.obj: ..\..\src\univ\dialog.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\dialog.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monodll_gauge.obj: ..\..\src\msw\gauge.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monodll_gauge.obj: ..\..\src\univ\gauge.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monodll_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listbox.cpp @@ -6752,6 +6744,16 @@ $(OBJS)\monodll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monodll_slider.obj: ..\..\src\msw\slider.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monodll_slider.obj: ..\..\src\univ\slider.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monodll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp @@ -6802,6 +6804,16 @@ $(OBJS)\monodll_stattext.obj: ..\..\src\univ\stattext.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stattext.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monodll_toolbar.obj: ..\..\src\msw\toolbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monodll_toolbar.obj: ..\..\src\univ\toolbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monodll_textctrl.obj: ..\..\src\msw\textctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp @@ -7983,9 +7995,6 @@ $(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp $(OBJS)\monolib_frame.obj: ..\..\src\msw\frame.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\frame.cpp -$(OBJS)\monolib_gauge95.obj: ..\..\src\msw\gauge95.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge95.cpp - $(OBJS)\monolib_iniconf.obj: ..\..\src\msw\iniconf.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp @@ -8013,21 +8022,15 @@ $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp $(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp -$(OBJS)\monolib_slider95.obj: ..\..\src\msw\slider95.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider95.cpp - $(OBJS)\monolib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp -$(OBJS)\monolib_statbr95.obj: ..\..\src\msw\statbr95.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbr95.cpp +$(OBJS)\monolib_statusbar.obj: ..\..\src\msw\statusbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp $(OBJS)\monolib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tabctrl.cpp -$(OBJS)\monolib_tbar95.obj: ..\..\src\msw\tbar95.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tbar95.cpp - $(OBJS)\monolib_textentry.obj: ..\..\src\msw\textentry.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textentry.cpp @@ -8067,9 +8070,6 @@ $(OBJS)\monolib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp $(OBJS)\monolib_framuniv.obj: ..\..\src\univ\framuniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp -$(OBJS)\monolib_gauge.obj: ..\..\src\univ\gauge.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp - $(OBJS)\monolib_inpcons.obj: ..\..\src\univ\inpcons.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp @@ -8082,18 +8082,12 @@ $(OBJS)\monolib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp $(OBJS)\monolib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp -$(OBJS)\monolib_slider.obj: ..\..\src\univ\slider.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp - $(OBJS)\monolib_stdrend.obj: ..\..\src\univ\stdrend.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp $(OBJS)\monolib_theme.obj: ..\..\src\univ\theme.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\theme.cpp -$(OBJS)\monolib_toolbar.obj: ..\..\src\univ\toolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp - $(OBJS)\monolib_topluniv.obj: ..\..\src\univ\topluniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp @@ -8791,6 +8785,16 @@ $(OBJS)\monolib_dialog.obj: ..\..\src\univ\dialog.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\dialog.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monolib_gauge.obj: ..\..\src\msw\gauge.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monolib_gauge.obj: ..\..\src\univ\gauge.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monolib_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listbox.cpp @@ -8861,6 +8865,16 @@ $(OBJS)\monolib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monolib_slider.obj: ..\..\src\msw\slider.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monolib_slider.obj: ..\..\src\univ\slider.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monolib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp @@ -8911,6 +8925,16 @@ $(OBJS)\monolib_stattext.obj: ..\..\src\univ\stattext.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stattext.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monolib_toolbar.obj: ..\..\src\msw\toolbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monolib_toolbar.obj: ..\..\src\univ\toolbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monolib_textctrl.obj: ..\..\src\msw\textctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp @@ -10476,9 +10500,6 @@ $(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp $(OBJS)\coredll_frame.obj: ..\..\src\msw\frame.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\frame.cpp -$(OBJS)\coredll_gauge95.obj: ..\..\src\msw\gauge95.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge95.cpp - $(OBJS)\coredll_iniconf.obj: ..\..\src\msw\iniconf.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp @@ -10506,21 +10527,15 @@ $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp $(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp -$(OBJS)\coredll_slider95.obj: ..\..\src\msw\slider95.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider95.cpp - $(OBJS)\coredll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp -$(OBJS)\coredll_statbr95.obj: ..\..\src\msw\statbr95.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbr95.cpp +$(OBJS)\coredll_statusbar.obj: ..\..\src\msw\statusbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp $(OBJS)\coredll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tabctrl.cpp -$(OBJS)\coredll_tbar95.obj: ..\..\src\msw\tbar95.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tbar95.cpp - $(OBJS)\coredll_textentry.obj: ..\..\src\msw\textentry.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textentry.cpp @@ -10560,9 +10575,6 @@ $(OBJS)\coredll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp $(OBJS)\coredll_framuniv.obj: ..\..\src\univ\framuniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp -$(OBJS)\coredll_gauge.obj: ..\..\src\univ\gauge.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp - $(OBJS)\coredll_inpcons.obj: ..\..\src\univ\inpcons.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp @@ -10575,18 +10587,12 @@ $(OBJS)\coredll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp $(OBJS)\coredll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp -$(OBJS)\coredll_slider.obj: ..\..\src\univ\slider.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp - $(OBJS)\coredll_stdrend.obj: ..\..\src\univ\stdrend.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp $(OBJS)\coredll_theme.obj: ..\..\src\univ\theme.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\theme.cpp -$(OBJS)\coredll_toolbar.obj: ..\..\src\univ\toolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp - $(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp @@ -10960,6 +10966,16 @@ $(OBJS)\coredll_dialog.obj: ..\..\src\univ\dialog.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\dialog.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\coredll_gauge.obj: ..\..\src\msw\gauge.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\coredll_gauge.obj: ..\..\src\univ\gauge.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\coredll_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listbox.cpp @@ -11030,6 +11046,16 @@ $(OBJS)\coredll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\coredll_slider.obj: ..\..\src\msw\slider.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\coredll_slider.obj: ..\..\src\univ\slider.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\coredll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp @@ -11080,6 +11106,16 @@ $(OBJS)\coredll_stattext.obj: ..\..\src\univ\stattext.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stattext.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\coredll_toolbar.obj: ..\..\src\msw\toolbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\coredll_toolbar.obj: ..\..\src\univ\toolbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\coredll_textctrl.obj: ..\..\src\msw\textctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp @@ -11790,9 +11826,6 @@ $(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp $(OBJS)\corelib_frame.obj: ..\..\src\msw\frame.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\frame.cpp -$(OBJS)\corelib_gauge95.obj: ..\..\src\msw\gauge95.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge95.cpp - $(OBJS)\corelib_iniconf.obj: ..\..\src\msw\iniconf.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp @@ -11820,21 +11853,15 @@ $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp $(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp -$(OBJS)\corelib_slider95.obj: ..\..\src\msw\slider95.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider95.cpp - $(OBJS)\corelib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp -$(OBJS)\corelib_statbr95.obj: ..\..\src\msw\statbr95.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbr95.cpp +$(OBJS)\corelib_statusbar.obj: ..\..\src\msw\statusbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp $(OBJS)\corelib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tabctrl.cpp -$(OBJS)\corelib_tbar95.obj: ..\..\src\msw\tbar95.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tbar95.cpp - $(OBJS)\corelib_textentry.obj: ..\..\src\msw\textentry.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textentry.cpp @@ -11874,9 +11901,6 @@ $(OBJS)\corelib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp $(OBJS)\corelib_framuniv.obj: ..\..\src\univ\framuniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp -$(OBJS)\corelib_gauge.obj: ..\..\src\univ\gauge.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp - $(OBJS)\corelib_inpcons.obj: ..\..\src\univ\inpcons.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp @@ -11889,18 +11913,12 @@ $(OBJS)\corelib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp $(OBJS)\corelib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp -$(OBJS)\corelib_slider.obj: ..\..\src\univ\slider.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp - $(OBJS)\corelib_stdrend.obj: ..\..\src\univ\stdrend.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp $(OBJS)\corelib_theme.obj: ..\..\src\univ\theme.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\theme.cpp -$(OBJS)\corelib_toolbar.obj: ..\..\src\univ\toolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp - $(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp @@ -12274,6 +12292,16 @@ $(OBJS)\corelib_dialog.obj: ..\..\src\univ\dialog.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\dialog.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\corelib_gauge.obj: ..\..\src\msw\gauge.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\corelib_gauge.obj: ..\..\src\univ\gauge.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\corelib_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listbox.cpp @@ -12344,6 +12372,16 @@ $(OBJS)\corelib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\corelib_slider.obj: ..\..\src\msw\slider.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\corelib_slider.obj: ..\..\src\univ\slider.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\corelib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp @@ -12394,6 +12432,16 @@ $(OBJS)\corelib_stattext.obj: ..\..\src\univ\stattext.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stattext.cpp !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\corelib_toolbar.obj: ..\..\src\msw\toolbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\corelib_toolbar.obj: ..\..\src\univ\toolbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\corelib_textctrl.obj: ..\..\src\msw\textctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index d0569b7a58..e7c4ecd50d 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -278,7 +278,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_dragimag.obj & $(OBJS)\monodll_filedlg.obj & $(OBJS)\monodll_frame.obj & - $(OBJS)\monodll_gauge95.obj & + $(OBJS)\monodll_gauge.obj & $(OBJS)\monodll_iniconf.obj & $(OBJS)\monodll_listbox.obj & $(OBJS)\monodll_listctrl.obj & @@ -295,16 +295,16 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_radiobox.obj & $(OBJS)\monodll_radiobut.obj & $(OBJS)\monodll_scrolbar.obj & - $(OBJS)\monodll_slider95.obj & + $(OBJS)\monodll_slider.obj & $(OBJS)\monodll_spinbutt.obj & $(OBJS)\monodll_spinctrl.obj & $(OBJS)\monodll_statbmp.obj & $(OBJS)\monodll_statbox.obj & - $(OBJS)\monodll_statbr95.obj & + $(OBJS)\monodll_statusbar.obj & $(OBJS)\monodll_statline.obj & $(OBJS)\monodll_stattext.obj & $(OBJS)\monodll_tabctrl.obj & - $(OBJS)\monodll_tbar95.obj & + $(OBJS)\monodll_toolbar.obj & $(OBJS)\monodll_textctrl.obj & $(OBJS)\monodll_textentry.obj & $(OBJS)\monodll_tglbtn.obj & @@ -933,7 +933,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_dragimag.obj & $(OBJS)\monolib_filedlg.obj & $(OBJS)\monolib_frame.obj & - $(OBJS)\monolib_gauge95.obj & + $(OBJS)\monolib_gauge.obj & $(OBJS)\monolib_iniconf.obj & $(OBJS)\monolib_listbox.obj & $(OBJS)\monolib_listctrl.obj & @@ -950,16 +950,16 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_radiobox.obj & $(OBJS)\monolib_radiobut.obj & $(OBJS)\monolib_scrolbar.obj & - $(OBJS)\monolib_slider95.obj & + $(OBJS)\monolib_slider.obj & $(OBJS)\monolib_spinbutt.obj & $(OBJS)\monolib_spinctrl.obj & $(OBJS)\monolib_statbmp.obj & $(OBJS)\monolib_statbox.obj & - $(OBJS)\monolib_statbr95.obj & + $(OBJS)\monolib_statusbar.obj & $(OBJS)\monolib_statline.obj & $(OBJS)\monolib_stattext.obj & $(OBJS)\monolib_tabctrl.obj & - $(OBJS)\monolib_tbar95.obj & + $(OBJS)\monolib_toolbar.obj & $(OBJS)\monolib_textctrl.obj & $(OBJS)\monolib_textentry.obj & $(OBJS)\monolib_tglbtn.obj & @@ -1519,7 +1519,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_dragimag.obj & $(OBJS)\coredll_filedlg.obj & $(OBJS)\coredll_frame.obj & - $(OBJS)\coredll_gauge95.obj & + $(OBJS)\coredll_gauge.obj & $(OBJS)\coredll_iniconf.obj & $(OBJS)\coredll_listbox.obj & $(OBJS)\coredll_listctrl.obj & @@ -1536,16 +1536,16 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_radiobox.obj & $(OBJS)\coredll_radiobut.obj & $(OBJS)\coredll_scrolbar.obj & - $(OBJS)\coredll_slider95.obj & + $(OBJS)\coredll_slider.obj & $(OBJS)\coredll_spinbutt.obj & $(OBJS)\coredll_spinctrl.obj & $(OBJS)\coredll_statbmp.obj & $(OBJS)\coredll_statbox.obj & - $(OBJS)\coredll_statbr95.obj & + $(OBJS)\coredll_statusbar.obj & $(OBJS)\coredll_statline.obj & $(OBJS)\coredll_stattext.obj & $(OBJS)\coredll_tabctrl.obj & - $(OBJS)\coredll_tbar95.obj & + $(OBJS)\coredll_toolbar.obj & $(OBJS)\coredll_textctrl.obj & $(OBJS)\coredll_textentry.obj & $(OBJS)\coredll_tglbtn.obj & @@ -1994,7 +1994,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_dragimag.obj & $(OBJS)\corelib_filedlg.obj & $(OBJS)\corelib_frame.obj & - $(OBJS)\corelib_gauge95.obj & + $(OBJS)\corelib_gauge.obj & $(OBJS)\corelib_iniconf.obj & $(OBJS)\corelib_listbox.obj & $(OBJS)\corelib_listctrl.obj & @@ -2011,16 +2011,16 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_radiobox.obj & $(OBJS)\corelib_radiobut.obj & $(OBJS)\corelib_scrolbar.obj & - $(OBJS)\corelib_slider95.obj & + $(OBJS)\corelib_slider.obj & $(OBJS)\corelib_spinbutt.obj & $(OBJS)\corelib_spinctrl.obj & $(OBJS)\corelib_statbmp.obj & $(OBJS)\corelib_statbox.obj & - $(OBJS)\corelib_statbr95.obj & + $(OBJS)\corelib_statusbar.obj & $(OBJS)\corelib_statline.obj & $(OBJS)\corelib_stattext.obj & $(OBJS)\corelib_tabctrl.obj & - $(OBJS)\corelib_tbar95.obj & + $(OBJS)\corelib_toolbar.obj & $(OBJS)\corelib_textctrl.obj & $(OBJS)\corelib_textentry.obj & $(OBJS)\corelib_tglbtn.obj & @@ -5916,9 +5916,6 @@ $(OBJS)\monodll_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(OBJS)\monodll_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_gauge95.obj : .AUTODEPEND ..\..\src\msw\gauge95.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_iniconf.obj : .AUTODEPEND ..\..\src\msw\iniconf.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5946,21 +5943,15 @@ $(OBJS)\monodll_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp $(OBJS)\monodll_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_slider95.obj : .AUTODEPEND ..\..\src\msw\slider95.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_spinctrl.obj : .AUTODEPEND ..\..\src\msw\spinctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_statbr95.obj : .AUTODEPEND ..\..\src\msw\statbr95.cpp +$(OBJS)\monodll_statusbar.obj : .AUTODEPEND ..\..\src\msw\statusbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_tabctrl.obj : .AUTODEPEND ..\..\src\msw\tabctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_tbar95.obj : .AUTODEPEND ..\..\src\msw\tbar95.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_textentry.obj : .AUTODEPEND ..\..\src\msw\textentry.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6000,9 +5991,6 @@ $(OBJS)\monodll_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp $(OBJS)\monodll_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6015,18 +6003,12 @@ $(OBJS)\monodll_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp $(OBJS)\monodll_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6760,6 +6742,20 @@ $(OBJS)\monodll_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\monodll_gauge.obj : .AUTODEPEND ..\..\src\msw\gauge.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\monodll_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monodll_listbox.obj : .AUTODEPEND ..\..\src\msw\listbox.cpp @@ -6858,6 +6854,20 @@ $(OBJS)\monodll_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\monodll_slider.obj : .AUTODEPEND ..\..\src\msw\slider.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\monodll_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monodll_spinbutt.obj : .AUTODEPEND ..\..\src\msw\spinbutt.cpp @@ -6928,6 +6938,20 @@ $(OBJS)\monodll_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\monodll_toolbar.obj : .AUTODEPEND ..\..\src\msw\toolbar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\monodll_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monodll_textctrl.obj : .AUTODEPEND ..\..\src\msw\textctrl.cpp @@ -8127,9 +8151,6 @@ $(OBJS)\monolib_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(OBJS)\monolib_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_gauge95.obj : .AUTODEPEND ..\..\src\msw\gauge95.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_iniconf.obj : .AUTODEPEND ..\..\src\msw\iniconf.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8157,21 +8178,15 @@ $(OBJS)\monolib_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp $(OBJS)\monolib_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_slider95.obj : .AUTODEPEND ..\..\src\msw\slider95.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_spinctrl.obj : .AUTODEPEND ..\..\src\msw\spinctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_statbr95.obj : .AUTODEPEND ..\..\src\msw\statbr95.cpp +$(OBJS)\monolib_statusbar.obj : .AUTODEPEND ..\..\src\msw\statusbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_tabctrl.obj : .AUTODEPEND ..\..\src\msw\tabctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_tbar95.obj : .AUTODEPEND ..\..\src\msw\tbar95.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_textentry.obj : .AUTODEPEND ..\..\src\msw\textentry.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8211,9 +8226,6 @@ $(OBJS)\monolib_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp $(OBJS)\monolib_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8226,18 +8238,12 @@ $(OBJS)\monolib_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp $(OBJS)\monolib_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8971,6 +8977,20 @@ $(OBJS)\monolib_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\monolib_gauge.obj : .AUTODEPEND ..\..\src\msw\gauge.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\monolib_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monolib_listbox.obj : .AUTODEPEND ..\..\src\msw\listbox.cpp @@ -9069,6 +9089,20 @@ $(OBJS)\monolib_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\monolib_slider.obj : .AUTODEPEND ..\..\src\msw\slider.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\monolib_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monolib_spinbutt.obj : .AUTODEPEND ..\..\src\msw\spinbutt.cpp @@ -9139,6 +9173,20 @@ $(OBJS)\monolib_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\monolib_toolbar.obj : .AUTODEPEND ..\..\src\msw\toolbar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\monolib_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monolib_textctrl.obj : .AUTODEPEND ..\..\src\msw\textctrl.cpp @@ -10722,9 +10770,6 @@ $(OBJS)\coredll_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(OBJS)\coredll_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_gauge95.obj : .AUTODEPEND ..\..\src\msw\gauge95.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - $(OBJS)\coredll_iniconf.obj : .AUTODEPEND ..\..\src\msw\iniconf.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -10752,21 +10797,15 @@ $(OBJS)\coredll_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp $(OBJS)\coredll_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_slider95.obj : .AUTODEPEND ..\..\src\msw\slider95.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - $(OBJS)\coredll_spinctrl.obj : .AUTODEPEND ..\..\src\msw\spinctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_statbr95.obj : .AUTODEPEND ..\..\src\msw\statbr95.cpp +$(OBJS)\coredll_statusbar.obj : .AUTODEPEND ..\..\src\msw\statusbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(OBJS)\coredll_tabctrl.obj : .AUTODEPEND ..\..\src\msw\tabctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_tbar95.obj : .AUTODEPEND ..\..\src\msw\tbar95.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - $(OBJS)\coredll_textentry.obj : .AUTODEPEND ..\..\src\msw\textentry.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -10806,9 +10845,6 @@ $(OBJS)\coredll_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp $(OBJS)\coredll_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - $(OBJS)\coredll_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -10821,18 +10857,12 @@ $(OBJS)\coredll_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp $(OBJS)\coredll_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - $(OBJS)\coredll_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(OBJS)\coredll_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - $(OBJS)\coredll_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -11242,6 +11272,20 @@ $(OBJS)\coredll_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\coredll_gauge.obj : .AUTODEPEND ..\..\src\msw\gauge.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\coredll_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\coredll_listbox.obj : .AUTODEPEND ..\..\src\msw\listbox.cpp @@ -11340,6 +11384,20 @@ $(OBJS)\coredll_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\coredll_slider.obj : .AUTODEPEND ..\..\src\msw\slider.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\coredll_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\coredll_spinbutt.obj : .AUTODEPEND ..\..\src\msw\spinbutt.cpp @@ -11410,6 +11468,20 @@ $(OBJS)\coredll_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\coredll_toolbar.obj : .AUTODEPEND ..\..\src\msw\toolbar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\coredll_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\coredll_textctrl.obj : .AUTODEPEND ..\..\src\msw\textctrl.cpp @@ -12136,9 +12208,6 @@ $(OBJS)\corelib_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(OBJS)\corelib_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_gauge95.obj : .AUTODEPEND ..\..\src\msw\gauge95.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - $(OBJS)\corelib_iniconf.obj : .AUTODEPEND ..\..\src\msw\iniconf.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -12166,21 +12235,15 @@ $(OBJS)\corelib_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp $(OBJS)\corelib_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_slider95.obj : .AUTODEPEND ..\..\src\msw\slider95.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - $(OBJS)\corelib_spinctrl.obj : .AUTODEPEND ..\..\src\msw\spinctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_statbr95.obj : .AUTODEPEND ..\..\src\msw\statbr95.cpp +$(OBJS)\corelib_statusbar.obj : .AUTODEPEND ..\..\src\msw\statusbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(OBJS)\corelib_tabctrl.obj : .AUTODEPEND ..\..\src\msw\tabctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_tbar95.obj : .AUTODEPEND ..\..\src\msw\tbar95.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - $(OBJS)\corelib_textentry.obj : .AUTODEPEND ..\..\src\msw\textentry.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -12220,9 +12283,6 @@ $(OBJS)\corelib_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp $(OBJS)\corelib_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - $(OBJS)\corelib_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -12235,18 +12295,12 @@ $(OBJS)\corelib_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp $(OBJS)\corelib_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - $(OBJS)\corelib_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(OBJS)\corelib_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - $(OBJS)\corelib_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -12656,6 +12710,20 @@ $(OBJS)\corelib_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\corelib_gauge.obj : .AUTODEPEND ..\..\src\msw\gauge.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\corelib_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\corelib_listbox.obj : .AUTODEPEND ..\..\src\msw\listbox.cpp @@ -12754,6 +12822,20 @@ $(OBJS)\corelib_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\corelib_slider.obj : .AUTODEPEND ..\..\src\msw\slider.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\corelib_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\corelib_spinbutt.obj : .AUTODEPEND ..\..\src\msw\spinbutt.cpp @@ -12824,6 +12906,20 @@ $(OBJS)\corelib_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp !endif !endif +!ifeq USE_GUI 1 +!ifeq WXUNIV 0 +$(OBJS)\corelib_toolbar.obj : .AUTODEPEND ..\..\src\msw\toolbar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif +!endif + +!ifeq USE_GUI 1 +!ifeq WXUNIV 1 +$(OBJS)\corelib_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\corelib_textctrl.obj : .AUTODEPEND ..\..\src\msw\textctrl.cpp diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index af4ace255a..7b12b93c4e 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -1388,7 +1388,7 @@ SOURCE=..\..\src\msw\frame.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\gauge95.cpp +SOURCE=..\..\src\msw\gauge.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2028,7 +2028,7 @@ SOURCE=..\..\src\msw\settings.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\slider95.cpp +SOURCE=..\..\src\msw\slider.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2203,7 +2203,7 @@ SOURCE=..\..\src\msw\statbox.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\statbr95.cpp +SOURCE=..\..\src\msw\statline.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2238,7 +2238,7 @@ SOURCE=..\..\src\msw\statbr95.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\statline.cpp +SOURCE=..\..\src\msw\stattext.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2273,7 +2273,7 @@ SOURCE=..\..\src\msw\statline.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\stattext.cpp +SOURCE=..\..\src\msw\statusbar.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2343,7 +2343,7 @@ SOURCE=..\..\src\msw\tabctrl.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\tbar95.cpp +SOURCE=..\..\src\msw\textctrl.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2378,7 +2378,7 @@ SOURCE=..\..\src\msw\tbar95.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\textctrl.cpp +SOURCE=..\..\src\msw\textentry.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2413,7 +2413,7 @@ SOURCE=..\..\src\msw\textctrl.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\textentry.cpp +SOURCE=..\..\src\msw\tglbtn.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2448,7 +2448,7 @@ SOURCE=..\..\src\msw\textentry.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\tglbtn.cpp +SOURCE=..\..\src\msw\toolbar.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -4828,7 +4828,7 @@ SOURCE=..\..\include\wx\msw\frame.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\gauge95.h +SOURCE=..\..\include\wx\msw\gauge.h # End Source File # Begin Source File @@ -5055,7 +5055,7 @@ SOURCE=..\..\include\wx\msw\setup0.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\slider95.h +SOURCE=..\..\include\wx\msw\slider.h # End Source File # Begin Source File @@ -5079,10 +5079,6 @@ SOURCE=..\..\include\wx\msw\statbox.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\statbr95.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\msw\statline.h # End Source File # Begin Source File @@ -5091,15 +5087,15 @@ SOURCE=..\..\include\wx\msw\stattext.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\tabctrl.h +SOURCE=..\..\include\wx\msw\statusbar.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\taskbar.h +SOURCE=..\..\include\wx\msw\tabctrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\tbar95.h +SOURCE=..\..\include\wx\msw\taskbar.h # End Source File # Begin Source File @@ -5115,6 +5111,10 @@ SOURCE=..\..\include\wx\msw\tglbtn.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\toolbar.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\tooltip.h # End Source File # Begin Source File diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index 25241e418a..5b97a3ea31 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -1162,7 +1162,7 @@ ExcludedFromBuild="true"/> + RelativePath="..\..\src\msw\gauge.cpp"> @@ -1442,7 +1442,7 @@ + RelativePath="..\..\src\msw\slider.cpp"> @@ -1517,7 +1517,7 @@ ExcludedFromBuild="true"/> + RelativePath="..\..\src\msw\statline.cpp"> @@ -1532,7 +1532,7 @@ ExcludedFromBuild="true"/> + RelativePath="..\..\src\msw\stattext.cpp"> @@ -1547,7 +1547,7 @@ ExcludedFromBuild="true"/> + RelativePath="..\..\src\msw\statusbar.cpp"> @@ -1577,7 +1577,7 @@ ExcludedFromBuild="true"/> + RelativePath="..\..\src\msw\textctrl.cpp"> @@ -1592,7 +1592,7 @@ ExcludedFromBuild="true"/> + RelativePath="..\..\src\msw\textentry.cpp"> @@ -1607,7 +1607,7 @@ ExcludedFromBuild="true"/> + RelativePath="..\..\src\msw\tglbtn.cpp"> @@ -1622,7 +1622,7 @@ ExcludedFromBuild="true"/> + RelativePath="..\..\src\msw\toolbar.cpp"> @@ -2708,7 +2708,7 @@ + RelativePath="..\..\include\wx\msw\gauge.h"/> + RelativePath="..\..\include\wx\msw\slider.h"/> - + - + = 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__))) - #include "wx/msw/tbar95.h" + #include "wx/msw/toolbar.h" #elif defined(__WXWINCE__) #include "wx/msw/wince/tbarwce.h" #elif defined(__WXMOTIF__) diff --git a/src/msw/gauge95.cpp b/src/msw/gauge.cpp similarity index 86% rename from src/msw/gauge95.cpp rename to src/msw/gauge.cpp index 6f8d8724e4..9a26e9b592 100644 --- a/src/msw/gauge95.cpp +++ b/src/msw/gauge.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/msw/gauge95.cpp -// Purpose: wxGauge95 class +// Purpose: wxGauge class // Author: Julian Smart // Modified by: // Created: 01/02/97 @@ -111,7 +111,7 @@ wxEND_FLAGS( wxGaugeStyle ) IMPLEMENT_DYNAMIC_CLASS_XTI(wxGauge, wxControl,"wx/gauge.h") -wxBEGIN_PROPERTIES_TABLE(wxGauge95) +wxBEGIN_PROPERTIES_TABLE(wxGauge) wxPROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) wxPROPERTY( Range , int , SetRange, GetRange, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) wxPROPERTY( ShadowWidth , int , SetShadowWidth, GetShadowWidth, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) @@ -119,30 +119,30 @@ wxBEGIN_PROPERTIES_TABLE(wxGauge95) wxPROPERTY_FLAGS( WindowStyle , wxGaugeStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style wxEND_PROPERTIES_TABLE() -wxBEGIN_HANDLERS_TABLE(wxGauge95) +wxBEGIN_HANDLERS_TABLE(wxGauge) wxEND_HANDLERS_TABLE() -wxCONSTRUCTOR_6( wxGauge95 , wxWindow* , Parent , wxWindowID , Id , int , Range , wxPoint , Position , wxSize , Size , long , WindowStyle ) +wxCONSTRUCTOR_6( wxGauge , wxWindow* , Parent , wxWindowID , Id , int , Range , wxPoint , Position , wxSize , Size , long , WindowStyle ) #else -IMPLEMENT_DYNAMIC_CLASS(wxGauge95, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) #endif // ============================================================================ -// wxGauge95 implementation +// wxGauge implementation // ============================================================================ // ---------------------------------------------------------------------------- -// wxGauge95 creation +// wxGauge creation // ---------------------------------------------------------------------------- -bool wxGauge95::Create(wxWindow *parent, - wxWindowID id, - int range, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) +bool wxGauge::Create(wxWindow *parent, + wxWindowID id, + int range, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) { if ( !CreateControl(parent, id, pos, size, style, validator, name) ) return false; @@ -158,7 +158,7 @@ bool wxGauge95::Create(wxWindow *parent, return true; } -WXDWORD wxGauge95::MSWGetStyle(long style, WXDWORD *exstyle) const +WXDWORD wxGauge::MSWGetStyle(long style, WXDWORD *exstyle) const { WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle); @@ -172,10 +172,10 @@ WXDWORD wxGauge95::MSWGetStyle(long style, WXDWORD *exstyle) const } // ---------------------------------------------------------------------------- -// wxGauge95 geometry +// wxGauge geometry // ---------------------------------------------------------------------------- -wxSize wxGauge95::DoGetBestSize() const +wxSize wxGauge::DoGetBestSize() const { // VZ: no idea where does 28 come from, it was there before my changes and // as nobody ever complained I guess we can leave it... @@ -186,10 +186,10 @@ wxSize wxGauge95::DoGetBestSize() const } // ---------------------------------------------------------------------------- -// wxGauge95 setters +// wxGauge setters // ---------------------------------------------------------------------------- -void wxGauge95::SetRange(int r) +void wxGauge::SetRange(int r) { // switch to determinate mode if required SetDeterminateMode(); @@ -204,7 +204,7 @@ void wxGauge95::SetRange(int r) #endif // PBM_SETRANGE32/!PBM_SETRANGE32 } -void wxGauge95::SetValue(int pos) +void wxGauge::SetValue(int pos) { // switch to determinate mode if required SetDeterminateMode(); @@ -214,7 +214,7 @@ void wxGauge95::SetValue(int pos) ::SendMessage(GetHwnd(), PBM_SETPOS, pos, 0); } -bool wxGauge95::SetForegroundColour(const wxColour& col) +bool wxGauge::SetForegroundColour(const wxColour& col) { if ( !wxControl::SetForegroundColour(col) ) return false; @@ -224,7 +224,7 @@ bool wxGauge95::SetForegroundColour(const wxColour& col) return true; } -bool wxGauge95::SetBackgroundColour(const wxColour& col) +bool wxGauge::SetBackgroundColour(const wxColour& col) { if ( !wxControl::SetBackgroundColour(col) ) return false; @@ -234,7 +234,7 @@ bool wxGauge95::SetBackgroundColour(const wxColour& col) return true; } -void wxGauge95::SetIndeterminateMode() +void wxGauge::SetIndeterminateMode() { // add the PBS_MARQUEE style to the progress bar LONG style = ::GetWindowLong(GetHwnd(), GWL_STYLE); @@ -244,7 +244,7 @@ void wxGauge95::SetIndeterminateMode() // now the control can only run in indeterminate mode } -void wxGauge95::SetDeterminateMode() +void wxGauge::SetDeterminateMode() { // remove the PBS_MARQUEE style to the progress bar LONG style = ::GetWindowLong(GetHwnd(), GWL_STYLE); @@ -254,7 +254,7 @@ void wxGauge95::SetDeterminateMode() // now the control can only run in determinate mode } -void wxGauge95::Pulse() +void wxGauge::Pulse() { if (wxApp::GetComCtl32Version() >= 600) { diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index f641e35638..4dd4bcc41c 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -44,10 +44,6 @@ #include "wx/stockitem.h" #include "wx/msw/private.h" -#if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR - #include "wx/msw/statbr95.h" -#endif - #include // --------------------------------------------------------------------------- diff --git a/src/msw/slider95.cpp b/src/msw/slider.cpp similarity index 100% rename from src/msw/slider95.cpp rename to src/msw/slider.cpp diff --git a/src/msw/statbr95.cpp b/src/msw/statusbar.cpp similarity index 91% rename from src/msw/statbr95.cpp rename to src/msw/statusbar.cpp index d7f26724f6..aef8e5c567 100644 --- a/src/msw/statbr95.cpp +++ b/src/msw/statusbar.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: src/msw/statbr95.cpp +// Name: src/msw/statusbar.cpp // Purpose: native implementation of wxStatusBar // Author: Vadim Zeitlin // Modified by: @@ -51,20 +51,20 @@ // ============================================================================ // ---------------------------------------------------------------------------- -// wxStatusBar95 class +// wxStatusBar class // ---------------------------------------------------------------------------- -wxStatusBar95::wxStatusBar95() +wxStatusBar::wxStatusBar() { SetParent(NULL); m_hWnd = 0; m_windowId = 0; } -bool wxStatusBar95::Create(wxWindow *parent, - wxWindowID id, - long style, - const wxString& name) +bool wxStatusBar::Create(wxWindow *parent, + wxWindowID id, + long style, + const wxString& name) { wxCHECK_MSG( parent, false, wxT("status bar must have a parent") ); @@ -134,7 +134,7 @@ bool wxStatusBar95::Create(wxWindow *parent, return true; } -wxStatusBar95::~wxStatusBar95() +wxStatusBar::~wxStatusBar() { // we must refresh the frame size when the statusbar is deleted but the // frame is not - otherwise statusbar leaves a hole in the place it used to @@ -146,7 +146,7 @@ wxStatusBar95::~wxStatusBar95() } } -void wxStatusBar95::SetFieldsCount(int nFields, const int *widths) +void wxStatusBar::SetFieldsCount(int nFields, const int *widths) { // this is a Windows limitation wxASSERT_MSG( (nFields > 0) && (nFields < 255), _T("too many fields") ); @@ -156,14 +156,14 @@ void wxStatusBar95::SetFieldsCount(int nFields, const int *widths) SetFieldsWidth(); } -void wxStatusBar95::SetStatusWidths(int n, const int widths[]) +void wxStatusBar::SetStatusWidths(int n, const int widths[]) { wxStatusBarBase::SetStatusWidths(n, widths); SetFieldsWidth(); } -void wxStatusBar95::SetFieldsWidth() +void wxStatusBar::SetFieldsWidth() { if ( !m_nFields ) return; @@ -191,7 +191,7 @@ void wxStatusBar95::SetFieldsWidth() delete [] pWidths; } -void wxStatusBar95::SetStatusText(const wxString& strText, int nField) +void wxStatusBar::SetStatusText(const wxString& strText, int nField) { wxCHECK_RET( (nField >= 0) && (nField < m_nFields), _T("invalid statusbar field index") ); @@ -231,7 +231,7 @@ void wxStatusBar95::SetStatusText(const wxString& strText, int nField) } } -wxString wxStatusBar95::GetStatusText(int nField) const +wxString wxStatusBar::GetStatusText(int nField) const { wxCHECK_MSG( (nField >= 0) && (nField < m_nFields), wxEmptyString, _T("invalid statusbar field index") ); @@ -246,7 +246,7 @@ wxString wxStatusBar95::GetStatusText(int nField) const return str; } -int wxStatusBar95::GetBorderX() const +int wxStatusBar::GetBorderX() const { int aBorders[3]; SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)aBorders); @@ -254,7 +254,7 @@ int wxStatusBar95::GetBorderX() const return aBorders[0]; } -int wxStatusBar95::GetBorderY() const +int wxStatusBar::GetBorderY() const { int aBorders[3]; SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)aBorders); @@ -262,7 +262,7 @@ int wxStatusBar95::GetBorderY() const return aBorders[1]; } -void wxStatusBar95::SetMinHeight(int height) +void wxStatusBar::SetMinHeight(int height) { SendMessage(GetHwnd(), SB_SETMINHEIGHT, height + 2*GetBorderY(), 0); @@ -270,7 +270,7 @@ void wxStatusBar95::SetMinHeight(int height) SendMessage(GetHwnd(), WM_SIZE, 0, 0); } -bool wxStatusBar95::GetFieldRect(int i, wxRect& rect) const +bool wxStatusBar::GetFieldRect(int i, wxRect& rect) const { wxCHECK_MSG( (i >= 0) && (i < m_nFields), false, _T("invalid statusbar field index") ); @@ -282,7 +282,7 @@ bool wxStatusBar95::GetFieldRect(int i, wxRect& rect) const } #if wxUSE_UXTHEME - wxUxThemeHandle theme((wxStatusBar95 *)this, L"Status"); // const_cast + wxUxThemeHandle theme((wxStatusBar *)this, L"Status"); // const_cast if ( theme ) { // by default Windows has a 2 pixel border to the right of the left @@ -306,7 +306,7 @@ bool wxStatusBar95::GetFieldRect(int i, wxRect& rect) const // no idea for a default width, just choose something #define DEFAULT_FIELD_WIDTH 25 -wxSize wxStatusBar95::DoGetBestSize() const +wxSize wxStatusBar::DoGetBestSize() const { int borders[3]; SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)borders); @@ -350,7 +350,7 @@ wxSize wxStatusBar95::DoGetBestSize() const return best; } -void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height) +void wxStatusBar::DoMoveWindow(int x, int y, int width, int height) { if ( GetParent()->IsSizeDeferred() ) { @@ -384,7 +384,7 @@ void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height) } } -void wxStatusBar95::SetStatusStyles(int n, const int styles[]) +void wxStatusBar::SetStatusStyles(int n, const int styles[]) { wxStatusBarBase::SetStatusStyles(n, styles); @@ -419,7 +419,7 @@ void wxStatusBar95::SetStatusStyles(int n, const int styles[]) } WXLRESULT -wxStatusBar95::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +wxStatusBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { #ifndef __WXWINCE__ if ( nMsg == WM_WINDOWPOSCHANGING ) diff --git a/src/msw/tbar95.cpp b/src/msw/toolbar.cpp similarity index 99% rename from src/msw/tbar95.cpp rename to src/msw/toolbar.cpp index 16ebe1ffc1..3bfec13c64 100644 --- a/src/msw/tbar95.cpp +++ b/src/msw/toolbar.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/msw/tbar95.cpp +// Name: src/msw/toolbar.cpp // Purpose: wxToolBar // Author: Julian Smart // Modified by: -- 2.45.2