From 6e793355df5d95814df489217dbf7fb6212391ae Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 31 Mar 2011 09:28:47 +0000 Subject: [PATCH] Add wx/msw/panel.h to the list of wxMSW headers in bakefile. Also move src/msw/panel.cpp to the list of normal wxMSW sources from the list of low-level ones as it's not needed by wxUniv. Closes #13103. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 74 ++++---- build/bakefiles/files.bkl | 3 +- build/msw/makefile.bcc | 356 +++++++++++++++++------------------ build/msw/makefile.gcc | 340 ++++++++++++++++----------------- build/msw/makefile.vc | 356 +++++++++++++++++------------------ build/msw/makefile.wat | 340 ++++++++++++++++----------------- build/msw/wx_core.dsp | 75 ++++++-- build/msw/wx_vc7_core.vcproj | 45 +++-- build/msw/wx_vc8_core.vcproj | 60 ++++-- build/msw/wx_vc9_core.vcproj | 60 ++++-- 10 files changed, 873 insertions(+), 836 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7b224da449..0b3fa1f3f3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2989,6 +2989,7 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/ole/oleutils.h \ wx/msw/ownerdrw.h \ wx/msw/palette.h \ + wx/msw/panel.h \ wx/msw/pen.h \ wx/msw/printdlg.h \ wx/msw/printwin.h \ @@ -3513,6 +3514,7 @@ COND_TOOLKIT_WINCE_GUI_HDR = \ wx/msw/ole/oleutils.h \ wx/msw/ownerdrw.h \ wx/msw/palette.h \ + wx/msw/panel.h \ wx/msw/pen.h \ wx/msw/printdlg.h \ wx/msw/printwin.h \ @@ -5049,7 +5051,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ monodll_droptgt.o \ monodll_oleutils.o \ monodll_msw_palette.o \ - monodll_msw_panel.o \ monodll_msw_pen.o \ monodll_msw_popupwin.o \ monodll_msw_printdlg.o \ @@ -5109,7 +5110,6 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS = \ monodll_droptgt.o \ monodll_oleutils.o \ monodll_msw_palette.o \ - monodll_msw_panel.o \ monodll_msw_pen.o \ monodll_msw_popupwin.o \ monodll_msw_printdlg.o \ @@ -5460,6 +5460,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_msw_notebook.o \ monodll_access.o \ monodll_msw_ownerdrw.o \ + monodll_msw_panel.o \ monodll_progdlg.o \ monodll_msw_radiobox.o \ monodll_msw_radiobut.o \ @@ -5694,6 +5695,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \ monodll_msw_notebook.o \ monodll_access.o \ monodll_msw_ownerdrw.o \ + monodll_msw_panel.o \ monodll_progdlg.o \ monodll_msw_radiobox.o \ monodll_msw_radiobut.o \ @@ -5923,7 +5925,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_droptgt.o \ monodll_oleutils.o \ monodll_msw_palette.o \ - monodll_msw_panel.o \ monodll_msw_pen.o \ monodll_msw_popupwin.o \ monodll_msw_printdlg.o \ @@ -5983,7 +5984,6 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_droptgt.o \ monodll_oleutils.o \ monodll_msw_palette.o \ - monodll_msw_panel.o \ monodll_msw_pen.o \ monodll_msw_popupwin.o \ monodll_msw_printdlg.o \ @@ -6971,7 +6971,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_droptgt.o \ monolib_oleutils.o \ monolib_msw_palette.o \ - monolib_msw_panel.o \ monolib_msw_pen.o \ monolib_msw_popupwin.o \ monolib_msw_printdlg.o \ @@ -7031,7 +7030,6 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_droptgt.o \ monolib_oleutils.o \ monolib_msw_palette.o \ - monolib_msw_panel.o \ monolib_msw_pen.o \ monolib_msw_popupwin.o \ monolib_msw_printdlg.o \ @@ -7382,6 +7380,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_msw_notebook.o \ monolib_access.o \ monolib_msw_ownerdrw.o \ + monolib_msw_panel.o \ monolib_progdlg.o \ monolib_msw_radiobox.o \ monolib_msw_radiobut.o \ @@ -7616,6 +7615,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \ monolib_msw_notebook.o \ monolib_access.o \ monolib_msw_ownerdrw.o \ + monolib_msw_panel.o \ monolib_progdlg.o \ monolib_msw_radiobox.o \ monolib_msw_radiobut.o \ @@ -7845,7 +7845,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_droptgt.o \ monolib_oleutils.o \ monolib_msw_palette.o \ - monolib_msw_panel.o \ monolib_msw_pen.o \ monolib_msw_popupwin.o \ monolib_msw_printdlg.o \ @@ -7905,7 +7904,6 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_droptgt.o \ monolib_oleutils.o \ monolib_msw_palette.o \ - monolib_msw_panel.o \ monolib_msw_pen.o \ monolib_msw_popupwin.o \ monolib_msw_printdlg.o \ @@ -9077,7 +9075,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_droptgt.o \ coredll_oleutils.o \ coredll_msw_palette.o \ - coredll_panel.o \ coredll_msw_pen.o \ coredll_msw_popupwin.o \ coredll_msw_printdlg.o \ @@ -9137,7 +9134,6 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_droptgt.o \ coredll_oleutils.o \ coredll_msw_palette.o \ - coredll_panel.o \ coredll_msw_pen.o \ coredll_msw_popupwin.o \ coredll_msw_printdlg.o \ @@ -9488,6 +9484,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_msw_notebook.o \ coredll_access.o \ coredll_msw_ownerdrw.o \ + coredll_panel.o \ coredll_progdlg.o \ coredll_msw_radiobox.o \ coredll_msw_radiobut.o \ @@ -9722,6 +9719,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \ coredll_msw_notebook.o \ coredll_access.o \ coredll_msw_ownerdrw.o \ + coredll_panel.o \ coredll_progdlg.o \ coredll_msw_radiobox.o \ coredll_msw_radiobut.o \ @@ -9951,7 +9949,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_droptgt.o \ coredll_oleutils.o \ coredll_msw_palette.o \ - coredll_panel.o \ coredll_msw_pen.o \ coredll_msw_popupwin.o \ coredll_msw_printdlg.o \ @@ -10011,7 +10008,6 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_droptgt.o \ coredll_oleutils.o \ coredll_msw_palette.o \ - coredll_panel.o \ coredll_msw_pen.o \ coredll_msw_popupwin.o \ coredll_msw_printdlg.o \ @@ -10661,7 +10657,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_droptgt.o \ corelib_oleutils.o \ corelib_msw_palette.o \ - corelib_panel.o \ corelib_msw_pen.o \ corelib_msw_popupwin.o \ corelib_msw_printdlg.o \ @@ -10721,7 +10716,6 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_droptgt.o \ corelib_oleutils.o \ corelib_msw_palette.o \ - corelib_panel.o \ corelib_msw_pen.o \ corelib_msw_popupwin.o \ corelib_msw_printdlg.o \ @@ -11072,6 +11066,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_msw_notebook.o \ corelib_access.o \ corelib_msw_ownerdrw.o \ + corelib_panel.o \ corelib_progdlg.o \ corelib_msw_radiobox.o \ corelib_msw_radiobut.o \ @@ -11306,6 +11301,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \ corelib_msw_notebook.o \ corelib_access.o \ corelib_msw_ownerdrw.o \ + corelib_panel.o \ corelib_progdlg.o \ corelib_msw_radiobox.o \ corelib_msw_radiobut.o \ @@ -11535,7 +11531,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_droptgt.o \ corelib_oleutils.o \ corelib_msw_palette.o \ - corelib_panel.o \ corelib_msw_pen.o \ corelib_msw_popupwin.o \ corelib_msw_printdlg.o \ @@ -11595,7 +11590,6 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_droptgt.o \ corelib_oleutils.o \ corelib_msw_palette.o \ - corelib_panel.o \ corelib_msw_pen.o \ corelib_msw_popupwin.o \ corelib_msw_printdlg.o \ @@ -18087,12 +18081,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_panel.o: $(srcdir)/src/msw/panel.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/panel.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_panel.o: $(srcdir)/src/msw/panel.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/panel.cpp - @COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp @@ -19143,6 +19131,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_panel.o: $(srcdir)/src/msw/panel.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/panel.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_panel.o: $(srcdir)/src/msw/panel.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/panel.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_progdlg.o: $(srcdir)/src/msw/progdlg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/progdlg.cpp @@ -23382,12 +23376,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_panel.o: $(srcdir)/src/msw/panel.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/panel.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_panel.o: $(srcdir)/src/msw/panel.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/panel.cpp - @COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp @@ -24438,6 +24426,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_panel.o: $(srcdir)/src/msw/panel.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/panel.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_panel.o: $(srcdir)/src/msw/panel.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/panel.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_progdlg.o: $(srcdir)/src/msw/progdlg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/progdlg.cpp @@ -28857,12 +28851,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@coredll_panel.o: $(srcdir)/src/msw/panel.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/panel.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_panel.o: $(srcdir)/src/msw/panel.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/panel.cpp - @COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp @@ -29913,6 +29901,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_panel.o: $(srcdir)/src/msw/panel.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/panel.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_panel.o: $(srcdir)/src/msw/panel.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/panel.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_progdlg.o: $(srcdir)/src/msw/progdlg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/progdlg.cpp @@ -32835,12 +32829,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@corelib_panel.o: $(srcdir)/src/msw/panel.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/panel.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_panel.o: $(srcdir)/src/msw/panel.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/panel.cpp - @COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp @@ -33891,6 +33879,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_panel.o: $(srcdir)/src/msw/panel.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/panel.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_panel.o: $(srcdir)/src/msw/panel.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/panel.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_progdlg.o: $(srcdir)/src/msw/progdlg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/progdlg.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 2f8bc727a1..7f7e571009 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -1681,7 +1681,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/ole/droptgt.cpp src/msw/ole/oleutils.cpp src/msw/palette.cpp - src/msw/panel.cpp src/msw/pen.cpp src/msw/popupwin.cpp src/msw/printdlg.cpp @@ -1753,6 +1752,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/notebook.cpp src/msw/ole/access.cpp src/msw/ownerdrw.cpp + src/msw/panel.cpp src/msw/progdlg.cpp src/msw/radiobox.cpp src/msw/radiobut.cpp @@ -1834,6 +1834,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/msw/ole/oleutils.h wx/msw/ownerdrw.h wx/msw/palette.h + wx/msw/panel.h wx/msw/pen.h wx/msw/printdlg.h wx/msw/printwin.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 6ff6d5b451..17575beec3 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1662,7 +1662,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_ribbon_control.obj \ $(OBJS)\monodll_gallery.obj \ $(OBJS)\monodll_page.obj \ - $(OBJS)\monodll_ribbon_panel.obj \ + $(OBJS)\monodll_ribbon_panel.obj \ $(OBJS)\monodll_ribbon_toolbar.obj \ $(OBJS)\monodll_richtextctrl.obj \ $(OBJS)\monodll_richtextbuffer.obj \ @@ -1713,7 +1713,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_droptgt.obj \ $(OBJS)\monodll_oleutils.obj \ $(OBJS)\monodll_palette.obj \ - $(OBJS)\monodll_msw_panel.obj \ $(OBJS)\monodll_pen.obj \ $(OBJS)\monodll_popupwin.obj \ $(OBJS)\monodll_printdlg.obj \ @@ -1723,7 +1722,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_settings.obj \ $(OBJS)\monodll_tooltip.obj \ $(OBJS)\monodll_toplevel.obj \ - $(OBJS)\monodll_uiaction.obj \ + $(OBJS)\monodll_uiaction.obj \ $(OBJS)\monodll_utilsgui.obj \ $(OBJS)\monodll_uxtheme.obj \ $(OBJS)\monodll_window.obj \ @@ -1767,6 +1766,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_msw_notebook.obj \ $(OBJS)\monodll_access.obj \ $(OBJS)\monodll_ownerdrw.obj \ + $(OBJS)\monodll_msw_panel.obj \ $(OBJS)\monodll_progdlg.obj \ $(OBJS)\monodll_msw_radiobox.obj \ $(OBJS)\monodll_msw_radiobut.obj \ @@ -1866,7 +1866,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_layout.obj \ $(OBJS)\monodll_lboxcmn.obj \ $(OBJS)\monodll_listctrlcmn.obj \ - $(OBJS)\monodll_markupparser.obj \ + $(OBJS)\monodll_markupparser.obj \ $(OBJS)\monodll_matrix.obj \ $(OBJS)\monodll_menucmn.obj \ $(OBJS)\monodll_mousemanager.obj \ @@ -1925,13 +1925,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_infobar.obj \ $(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_logg.obj \ - $(OBJS)\monodll_markuptext.obj \ - $(OBJS)\monodll_msgdlgg.obj \ - $(OBJS)\monodll_numdlgg.obj \ - $(OBJS)\monodll_panelg.obj \ - $(OBJS)\monodll_progdlgg.obj \ - $(OBJS)\monodll_printps.obj \ - $(OBJS)\monodll_renderg.obj \ + $(OBJS)\monodll_markuptext.obj \ + $(OBJS)\monodll_msgdlgg.obj \ + $(OBJS)\monodll_numdlgg.obj \ + $(OBJS)\monodll_panelg.obj \ + $(OBJS)\monodll_progdlgg.obj \ + $(OBJS)\monodll_printps.obj \ + $(OBJS)\monodll_renderg.obj \ $(OBJS)\monodll_richmsgdlgg.obj \ $(OBJS)\monodll_scrlwing.obj \ $(OBJS)\monodll_selstore.obj \ @@ -1983,7 +1983,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_droptgt.obj \ $(OBJS)\monodll_oleutils.obj \ $(OBJS)\monodll_palette.obj \ - $(OBJS)\monodll_msw_panel.obj \ $(OBJS)\monodll_pen.obj \ $(OBJS)\monodll_popupwin.obj \ $(OBJS)\monodll_printdlg.obj \ @@ -1993,7 +1992,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_settings.obj \ $(OBJS)\monodll_tooltip.obj \ $(OBJS)\monodll_toplevel.obj \ - $(OBJS)\monodll_uiaction.obj \ + $(OBJS)\monodll_uiaction.obj \ $(OBJS)\monodll_utilsgui.obj \ $(OBJS)\monodll_uxtheme.obj \ $(OBJS)\monodll_window.obj \ @@ -2132,7 +2131,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_layout.obj \ $(OBJS)\monodll_lboxcmn.obj \ $(OBJS)\monodll_listctrlcmn.obj \ - $(OBJS)\monodll_markupparser.obj \ + $(OBJS)\monodll_markupparser.obj \ $(OBJS)\monodll_matrix.obj \ $(OBJS)\monodll_menucmn.obj \ $(OBJS)\monodll_mousemanager.obj \ @@ -2191,13 +2190,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_infobar.obj \ $(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_logg.obj \ - $(OBJS)\monodll_markuptext.obj \ - $(OBJS)\monodll_msgdlgg.obj \ - $(OBJS)\monodll_numdlgg.obj \ - $(OBJS)\monodll_panelg.obj \ - $(OBJS)\monodll_progdlgg.obj \ - $(OBJS)\monodll_printps.obj \ - $(OBJS)\monodll_renderg.obj \ + $(OBJS)\monodll_markuptext.obj \ + $(OBJS)\monodll_msgdlgg.obj \ + $(OBJS)\monodll_numdlgg.obj \ + $(OBJS)\monodll_panelg.obj \ + $(OBJS)\monodll_progdlgg.obj \ + $(OBJS)\monodll_printps.obj \ + $(OBJS)\monodll_renderg.obj \ $(OBJS)\monodll_richmsgdlgg.obj \ $(OBJS)\monodll_scrlwing.obj \ $(OBJS)\monodll_selstore.obj \ @@ -2425,7 +2424,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_ribbon_control.obj \ $(OBJS)\monolib_gallery.obj \ $(OBJS)\monolib_page.obj \ - $(OBJS)\monolib_ribbon_panel.obj \ + $(OBJS)\monolib_ribbon_panel.obj \ $(OBJS)\monolib_ribbon_toolbar.obj \ $(OBJS)\monolib_richtextctrl.obj \ $(OBJS)\monolib_richtextbuffer.obj \ @@ -2476,7 +2475,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_droptgt.obj \ $(OBJS)\monolib_oleutils.obj \ $(OBJS)\monolib_palette.obj \ - $(OBJS)\monolib_msw_panel.obj \ $(OBJS)\monolib_pen.obj \ $(OBJS)\monolib_popupwin.obj \ $(OBJS)\monolib_printdlg.obj \ @@ -2486,7 +2484,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_settings.obj \ $(OBJS)\monolib_tooltip.obj \ $(OBJS)\monolib_toplevel.obj \ - $(OBJS)\monolib_uiaction.obj \ + $(OBJS)\monolib_uiaction.obj \ $(OBJS)\monolib_utilsgui.obj \ $(OBJS)\monolib_uxtheme.obj \ $(OBJS)\monolib_window.obj \ @@ -2530,6 +2528,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_msw_notebook.obj \ $(OBJS)\monolib_access.obj \ $(OBJS)\monolib_ownerdrw.obj \ + $(OBJS)\monolib_msw_panel.obj \ $(OBJS)\monolib_progdlg.obj \ $(OBJS)\monolib_msw_radiobox.obj \ $(OBJS)\monolib_msw_radiobut.obj \ @@ -2629,7 +2628,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_layout.obj \ $(OBJS)\monolib_lboxcmn.obj \ $(OBJS)\monolib_listctrlcmn.obj \ - $(OBJS)\monolib_markupparser.obj \ + $(OBJS)\monolib_markupparser.obj \ $(OBJS)\monolib_matrix.obj \ $(OBJS)\monolib_menucmn.obj \ $(OBJS)\monolib_mousemanager.obj \ @@ -2688,13 +2687,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_infobar.obj \ $(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_logg.obj \ - $(OBJS)\monolib_markuptext.obj \ - $(OBJS)\monolib_msgdlgg.obj \ - $(OBJS)\monolib_numdlgg.obj \ - $(OBJS)\monolib_panelg.obj \ - $(OBJS)\monolib_progdlgg.obj \ - $(OBJS)\monolib_printps.obj \ - $(OBJS)\monolib_renderg.obj \ + $(OBJS)\monolib_markuptext.obj \ + $(OBJS)\monolib_msgdlgg.obj \ + $(OBJS)\monolib_numdlgg.obj \ + $(OBJS)\monolib_panelg.obj \ + $(OBJS)\monolib_progdlgg.obj \ + $(OBJS)\monolib_printps.obj \ + $(OBJS)\monolib_renderg.obj \ $(OBJS)\monolib_richmsgdlgg.obj \ $(OBJS)\monolib_scrlwing.obj \ $(OBJS)\monolib_selstore.obj \ @@ -2746,7 +2745,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_droptgt.obj \ $(OBJS)\monolib_oleutils.obj \ $(OBJS)\monolib_palette.obj \ - $(OBJS)\monolib_msw_panel.obj \ $(OBJS)\monolib_pen.obj \ $(OBJS)\monolib_popupwin.obj \ $(OBJS)\monolib_printdlg.obj \ @@ -2756,7 +2754,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_settings.obj \ $(OBJS)\monolib_tooltip.obj \ $(OBJS)\monolib_toplevel.obj \ - $(OBJS)\monolib_uiaction.obj \ + $(OBJS)\monolib_uiaction.obj \ $(OBJS)\monolib_utilsgui.obj \ $(OBJS)\monolib_uxtheme.obj \ $(OBJS)\monolib_window.obj \ @@ -2895,7 +2893,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_layout.obj \ $(OBJS)\monolib_lboxcmn.obj \ $(OBJS)\monolib_listctrlcmn.obj \ - $(OBJS)\monolib_markupparser.obj \ + $(OBJS)\monolib_markupparser.obj \ $(OBJS)\monolib_matrix.obj \ $(OBJS)\monolib_menucmn.obj \ $(OBJS)\monolib_mousemanager.obj \ @@ -2954,13 +2952,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_infobar.obj \ $(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_logg.obj \ - $(OBJS)\monolib_markuptext.obj \ - $(OBJS)\monolib_msgdlgg.obj \ - $(OBJS)\monolib_numdlgg.obj \ - $(OBJS)\monolib_panelg.obj \ - $(OBJS)\monolib_progdlgg.obj \ - $(OBJS)\monolib_printps.obj \ - $(OBJS)\monolib_renderg.obj \ + $(OBJS)\monolib_markuptext.obj \ + $(OBJS)\monolib_msgdlgg.obj \ + $(OBJS)\monolib_numdlgg.obj \ + $(OBJS)\monolib_panelg.obj \ + $(OBJS)\monolib_progdlgg.obj \ + $(OBJS)\monolib_printps.obj \ + $(OBJS)\monolib_renderg.obj \ $(OBJS)\monolib_richmsgdlgg.obj \ $(OBJS)\monolib_scrlwing.obj \ $(OBJS)\monolib_selstore.obj \ @@ -3127,7 +3125,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_droptgt.obj \ $(OBJS)\coredll_oleutils.obj \ $(OBJS)\coredll_palette.obj \ - $(OBJS)\coredll_panel.obj \ $(OBJS)\coredll_pen.obj \ $(OBJS)\coredll_popupwin.obj \ $(OBJS)\coredll_printdlg.obj \ @@ -3137,7 +3134,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_settings.obj \ $(OBJS)\coredll_tooltip.obj \ $(OBJS)\coredll_toplevel.obj \ - $(OBJS)\coredll_uiaction.obj \ + $(OBJS)\coredll_uiaction.obj \ $(OBJS)\coredll_utilsgui.obj \ $(OBJS)\coredll_uxtheme.obj \ $(OBJS)\coredll_window.obj \ @@ -3181,6 +3178,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_msw_notebook.obj \ $(OBJS)\coredll_access.obj \ $(OBJS)\coredll_ownerdrw.obj \ + $(OBJS)\coredll_panel.obj \ $(OBJS)\coredll_progdlg.obj \ $(OBJS)\coredll_msw_radiobox.obj \ $(OBJS)\coredll_msw_radiobut.obj \ @@ -3280,7 +3278,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_layout.obj \ $(OBJS)\coredll_lboxcmn.obj \ $(OBJS)\coredll_listctrlcmn.obj \ - $(OBJS)\coredll_markupparser.obj \ + $(OBJS)\coredll_markupparser.obj \ $(OBJS)\coredll_matrix.obj \ $(OBJS)\coredll_menucmn.obj \ $(OBJS)\coredll_mousemanager.obj \ @@ -3339,13 +3337,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_infobar.obj \ $(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_logg.obj \ - $(OBJS)\coredll_markuptext.obj \ - $(OBJS)\coredll_msgdlgg.obj \ - $(OBJS)\coredll_numdlgg.obj \ - $(OBJS)\coredll_panelg.obj \ - $(OBJS)\coredll_progdlgg.obj \ - $(OBJS)\coredll_printps.obj \ - $(OBJS)\coredll_renderg.obj \ + $(OBJS)\coredll_markuptext.obj \ + $(OBJS)\coredll_msgdlgg.obj \ + $(OBJS)\coredll_numdlgg.obj \ + $(OBJS)\coredll_panelg.obj \ + $(OBJS)\coredll_progdlgg.obj \ + $(OBJS)\coredll_printps.obj \ + $(OBJS)\coredll_renderg.obj \ $(OBJS)\coredll_richmsgdlgg.obj \ $(OBJS)\coredll_scrlwing.obj \ $(OBJS)\coredll_selstore.obj \ @@ -3397,7 +3395,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_droptgt.obj \ $(OBJS)\coredll_oleutils.obj \ $(OBJS)\coredll_palette.obj \ - $(OBJS)\coredll_panel.obj \ $(OBJS)\coredll_pen.obj \ $(OBJS)\coredll_popupwin.obj \ $(OBJS)\coredll_printdlg.obj \ @@ -3407,7 +3404,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_settings.obj \ $(OBJS)\coredll_tooltip.obj \ $(OBJS)\coredll_toplevel.obj \ - $(OBJS)\coredll_uiaction.obj \ + $(OBJS)\coredll_uiaction.obj \ $(OBJS)\coredll_utilsgui.obj \ $(OBJS)\coredll_uxtheme.obj \ $(OBJS)\coredll_window.obj \ @@ -3546,7 +3543,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_layout.obj \ $(OBJS)\coredll_lboxcmn.obj \ $(OBJS)\coredll_listctrlcmn.obj \ - $(OBJS)\coredll_markupparser.obj \ + $(OBJS)\coredll_markupparser.obj \ $(OBJS)\coredll_matrix.obj \ $(OBJS)\coredll_menucmn.obj \ $(OBJS)\coredll_mousemanager.obj \ @@ -3605,13 +3602,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_infobar.obj \ $(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_logg.obj \ - $(OBJS)\coredll_markuptext.obj \ - $(OBJS)\coredll_msgdlgg.obj \ - $(OBJS)\coredll_numdlgg.obj \ - $(OBJS)\coredll_panelg.obj \ - $(OBJS)\coredll_progdlgg.obj \ - $(OBJS)\coredll_printps.obj \ - $(OBJS)\coredll_renderg.obj \ + $(OBJS)\coredll_markuptext.obj \ + $(OBJS)\coredll_msgdlgg.obj \ + $(OBJS)\coredll_numdlgg.obj \ + $(OBJS)\coredll_panelg.obj \ + $(OBJS)\coredll_progdlgg.obj \ + $(OBJS)\coredll_printps.obj \ + $(OBJS)\coredll_renderg.obj \ $(OBJS)\coredll_richmsgdlgg.obj \ $(OBJS)\coredll_scrlwing.obj \ $(OBJS)\coredll_selstore.obj \ @@ -3667,7 +3664,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_droptgt.obj \ $(OBJS)\corelib_oleutils.obj \ $(OBJS)\corelib_palette.obj \ - $(OBJS)\corelib_panel.obj \ $(OBJS)\corelib_pen.obj \ $(OBJS)\corelib_popupwin.obj \ $(OBJS)\corelib_printdlg.obj \ @@ -3677,7 +3673,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_settings.obj \ $(OBJS)\corelib_tooltip.obj \ $(OBJS)\corelib_toplevel.obj \ - $(OBJS)\corelib_uiaction.obj \ + $(OBJS)\corelib_uiaction.obj \ $(OBJS)\corelib_utilsgui.obj \ $(OBJS)\corelib_uxtheme.obj \ $(OBJS)\corelib_window.obj \ @@ -3721,6 +3717,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_msw_notebook.obj \ $(OBJS)\corelib_access.obj \ $(OBJS)\corelib_ownerdrw.obj \ + $(OBJS)\corelib_panel.obj \ $(OBJS)\corelib_progdlg.obj \ $(OBJS)\corelib_msw_radiobox.obj \ $(OBJS)\corelib_msw_radiobut.obj \ @@ -3820,7 +3817,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_layout.obj \ $(OBJS)\corelib_lboxcmn.obj \ $(OBJS)\corelib_listctrlcmn.obj \ - $(OBJS)\corelib_markupparser.obj \ + $(OBJS)\corelib_markupparser.obj \ $(OBJS)\corelib_matrix.obj \ $(OBJS)\corelib_menucmn.obj \ $(OBJS)\corelib_mousemanager.obj \ @@ -3879,13 +3876,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_infobar.obj \ $(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_logg.obj \ - $(OBJS)\corelib_markuptext.obj \ - $(OBJS)\corelib_msgdlgg.obj \ - $(OBJS)\corelib_numdlgg.obj \ - $(OBJS)\corelib_panelg.obj \ - $(OBJS)\corelib_progdlgg.obj \ - $(OBJS)\corelib_printps.obj \ - $(OBJS)\corelib_renderg.obj \ + $(OBJS)\corelib_markuptext.obj \ + $(OBJS)\corelib_msgdlgg.obj \ + $(OBJS)\corelib_numdlgg.obj \ + $(OBJS)\corelib_panelg.obj \ + $(OBJS)\corelib_progdlgg.obj \ + $(OBJS)\corelib_printps.obj \ + $(OBJS)\corelib_renderg.obj \ $(OBJS)\corelib_richmsgdlgg.obj \ $(OBJS)\corelib_scrlwing.obj \ $(OBJS)\corelib_selstore.obj \ @@ -3937,7 +3934,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_droptgt.obj \ $(OBJS)\corelib_oleutils.obj \ $(OBJS)\corelib_palette.obj \ - $(OBJS)\corelib_panel.obj \ $(OBJS)\corelib_pen.obj \ $(OBJS)\corelib_popupwin.obj \ $(OBJS)\corelib_printdlg.obj \ @@ -3947,7 +3943,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_settings.obj \ $(OBJS)\corelib_tooltip.obj \ $(OBJS)\corelib_toplevel.obj \ - $(OBJS)\corelib_uiaction.obj \ + $(OBJS)\corelib_uiaction.obj \ $(OBJS)\corelib_utilsgui.obj \ $(OBJS)\corelib_uxtheme.obj \ $(OBJS)\corelib_window.obj \ @@ -4086,7 +4082,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_layout.obj \ $(OBJS)\corelib_lboxcmn.obj \ $(OBJS)\corelib_listctrlcmn.obj \ - $(OBJS)\corelib_markupparser.obj \ + $(OBJS)\corelib_markupparser.obj \ $(OBJS)\corelib_matrix.obj \ $(OBJS)\corelib_menucmn.obj \ $(OBJS)\corelib_mousemanager.obj \ @@ -4145,13 +4141,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_infobar.obj \ $(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_logg.obj \ - $(OBJS)\corelib_markuptext.obj \ - $(OBJS)\corelib_msgdlgg.obj \ - $(OBJS)\corelib_numdlgg.obj \ - $(OBJS)\corelib_panelg.obj \ - $(OBJS)\corelib_progdlgg.obj \ - $(OBJS)\corelib_printps.obj \ - $(OBJS)\corelib_renderg.obj \ + $(OBJS)\corelib_markuptext.obj \ + $(OBJS)\corelib_msgdlgg.obj \ + $(OBJS)\corelib_numdlgg.obj \ + $(OBJS)\corelib_panelg.obj \ + $(OBJS)\corelib_progdlgg.obj \ + $(OBJS)\corelib_printps.obj \ + $(OBJS)\corelib_renderg.obj \ $(OBJS)\corelib_richmsgdlgg.obj \ $(OBJS)\corelib_scrlwing.obj \ $(OBJS)\corelib_selstore.obj \ @@ -6364,6 +6360,9 @@ $(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_msw_panel.obj: ..\..\src\msw\panel.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\panel.cpp + $(OBJS)\monodll_progdlg.obj: ..\..\src\msw\progdlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\progdlg.cpp @@ -6937,7 +6936,7 @@ $(OBJS)\monodll_gallery.obj: ..\..\src\ribbon\gallery.cpp $(OBJS)\monodll_page.obj: ..\..\src\ribbon\page.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\page.cpp -$(OBJS)\monodll_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp +$(OBJS)\monodll_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp $(OBJS)\monodll_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp @@ -7154,11 +7153,6 @@ $(OBJS)\monodll_palette.obj: ..\..\src\msw\palette.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_msw_panel.obj: ..\..\src\msw\panel.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\panel.cpp -!endif - -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_pen.obj: ..\..\src\msw\pen.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\pen.cpp !endif @@ -7204,11 +7198,11 @@ $(OBJS)\monodll_toplevel.obj: ..\..\src\msw\toplevel.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_uiaction.obj: ..\..\src\msw\uiaction.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_uiaction.obj: ..\..\src\msw\uiaction.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp !endif @@ -7659,11 +7653,11 @@ $(OBJS)\monodll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_markupparser.obj: ..\..\src\common\markupparser.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\markupparser.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_markupparser.obj: ..\..\src\common\markupparser.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\markupparser.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_matrix.obj: ..\..\src\common\matrix.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\matrix.cpp !endif @@ -7954,11 +7948,11 @@ $(OBJS)\monodll_logg.obj: ..\..\src\generic\logg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_markuptext.obj: ..\..\src\generic\markuptext.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\markuptext.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_markuptext.obj: ..\..\src\generic\markuptext.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\markuptext.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp !endif @@ -7969,11 +7963,11 @@ $(OBJS)\monodll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_panelg.obj: ..\..\src\generic\panelg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\panelg.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_panelg.obj: ..\..\src\generic\panelg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\panelg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp !endif @@ -8711,6 +8705,9 @@ $(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_msw_panel.obj: ..\..\src\msw\panel.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\panel.cpp + $(OBJS)\monolib_progdlg.obj: ..\..\src\msw\progdlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp @@ -9284,7 +9281,7 @@ $(OBJS)\monolib_gallery.obj: ..\..\src\ribbon\gallery.cpp $(OBJS)\monolib_page.obj: ..\..\src\ribbon\page.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp -$(OBJS)\monolib_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp +$(OBJS)\monolib_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp $(OBJS)\monolib_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp @@ -9501,11 +9498,6 @@ $(OBJS)\monolib_palette.obj: ..\..\src\msw\palette.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_msw_panel.obj: ..\..\src\msw\panel.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\panel.cpp -!endif - -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_pen.obj: ..\..\src\msw\pen.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\pen.cpp !endif @@ -9551,11 +9543,11 @@ $(OBJS)\monolib_toplevel.obj: ..\..\src\msw\toplevel.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_uiaction.obj: ..\..\src\msw\uiaction.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_uiaction.obj: ..\..\src\msw\uiaction.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp !endif @@ -10006,11 +9998,11 @@ $(OBJS)\monolib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_markupparser.obj: ..\..\src\common\markupparser.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\markupparser.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_markupparser.obj: ..\..\src\common\markupparser.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\markupparser.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_matrix.obj: ..\..\src\common\matrix.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\matrix.cpp !endif @@ -10301,11 +10293,11 @@ $(OBJS)\monolib_logg.obj: ..\..\src\generic\logg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_markuptext.obj: ..\..\src\generic\markuptext.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\markuptext.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_markuptext.obj: ..\..\src\generic\markuptext.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\markuptext.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp !endif @@ -10316,11 +10308,11 @@ $(OBJS)\monolib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_panelg.obj: ..\..\src\generic\panelg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\panelg.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_panelg.obj: ..\..\src\generic\panelg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\panelg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp !endif @@ -11469,6 +11461,9 @@ $(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_panel.obj: ..\..\src\msw\panel.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\panel.cpp + $(OBJS)\coredll_progdlg.obj: ..\..\src\msw\progdlg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\progdlg.cpp @@ -11842,11 +11837,6 @@ $(OBJS)\coredll_palette.obj: ..\..\src\msw\palette.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_panel.obj: ..\..\src\msw\panel.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\panel.cpp -!endif - -!if "$(USE_GUI)" == "1" $(OBJS)\coredll_pen.obj: ..\..\src\msw\pen.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\pen.cpp !endif @@ -11892,11 +11882,11 @@ $(OBJS)\coredll_toplevel.obj: ..\..\src\msw\toplevel.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_uiaction.obj: ..\..\src\msw\uiaction.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_uiaction.obj: ..\..\src\msw\uiaction.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp !endif @@ -12347,11 +12337,11 @@ $(OBJS)\coredll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_markupparser.obj: ..\..\src\common\markupparser.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\markupparser.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_markupparser.obj: ..\..\src\common\markupparser.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\markupparser.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_matrix.obj: ..\..\src\common\matrix.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\matrix.cpp !endif @@ -12642,11 +12632,11 @@ $(OBJS)\coredll_logg.obj: ..\..\src\generic\logg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_markuptext.obj: ..\..\src\generic\markuptext.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\markuptext.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_markuptext.obj: ..\..\src\generic\markuptext.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\markuptext.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp !endif @@ -12657,11 +12647,11 @@ $(OBJS)\coredll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_panelg.obj: ..\..\src\generic\panelg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\panelg.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_panelg.obj: ..\..\src\generic\panelg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\panelg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp !endif @@ -12871,6 +12861,9 @@ $(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_panel.obj: ..\..\src\msw\panel.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\panel.cpp + $(OBJS)\corelib_progdlg.obj: ..\..\src\msw\progdlg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp @@ -13244,11 +13237,6 @@ $(OBJS)\corelib_palette.obj: ..\..\src\msw\palette.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_panel.obj: ..\..\src\msw\panel.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\panel.cpp -!endif - -!if "$(USE_GUI)" == "1" $(OBJS)\corelib_pen.obj: ..\..\src\msw\pen.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\pen.cpp !endif @@ -13294,11 +13282,11 @@ $(OBJS)\corelib_toplevel.obj: ..\..\src\msw\toplevel.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_uiaction.obj: ..\..\src\msw\uiaction.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_uiaction.obj: ..\..\src\msw\uiaction.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp !endif @@ -13749,11 +13737,11 @@ $(OBJS)\corelib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_markupparser.obj: ..\..\src\common\markupparser.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\markupparser.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_markupparser.obj: ..\..\src\common\markupparser.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\markupparser.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_matrix.obj: ..\..\src\common\matrix.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\matrix.cpp !endif @@ -14044,11 +14032,11 @@ $(OBJS)\corelib_logg.obj: ..\..\src\generic\logg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_markuptext.obj: ..\..\src\generic\markuptext.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\markuptext.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_markuptext.obj: ..\..\src\generic\markuptext.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\markuptext.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp !endif @@ -14059,11 +14047,11 @@ $(OBJS)\corelib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_panelg.obj: ..\..\src\generic\panelg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\panelg.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_panelg.obj: ..\..\src\generic\panelg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\panelg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp !endif diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 94fa2604b7..b72ed0429e 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1672,7 +1672,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_ribbon_control.o \ $(OBJS)\monodll_gallery.o \ $(OBJS)\monodll_page.o \ - $(OBJS)\monodll_ribbon_panel.o \ + $(OBJS)\monodll_ribbon_panel.o \ $(OBJS)\monodll_ribbon_toolbar.o \ $(OBJS)\monodll_richtextctrl.o \ $(OBJS)\monodll_richtextbuffer.o \ @@ -1724,7 +1724,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_droptgt.o \ $(OBJS)\monodll_oleutils.o \ $(OBJS)\monodll_palette.o \ - $(OBJS)\monodll_msw_panel.o \ $(OBJS)\monodll_pen.o \ $(OBJS)\monodll_popupwin.o \ $(OBJS)\monodll_printdlg.o \ @@ -1734,7 +1733,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_settings.o \ $(OBJS)\monodll_tooltip.o \ $(OBJS)\monodll_toplevel.o \ - $(OBJS)\monodll_uiaction.o \ + $(OBJS)\monodll_uiaction.o \ $(OBJS)\monodll_utilsgui.o \ $(OBJS)\monodll_uxtheme.o \ $(OBJS)\monodll_window.o \ @@ -1778,6 +1777,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_msw_notebook.o \ $(OBJS)\monodll_access.o \ $(OBJS)\monodll_ownerdrw.o \ + $(OBJS)\monodll_msw_panel.o \ $(OBJS)\monodll_progdlg.o \ $(OBJS)\monodll_msw_radiobox.o \ $(OBJS)\monodll_msw_radiobut.o \ @@ -1877,7 +1877,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_layout.o \ $(OBJS)\monodll_lboxcmn.o \ $(OBJS)\monodll_listctrlcmn.o \ - $(OBJS)\monodll_markupparser.o \ + $(OBJS)\monodll_markupparser.o \ $(OBJS)\monodll_matrix.o \ $(OBJS)\monodll_menucmn.o \ $(OBJS)\monodll_mousemanager.o \ @@ -1936,13 +1936,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_infobar.o \ $(OBJS)\monodll_listbkg.o \ $(OBJS)\monodll_logg.o \ - $(OBJS)\monodll_markuptext.o \ - $(OBJS)\monodll_msgdlgg.o \ - $(OBJS)\monodll_numdlgg.o \ - $(OBJS)\monodll_panelg.o \ - $(OBJS)\monodll_progdlgg.o \ - $(OBJS)\monodll_printps.o \ - $(OBJS)\monodll_renderg.o \ + $(OBJS)\monodll_markuptext.o \ + $(OBJS)\monodll_msgdlgg.o \ + $(OBJS)\monodll_numdlgg.o \ + $(OBJS)\monodll_panelg.o \ + $(OBJS)\monodll_progdlgg.o \ + $(OBJS)\monodll_printps.o \ + $(OBJS)\monodll_renderg.o \ $(OBJS)\monodll_richmsgdlgg.o \ $(OBJS)\monodll_scrlwing.o \ $(OBJS)\monodll_selstore.o \ @@ -1996,7 +1996,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_droptgt.o \ $(OBJS)\monodll_oleutils.o \ $(OBJS)\monodll_palette.o \ - $(OBJS)\monodll_msw_panel.o \ $(OBJS)\monodll_pen.o \ $(OBJS)\monodll_popupwin.o \ $(OBJS)\monodll_printdlg.o \ @@ -2006,7 +2005,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_settings.o \ $(OBJS)\monodll_tooltip.o \ $(OBJS)\monodll_toplevel.o \ - $(OBJS)\monodll_uiaction.o \ + $(OBJS)\monodll_uiaction.o \ $(OBJS)\monodll_utilsgui.o \ $(OBJS)\monodll_uxtheme.o \ $(OBJS)\monodll_window.o \ @@ -2145,7 +2144,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_layout.o \ $(OBJS)\monodll_lboxcmn.o \ $(OBJS)\monodll_listctrlcmn.o \ - $(OBJS)\monodll_markupparser.o \ + $(OBJS)\monodll_markupparser.o \ $(OBJS)\monodll_matrix.o \ $(OBJS)\monodll_menucmn.o \ $(OBJS)\monodll_mousemanager.o \ @@ -2204,13 +2203,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_infobar.o \ $(OBJS)\monodll_listbkg.o \ $(OBJS)\monodll_logg.o \ - $(OBJS)\monodll_markuptext.o \ - $(OBJS)\monodll_msgdlgg.o \ - $(OBJS)\monodll_numdlgg.o \ - $(OBJS)\monodll_panelg.o \ - $(OBJS)\monodll_progdlgg.o \ - $(OBJS)\monodll_printps.o \ - $(OBJS)\monodll_renderg.o \ + $(OBJS)\monodll_markuptext.o \ + $(OBJS)\monodll_msgdlgg.o \ + $(OBJS)\monodll_numdlgg.o \ + $(OBJS)\monodll_panelg.o \ + $(OBJS)\monodll_progdlgg.o \ + $(OBJS)\monodll_printps.o \ + $(OBJS)\monodll_renderg.o \ $(OBJS)\monodll_richmsgdlgg.o \ $(OBJS)\monodll_scrlwing.o \ $(OBJS)\monodll_selstore.o \ @@ -2441,7 +2440,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_ribbon_control.o \ $(OBJS)\monolib_gallery.o \ $(OBJS)\monolib_page.o \ - $(OBJS)\monolib_ribbon_panel.o \ + $(OBJS)\monolib_ribbon_panel.o \ $(OBJS)\monolib_ribbon_toolbar.o \ $(OBJS)\monolib_richtextctrl.o \ $(OBJS)\monolib_richtextbuffer.o \ @@ -2493,7 +2492,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_droptgt.o \ $(OBJS)\monolib_oleutils.o \ $(OBJS)\monolib_palette.o \ - $(OBJS)\monolib_msw_panel.o \ $(OBJS)\monolib_pen.o \ $(OBJS)\monolib_popupwin.o \ $(OBJS)\monolib_printdlg.o \ @@ -2503,7 +2501,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_settings.o \ $(OBJS)\monolib_tooltip.o \ $(OBJS)\monolib_toplevel.o \ - $(OBJS)\monolib_uiaction.o \ + $(OBJS)\monolib_uiaction.o \ $(OBJS)\monolib_utilsgui.o \ $(OBJS)\monolib_uxtheme.o \ $(OBJS)\monolib_window.o \ @@ -2547,6 +2545,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_msw_notebook.o \ $(OBJS)\monolib_access.o \ $(OBJS)\monolib_ownerdrw.o \ + $(OBJS)\monolib_msw_panel.o \ $(OBJS)\monolib_progdlg.o \ $(OBJS)\monolib_msw_radiobox.o \ $(OBJS)\monolib_msw_radiobut.o \ @@ -2646,7 +2645,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_layout.o \ $(OBJS)\monolib_lboxcmn.o \ $(OBJS)\monolib_listctrlcmn.o \ - $(OBJS)\monolib_markupparser.o \ + $(OBJS)\monolib_markupparser.o \ $(OBJS)\monolib_matrix.o \ $(OBJS)\monolib_menucmn.o \ $(OBJS)\monolib_mousemanager.o \ @@ -2705,13 +2704,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_infobar.o \ $(OBJS)\monolib_listbkg.o \ $(OBJS)\monolib_logg.o \ - $(OBJS)\monolib_markuptext.o \ - $(OBJS)\monolib_msgdlgg.o \ - $(OBJS)\monolib_numdlgg.o \ - $(OBJS)\monolib_panelg.o \ - $(OBJS)\monolib_progdlgg.o \ - $(OBJS)\monolib_printps.o \ - $(OBJS)\monolib_renderg.o \ + $(OBJS)\monolib_markuptext.o \ + $(OBJS)\monolib_msgdlgg.o \ + $(OBJS)\monolib_numdlgg.o \ + $(OBJS)\monolib_panelg.o \ + $(OBJS)\monolib_progdlgg.o \ + $(OBJS)\monolib_printps.o \ + $(OBJS)\monolib_renderg.o \ $(OBJS)\monolib_richmsgdlgg.o \ $(OBJS)\monolib_scrlwing.o \ $(OBJS)\monolib_selstore.o \ @@ -2765,7 +2764,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_droptgt.o \ $(OBJS)\monolib_oleutils.o \ $(OBJS)\monolib_palette.o \ - $(OBJS)\monolib_msw_panel.o \ $(OBJS)\monolib_pen.o \ $(OBJS)\monolib_popupwin.o \ $(OBJS)\monolib_printdlg.o \ @@ -2775,7 +2773,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_settings.o \ $(OBJS)\monolib_tooltip.o \ $(OBJS)\monolib_toplevel.o \ - $(OBJS)\monolib_uiaction.o \ + $(OBJS)\monolib_uiaction.o \ $(OBJS)\monolib_utilsgui.o \ $(OBJS)\monolib_uxtheme.o \ $(OBJS)\monolib_window.o \ @@ -2914,7 +2912,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_layout.o \ $(OBJS)\monolib_lboxcmn.o \ $(OBJS)\monolib_listctrlcmn.o \ - $(OBJS)\monolib_markupparser.o \ + $(OBJS)\monolib_markupparser.o \ $(OBJS)\monolib_matrix.o \ $(OBJS)\monolib_menucmn.o \ $(OBJS)\monolib_mousemanager.o \ @@ -2973,13 +2971,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_infobar.o \ $(OBJS)\monolib_listbkg.o \ $(OBJS)\monolib_logg.o \ - $(OBJS)\monolib_markuptext.o \ - $(OBJS)\monolib_msgdlgg.o \ - $(OBJS)\monolib_numdlgg.o \ - $(OBJS)\monolib_panelg.o \ - $(OBJS)\monolib_progdlgg.o \ - $(OBJS)\monolib_printps.o \ - $(OBJS)\monolib_renderg.o \ + $(OBJS)\monolib_markuptext.o \ + $(OBJS)\monolib_msgdlgg.o \ + $(OBJS)\monolib_numdlgg.o \ + $(OBJS)\monolib_panelg.o \ + $(OBJS)\monolib_progdlgg.o \ + $(OBJS)\monolib_printps.o \ + $(OBJS)\monolib_renderg.o \ $(OBJS)\monolib_richmsgdlgg.o \ $(OBJS)\monolib_scrlwing.o \ $(OBJS)\monolib_selstore.o \ @@ -3160,7 +3158,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_droptgt.o \ $(OBJS)\coredll_oleutils.o \ $(OBJS)\coredll_palette.o \ - $(OBJS)\coredll_panel.o \ $(OBJS)\coredll_pen.o \ $(OBJS)\coredll_popupwin.o \ $(OBJS)\coredll_printdlg.o \ @@ -3170,7 +3167,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_settings.o \ $(OBJS)\coredll_tooltip.o \ $(OBJS)\coredll_toplevel.o \ - $(OBJS)\coredll_uiaction.o \ + $(OBJS)\coredll_uiaction.o \ $(OBJS)\coredll_utilsgui.o \ $(OBJS)\coredll_uxtheme.o \ $(OBJS)\coredll_window.o \ @@ -3214,6 +3211,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_msw_notebook.o \ $(OBJS)\coredll_access.o \ $(OBJS)\coredll_ownerdrw.o \ + $(OBJS)\coredll_panel.o \ $(OBJS)\coredll_progdlg.o \ $(OBJS)\coredll_msw_radiobox.o \ $(OBJS)\coredll_msw_radiobut.o \ @@ -3313,7 +3311,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_layout.o \ $(OBJS)\coredll_lboxcmn.o \ $(OBJS)\coredll_listctrlcmn.o \ - $(OBJS)\coredll_markupparser.o \ + $(OBJS)\coredll_markupparser.o \ $(OBJS)\coredll_matrix.o \ $(OBJS)\coredll_menucmn.o \ $(OBJS)\coredll_mousemanager.o \ @@ -3372,13 +3370,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_infobar.o \ $(OBJS)\coredll_listbkg.o \ $(OBJS)\coredll_logg.o \ - $(OBJS)\coredll_markuptext.o \ - $(OBJS)\coredll_msgdlgg.o \ - $(OBJS)\coredll_numdlgg.o \ - $(OBJS)\coredll_panelg.o \ - $(OBJS)\coredll_progdlgg.o \ - $(OBJS)\coredll_printps.o \ - $(OBJS)\coredll_renderg.o \ + $(OBJS)\coredll_markuptext.o \ + $(OBJS)\coredll_msgdlgg.o \ + $(OBJS)\coredll_numdlgg.o \ + $(OBJS)\coredll_panelg.o \ + $(OBJS)\coredll_progdlgg.o \ + $(OBJS)\coredll_printps.o \ + $(OBJS)\coredll_renderg.o \ $(OBJS)\coredll_richmsgdlgg.o \ $(OBJS)\coredll_scrlwing.o \ $(OBJS)\coredll_selstore.o \ @@ -3432,7 +3430,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_droptgt.o \ $(OBJS)\coredll_oleutils.o \ $(OBJS)\coredll_palette.o \ - $(OBJS)\coredll_panel.o \ $(OBJS)\coredll_pen.o \ $(OBJS)\coredll_popupwin.o \ $(OBJS)\coredll_printdlg.o \ @@ -3442,7 +3439,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_settings.o \ $(OBJS)\coredll_tooltip.o \ $(OBJS)\coredll_toplevel.o \ - $(OBJS)\coredll_uiaction.o \ + $(OBJS)\coredll_uiaction.o \ $(OBJS)\coredll_utilsgui.o \ $(OBJS)\coredll_uxtheme.o \ $(OBJS)\coredll_window.o \ @@ -3581,7 +3578,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_layout.o \ $(OBJS)\coredll_lboxcmn.o \ $(OBJS)\coredll_listctrlcmn.o \ - $(OBJS)\coredll_markupparser.o \ + $(OBJS)\coredll_markupparser.o \ $(OBJS)\coredll_matrix.o \ $(OBJS)\coredll_menucmn.o \ $(OBJS)\coredll_mousemanager.o \ @@ -3640,13 +3637,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_infobar.o \ $(OBJS)\coredll_listbkg.o \ $(OBJS)\coredll_logg.o \ - $(OBJS)\coredll_markuptext.o \ - $(OBJS)\coredll_msgdlgg.o \ - $(OBJS)\coredll_numdlgg.o \ - $(OBJS)\coredll_panelg.o \ - $(OBJS)\coredll_progdlgg.o \ - $(OBJS)\coredll_printps.o \ - $(OBJS)\coredll_renderg.o \ + $(OBJS)\coredll_markuptext.o \ + $(OBJS)\coredll_msgdlgg.o \ + $(OBJS)\coredll_numdlgg.o \ + $(OBJS)\coredll_panelg.o \ + $(OBJS)\coredll_progdlgg.o \ + $(OBJS)\coredll_printps.o \ + $(OBJS)\coredll_renderg.o \ $(OBJS)\coredll_richmsgdlgg.o \ $(OBJS)\coredll_scrlwing.o \ $(OBJS)\coredll_selstore.o \ @@ -3708,7 +3705,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_droptgt.o \ $(OBJS)\corelib_oleutils.o \ $(OBJS)\corelib_palette.o \ - $(OBJS)\corelib_panel.o \ $(OBJS)\corelib_pen.o \ $(OBJS)\corelib_popupwin.o \ $(OBJS)\corelib_printdlg.o \ @@ -3718,7 +3714,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_settings.o \ $(OBJS)\corelib_tooltip.o \ $(OBJS)\corelib_toplevel.o \ - $(OBJS)\corelib_uiaction.o \ + $(OBJS)\corelib_uiaction.o \ $(OBJS)\corelib_utilsgui.o \ $(OBJS)\corelib_uxtheme.o \ $(OBJS)\corelib_window.o \ @@ -3762,6 +3758,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_msw_notebook.o \ $(OBJS)\corelib_access.o \ $(OBJS)\corelib_ownerdrw.o \ + $(OBJS)\corelib_panel.o \ $(OBJS)\corelib_progdlg.o \ $(OBJS)\corelib_msw_radiobox.o \ $(OBJS)\corelib_msw_radiobut.o \ @@ -3861,7 +3858,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_layout.o \ $(OBJS)\corelib_lboxcmn.o \ $(OBJS)\corelib_listctrlcmn.o \ - $(OBJS)\corelib_markupparser.o \ + $(OBJS)\corelib_markupparser.o \ $(OBJS)\corelib_matrix.o \ $(OBJS)\corelib_menucmn.o \ $(OBJS)\corelib_mousemanager.o \ @@ -3920,13 +3917,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_infobar.o \ $(OBJS)\corelib_listbkg.o \ $(OBJS)\corelib_logg.o \ - $(OBJS)\corelib_markuptext.o \ - $(OBJS)\corelib_msgdlgg.o \ - $(OBJS)\corelib_numdlgg.o \ - $(OBJS)\corelib_panelg.o \ - $(OBJS)\corelib_progdlgg.o \ - $(OBJS)\corelib_printps.o \ - $(OBJS)\corelib_renderg.o \ + $(OBJS)\corelib_markuptext.o \ + $(OBJS)\corelib_msgdlgg.o \ + $(OBJS)\corelib_numdlgg.o \ + $(OBJS)\corelib_panelg.o \ + $(OBJS)\corelib_progdlgg.o \ + $(OBJS)\corelib_printps.o \ + $(OBJS)\corelib_renderg.o \ $(OBJS)\corelib_richmsgdlgg.o \ $(OBJS)\corelib_scrlwing.o \ $(OBJS)\corelib_selstore.o \ @@ -3980,7 +3977,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_droptgt.o \ $(OBJS)\corelib_oleutils.o \ $(OBJS)\corelib_palette.o \ - $(OBJS)\corelib_panel.o \ $(OBJS)\corelib_pen.o \ $(OBJS)\corelib_popupwin.o \ $(OBJS)\corelib_printdlg.o \ @@ -3990,7 +3986,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_settings.o \ $(OBJS)\corelib_tooltip.o \ $(OBJS)\corelib_toplevel.o \ - $(OBJS)\corelib_uiaction.o \ + $(OBJS)\corelib_uiaction.o \ $(OBJS)\corelib_utilsgui.o \ $(OBJS)\corelib_uxtheme.o \ $(OBJS)\corelib_window.o \ @@ -4129,7 +4125,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_layout.o \ $(OBJS)\corelib_lboxcmn.o \ $(OBJS)\corelib_listctrlcmn.o \ - $(OBJS)\corelib_markupparser.o \ + $(OBJS)\corelib_markupparser.o \ $(OBJS)\corelib_matrix.o \ $(OBJS)\corelib_menucmn.o \ $(OBJS)\corelib_mousemanager.o \ @@ -4188,13 +4184,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_infobar.o \ $(OBJS)\corelib_listbkg.o \ $(OBJS)\corelib_logg.o \ - $(OBJS)\corelib_markuptext.o \ - $(OBJS)\corelib_msgdlgg.o \ - $(OBJS)\corelib_numdlgg.o \ - $(OBJS)\corelib_panelg.o \ - $(OBJS)\corelib_progdlgg.o \ - $(OBJS)\corelib_printps.o \ - $(OBJS)\corelib_renderg.o \ + $(OBJS)\corelib_markuptext.o \ + $(OBJS)\corelib_msgdlgg.o \ + $(OBJS)\corelib_numdlgg.o \ + $(OBJS)\corelib_panelg.o \ + $(OBJS)\corelib_progdlgg.o \ + $(OBJS)\corelib_printps.o \ + $(OBJS)\corelib_renderg.o \ $(OBJS)\corelib_richmsgdlgg.o \ $(OBJS)\corelib_scrlwing.o \ $(OBJS)\corelib_selstore.o \ @@ -6514,6 +6510,9 @@ $(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_msw_panel.o: ../../src/msw/panel.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_progdlg.o: ../../src/msw/progdlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7087,7 +7086,7 @@ $(OBJS)\monodll_gallery.o: ../../src/ribbon/gallery.cpp $(OBJS)\monodll_page.o: ../../src/ribbon/page.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_ribbon_panel.o: ../../src/ribbon/panel.cpp +$(OBJS)\monodll_ribbon_panel.o: ../../src/ribbon/panel.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\monodll_ribbon_toolbar.o: ../../src/ribbon/toolbar.cpp @@ -7304,11 +7303,6 @@ $(OBJS)\monodll_palette.o: ../../src/msw/palette.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_msw_panel.o: ../../src/msw/panel.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) $(OBJS)\monodll_pen.o: ../../src/msw/pen.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -7354,11 +7348,11 @@ $(OBJS)\monodll_toplevel.o: ../../src/msw/toplevel.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_uiaction.o: ../../src/msw/uiaction.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\monodll_uiaction.o: ../../src/msw/uiaction.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monodll_utilsgui.o: ../../src/msw/utilsgui.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -7809,11 +7803,11 @@ $(OBJS)\monodll_listctrlcmn.o: ../../src/common/listctrlcmn.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_markupparser.o: ../../src/common/markupparser.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\monodll_markupparser.o: ../../src/common/markupparser.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monodll_matrix.o: ../../src/common/matrix.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -8104,26 +8098,26 @@ $(OBJS)\monodll_logg.o: ../../src/generic/logg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_markuptext.o: ../../src/generic/markuptext.cpp +$(OBJS)\monodll_markuptext.o: ../../src/generic/markuptext.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_msgdlgg.o: ../../src/generic/msgdlgg.cpp +$(OBJS)\monodll_msgdlgg.o: ../../src/generic/msgdlgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_numdlgg.o: ../../src/generic/numdlgg.cpp +$(OBJS)\monodll_numdlgg.o: ../../src/generic/numdlgg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_panelg.o: ../../src/generic/panelg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_panelg.o: ../../src/generic/panelg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) $(OBJS)\monodll_progdlgg.o: ../../src/generic/progdlgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -8861,6 +8855,9 @@ $(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_msw_panel.o: ../../src/msw/panel.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_progdlg.o: ../../src/msw/progdlg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9434,7 +9431,7 @@ $(OBJS)\monolib_gallery.o: ../../src/ribbon/gallery.cpp $(OBJS)\monolib_page.o: ../../src/ribbon/page.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_ribbon_panel.o: ../../src/ribbon/panel.cpp +$(OBJS)\monolib_ribbon_panel.o: ../../src/ribbon/panel.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\monolib_ribbon_toolbar.o: ../../src/ribbon/toolbar.cpp @@ -9651,11 +9648,6 @@ $(OBJS)\monolib_palette.o: ../../src/msw/palette.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monolib_msw_panel.o: ../../src/msw/panel.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) $(OBJS)\monolib_pen.o: ../../src/msw/pen.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -9701,11 +9693,11 @@ $(OBJS)\monolib_toplevel.o: ../../src/msw/toplevel.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monolib_uiaction.o: ../../src/msw/uiaction.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\monolib_uiaction.o: ../../src/msw/uiaction.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monolib_utilsgui.o: ../../src/msw/utilsgui.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -10156,11 +10148,11 @@ $(OBJS)\monolib_listctrlcmn.o: ../../src/common/listctrlcmn.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monolib_markupparser.o: ../../src/common/markupparser.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\monolib_markupparser.o: ../../src/common/markupparser.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monolib_matrix.o: ../../src/common/matrix.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -10451,26 +10443,26 @@ $(OBJS)\monolib_logg.o: ../../src/generic/logg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monolib_markuptext.o: ../../src/generic/markuptext.cpp +$(OBJS)\monolib_markuptext.o: ../../src/generic/markuptext.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monolib_msgdlgg.o: ../../src/generic/msgdlgg.cpp +$(OBJS)\monolib_msgdlgg.o: ../../src/generic/msgdlgg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monolib_numdlgg.o: ../../src/generic/numdlgg.cpp +$(OBJS)\monolib_numdlgg.o: ../../src/generic/numdlgg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_panelg.o: ../../src/generic/panelg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monolib_panelg.o: ../../src/generic/panelg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) $(OBJS)\monolib_progdlgg.o: ../../src/generic/progdlgg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -11619,6 +11611,9 @@ $(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_panel.o: ../../src/msw/panel.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\coredll_progdlg.o: ../../src/msw/progdlg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11992,11 +11987,6 @@ $(OBJS)\coredll_palette.o: ../../src/msw/palette.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\coredll_panel.o: ../../src/msw/panel.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) $(OBJS)\coredll_pen.o: ../../src/msw/pen.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -12042,11 +12032,11 @@ $(OBJS)\coredll_toplevel.o: ../../src/msw/toplevel.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\coredll_uiaction.o: ../../src/msw/uiaction.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\coredll_uiaction.o: ../../src/msw/uiaction.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\coredll_utilsgui.o: ../../src/msw/utilsgui.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -12497,11 +12487,11 @@ $(OBJS)\coredll_listctrlcmn.o: ../../src/common/listctrlcmn.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\coredll_markupparser.o: ../../src/common/markupparser.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\coredll_markupparser.o: ../../src/common/markupparser.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\coredll_matrix.o: ../../src/common/matrix.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -12792,26 +12782,26 @@ $(OBJS)\coredll_logg.o: ../../src/generic/logg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\coredll_markuptext.o: ../../src/generic/markuptext.cpp +$(OBJS)\coredll_markuptext.o: ../../src/generic/markuptext.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\coredll_msgdlgg.o: ../../src/generic/msgdlgg.cpp +$(OBJS)\coredll_msgdlgg.o: ../../src/generic/msgdlgg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\coredll_numdlgg.o: ../../src/generic/numdlgg.cpp +$(OBJS)\coredll_numdlgg.o: ../../src/generic/numdlgg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_panelg.o: ../../src/generic/panelg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\coredll_panelg.o: ../../src/generic/panelg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) $(OBJS)\coredll_progdlgg.o: ../../src/generic/progdlgg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -13021,6 +13011,9 @@ $(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_panel.o: ../../src/msw/panel.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\corelib_progdlg.o: ../../src/msw/progdlg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13394,11 +13387,6 @@ $(OBJS)\corelib_palette.o: ../../src/msw/palette.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\corelib_panel.o: ../../src/msw/panel.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) $(OBJS)\corelib_pen.o: ../../src/msw/pen.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -13444,11 +13432,11 @@ $(OBJS)\corelib_toplevel.o: ../../src/msw/toplevel.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\corelib_uiaction.o: ../../src/msw/uiaction.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\corelib_uiaction.o: ../../src/msw/uiaction.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\corelib_utilsgui.o: ../../src/msw/utilsgui.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -13899,11 +13887,11 @@ $(OBJS)\corelib_listctrlcmn.o: ../../src/common/listctrlcmn.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\corelib_markupparser.o: ../../src/common/markupparser.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\corelib_markupparser.o: ../../src/common/markupparser.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\corelib_matrix.o: ../../src/common/matrix.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -14194,26 +14182,26 @@ $(OBJS)\corelib_logg.o: ../../src/generic/logg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\corelib_markuptext.o: ../../src/generic/markuptext.cpp +$(OBJS)\corelib_markuptext.o: ../../src/generic/markuptext.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\corelib_msgdlgg.o: ../../src/generic/msgdlgg.cpp +$(OBJS)\corelib_msgdlgg.o: ../../src/generic/msgdlgg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\corelib_numdlgg.o: ../../src/generic/numdlgg.cpp +$(OBJS)\corelib_numdlgg.o: ../../src/generic/numdlgg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_panelg.o: ../../src/generic/panelg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\corelib_panelg.o: ../../src/generic/panelg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) $(OBJS)\corelib_progdlgg.o: ../../src/generic/progdlgg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 0d81658935..aff93420b8 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1870,7 +1870,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_ribbon_control.obj \ $(OBJS)\monodll_gallery.obj \ $(OBJS)\monodll_page.obj \ - $(OBJS)\monodll_ribbon_panel.obj \ + $(OBJS)\monodll_ribbon_panel.obj \ $(OBJS)\monodll_ribbon_toolbar.obj \ $(OBJS)\monodll_richtextctrl.obj \ $(OBJS)\monodll_richtextbuffer.obj \ @@ -1921,7 +1921,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_droptgt.obj \ $(OBJS)\monodll_oleutils.obj \ $(OBJS)\monodll_palette.obj \ - $(OBJS)\monodll_msw_panel.obj \ $(OBJS)\monodll_pen.obj \ $(OBJS)\monodll_popupwin.obj \ $(OBJS)\monodll_printdlg.obj \ @@ -1931,7 +1930,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_settings.obj \ $(OBJS)\monodll_tooltip.obj \ $(OBJS)\monodll_toplevel.obj \ - $(OBJS)\monodll_uiaction.obj \ + $(OBJS)\monodll_uiaction.obj \ $(OBJS)\monodll_utilsgui.obj \ $(OBJS)\monodll_uxtheme.obj \ $(OBJS)\monodll_window.obj \ @@ -1975,6 +1974,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_msw_notebook.obj \ $(OBJS)\monodll_access.obj \ $(OBJS)\monodll_ownerdrw.obj \ + $(OBJS)\monodll_msw_panel.obj \ $(OBJS)\monodll_progdlg.obj \ $(OBJS)\monodll_msw_radiobox.obj \ $(OBJS)\monodll_msw_radiobut.obj \ @@ -2074,7 +2074,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_layout.obj \ $(OBJS)\monodll_lboxcmn.obj \ $(OBJS)\monodll_listctrlcmn.obj \ - $(OBJS)\monodll_markupparser.obj \ + $(OBJS)\monodll_markupparser.obj \ $(OBJS)\monodll_matrix.obj \ $(OBJS)\monodll_menucmn.obj \ $(OBJS)\monodll_mousemanager.obj \ @@ -2133,13 +2133,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_infobar.obj \ $(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_logg.obj \ - $(OBJS)\monodll_markuptext.obj \ - $(OBJS)\monodll_msgdlgg.obj \ - $(OBJS)\monodll_numdlgg.obj \ - $(OBJS)\monodll_panelg.obj \ - $(OBJS)\monodll_progdlgg.obj \ - $(OBJS)\monodll_printps.obj \ - $(OBJS)\monodll_renderg.obj \ + $(OBJS)\monodll_markuptext.obj \ + $(OBJS)\monodll_msgdlgg.obj \ + $(OBJS)\monodll_numdlgg.obj \ + $(OBJS)\monodll_panelg.obj \ + $(OBJS)\monodll_progdlgg.obj \ + $(OBJS)\monodll_printps.obj \ + $(OBJS)\monodll_renderg.obj \ $(OBJS)\monodll_richmsgdlgg.obj \ $(OBJS)\monodll_scrlwing.obj \ $(OBJS)\monodll_selstore.obj \ @@ -2191,7 +2191,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_droptgt.obj \ $(OBJS)\monodll_oleutils.obj \ $(OBJS)\monodll_palette.obj \ - $(OBJS)\monodll_msw_panel.obj \ $(OBJS)\monodll_pen.obj \ $(OBJS)\monodll_popupwin.obj \ $(OBJS)\monodll_printdlg.obj \ @@ -2201,7 +2200,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_settings.obj \ $(OBJS)\monodll_tooltip.obj \ $(OBJS)\monodll_toplevel.obj \ - $(OBJS)\monodll_uiaction.obj \ + $(OBJS)\monodll_uiaction.obj \ $(OBJS)\monodll_utilsgui.obj \ $(OBJS)\monodll_uxtheme.obj \ $(OBJS)\monodll_window.obj \ @@ -2340,7 +2339,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_layout.obj \ $(OBJS)\monodll_lboxcmn.obj \ $(OBJS)\monodll_listctrlcmn.obj \ - $(OBJS)\monodll_markupparser.obj \ + $(OBJS)\monodll_markupparser.obj \ $(OBJS)\monodll_matrix.obj \ $(OBJS)\monodll_menucmn.obj \ $(OBJS)\monodll_mousemanager.obj \ @@ -2399,13 +2398,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_infobar.obj \ $(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_logg.obj \ - $(OBJS)\monodll_markuptext.obj \ - $(OBJS)\monodll_msgdlgg.obj \ - $(OBJS)\monodll_numdlgg.obj \ - $(OBJS)\monodll_panelg.obj \ - $(OBJS)\monodll_progdlgg.obj \ - $(OBJS)\monodll_printps.obj \ - $(OBJS)\monodll_renderg.obj \ + $(OBJS)\monodll_markuptext.obj \ + $(OBJS)\monodll_msgdlgg.obj \ + $(OBJS)\monodll_numdlgg.obj \ + $(OBJS)\monodll_panelg.obj \ + $(OBJS)\monodll_progdlgg.obj \ + $(OBJS)\monodll_printps.obj \ + $(OBJS)\monodll_renderg.obj \ $(OBJS)\monodll_richmsgdlgg.obj \ $(OBJS)\monodll_scrlwing.obj \ $(OBJS)\monodll_selstore.obj \ @@ -2639,7 +2638,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_ribbon_control.obj \ $(OBJS)\monolib_gallery.obj \ $(OBJS)\monolib_page.obj \ - $(OBJS)\monolib_ribbon_panel.obj \ + $(OBJS)\monolib_ribbon_panel.obj \ $(OBJS)\monolib_ribbon_toolbar.obj \ $(OBJS)\monolib_richtextctrl.obj \ $(OBJS)\monolib_richtextbuffer.obj \ @@ -2690,7 +2689,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_droptgt.obj \ $(OBJS)\monolib_oleutils.obj \ $(OBJS)\monolib_palette.obj \ - $(OBJS)\monolib_msw_panel.obj \ $(OBJS)\monolib_pen.obj \ $(OBJS)\monolib_popupwin.obj \ $(OBJS)\monolib_printdlg.obj \ @@ -2700,7 +2698,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_settings.obj \ $(OBJS)\monolib_tooltip.obj \ $(OBJS)\monolib_toplevel.obj \ - $(OBJS)\monolib_uiaction.obj \ + $(OBJS)\monolib_uiaction.obj \ $(OBJS)\monolib_utilsgui.obj \ $(OBJS)\monolib_uxtheme.obj \ $(OBJS)\monolib_window.obj \ @@ -2744,6 +2742,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_msw_notebook.obj \ $(OBJS)\monolib_access.obj \ $(OBJS)\monolib_ownerdrw.obj \ + $(OBJS)\monolib_msw_panel.obj \ $(OBJS)\monolib_progdlg.obj \ $(OBJS)\monolib_msw_radiobox.obj \ $(OBJS)\monolib_msw_radiobut.obj \ @@ -2843,7 +2842,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_layout.obj \ $(OBJS)\monolib_lboxcmn.obj \ $(OBJS)\monolib_listctrlcmn.obj \ - $(OBJS)\monolib_markupparser.obj \ + $(OBJS)\monolib_markupparser.obj \ $(OBJS)\monolib_matrix.obj \ $(OBJS)\monolib_menucmn.obj \ $(OBJS)\monolib_mousemanager.obj \ @@ -2902,13 +2901,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_infobar.obj \ $(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_logg.obj \ - $(OBJS)\monolib_markuptext.obj \ - $(OBJS)\monolib_msgdlgg.obj \ - $(OBJS)\monolib_numdlgg.obj \ - $(OBJS)\monolib_panelg.obj \ - $(OBJS)\monolib_progdlgg.obj \ - $(OBJS)\monolib_printps.obj \ - $(OBJS)\monolib_renderg.obj \ + $(OBJS)\monolib_markuptext.obj \ + $(OBJS)\monolib_msgdlgg.obj \ + $(OBJS)\monolib_numdlgg.obj \ + $(OBJS)\monolib_panelg.obj \ + $(OBJS)\monolib_progdlgg.obj \ + $(OBJS)\monolib_printps.obj \ + $(OBJS)\monolib_renderg.obj \ $(OBJS)\monolib_richmsgdlgg.obj \ $(OBJS)\monolib_scrlwing.obj \ $(OBJS)\monolib_selstore.obj \ @@ -2960,7 +2959,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_droptgt.obj \ $(OBJS)\monolib_oleutils.obj \ $(OBJS)\monolib_palette.obj \ - $(OBJS)\monolib_msw_panel.obj \ $(OBJS)\monolib_pen.obj \ $(OBJS)\monolib_popupwin.obj \ $(OBJS)\monolib_printdlg.obj \ @@ -2970,7 +2968,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_settings.obj \ $(OBJS)\monolib_tooltip.obj \ $(OBJS)\monolib_toplevel.obj \ - $(OBJS)\monolib_uiaction.obj \ + $(OBJS)\monolib_uiaction.obj \ $(OBJS)\monolib_utilsgui.obj \ $(OBJS)\monolib_uxtheme.obj \ $(OBJS)\monolib_window.obj \ @@ -3109,7 +3107,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_layout.obj \ $(OBJS)\monolib_lboxcmn.obj \ $(OBJS)\monolib_listctrlcmn.obj \ - $(OBJS)\monolib_markupparser.obj \ + $(OBJS)\monolib_markupparser.obj \ $(OBJS)\monolib_matrix.obj \ $(OBJS)\monolib_menucmn.obj \ $(OBJS)\monolib_mousemanager.obj \ @@ -3168,13 +3166,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_infobar.obj \ $(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_logg.obj \ - $(OBJS)\monolib_markuptext.obj \ - $(OBJS)\monolib_msgdlgg.obj \ - $(OBJS)\monolib_numdlgg.obj \ - $(OBJS)\monolib_panelg.obj \ - $(OBJS)\monolib_progdlgg.obj \ - $(OBJS)\monolib_printps.obj \ - $(OBJS)\monolib_renderg.obj \ + $(OBJS)\monolib_markuptext.obj \ + $(OBJS)\monolib_msgdlgg.obj \ + $(OBJS)\monolib_numdlgg.obj \ + $(OBJS)\monolib_panelg.obj \ + $(OBJS)\monolib_progdlgg.obj \ + $(OBJS)\monolib_printps.obj \ + $(OBJS)\monolib_renderg.obj \ $(OBJS)\monolib_richmsgdlgg.obj \ $(OBJS)\monolib_scrlwing.obj \ $(OBJS)\monolib_selstore.obj \ @@ -3407,7 +3405,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_droptgt.obj \ $(OBJS)\coredll_oleutils.obj \ $(OBJS)\coredll_palette.obj \ - $(OBJS)\coredll_panel.obj \ $(OBJS)\coredll_pen.obj \ $(OBJS)\coredll_popupwin.obj \ $(OBJS)\coredll_printdlg.obj \ @@ -3417,7 +3414,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_settings.obj \ $(OBJS)\coredll_tooltip.obj \ $(OBJS)\coredll_toplevel.obj \ - $(OBJS)\coredll_uiaction.obj \ + $(OBJS)\coredll_uiaction.obj \ $(OBJS)\coredll_utilsgui.obj \ $(OBJS)\coredll_uxtheme.obj \ $(OBJS)\coredll_window.obj \ @@ -3461,6 +3458,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_msw_notebook.obj \ $(OBJS)\coredll_access.obj \ $(OBJS)\coredll_ownerdrw.obj \ + $(OBJS)\coredll_panel.obj \ $(OBJS)\coredll_progdlg.obj \ $(OBJS)\coredll_msw_radiobox.obj \ $(OBJS)\coredll_msw_radiobut.obj \ @@ -3560,7 +3558,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_layout.obj \ $(OBJS)\coredll_lboxcmn.obj \ $(OBJS)\coredll_listctrlcmn.obj \ - $(OBJS)\coredll_markupparser.obj \ + $(OBJS)\coredll_markupparser.obj \ $(OBJS)\coredll_matrix.obj \ $(OBJS)\coredll_menucmn.obj \ $(OBJS)\coredll_mousemanager.obj \ @@ -3619,13 +3617,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_infobar.obj \ $(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_logg.obj \ - $(OBJS)\coredll_markuptext.obj \ - $(OBJS)\coredll_msgdlgg.obj \ - $(OBJS)\coredll_numdlgg.obj \ - $(OBJS)\coredll_panelg.obj \ - $(OBJS)\coredll_progdlgg.obj \ - $(OBJS)\coredll_printps.obj \ - $(OBJS)\coredll_renderg.obj \ + $(OBJS)\coredll_markuptext.obj \ + $(OBJS)\coredll_msgdlgg.obj \ + $(OBJS)\coredll_numdlgg.obj \ + $(OBJS)\coredll_panelg.obj \ + $(OBJS)\coredll_progdlgg.obj \ + $(OBJS)\coredll_printps.obj \ + $(OBJS)\coredll_renderg.obj \ $(OBJS)\coredll_richmsgdlgg.obj \ $(OBJS)\coredll_scrlwing.obj \ $(OBJS)\coredll_selstore.obj \ @@ -3677,7 +3675,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_droptgt.obj \ $(OBJS)\coredll_oleutils.obj \ $(OBJS)\coredll_palette.obj \ - $(OBJS)\coredll_panel.obj \ $(OBJS)\coredll_pen.obj \ $(OBJS)\coredll_popupwin.obj \ $(OBJS)\coredll_printdlg.obj \ @@ -3687,7 +3684,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_settings.obj \ $(OBJS)\coredll_tooltip.obj \ $(OBJS)\coredll_toplevel.obj \ - $(OBJS)\coredll_uiaction.obj \ + $(OBJS)\coredll_uiaction.obj \ $(OBJS)\coredll_utilsgui.obj \ $(OBJS)\coredll_uxtheme.obj \ $(OBJS)\coredll_window.obj \ @@ -3826,7 +3823,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_layout.obj \ $(OBJS)\coredll_lboxcmn.obj \ $(OBJS)\coredll_listctrlcmn.obj \ - $(OBJS)\coredll_markupparser.obj \ + $(OBJS)\coredll_markupparser.obj \ $(OBJS)\coredll_matrix.obj \ $(OBJS)\coredll_menucmn.obj \ $(OBJS)\coredll_mousemanager.obj \ @@ -3885,13 +3882,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_infobar.obj \ $(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_logg.obj \ - $(OBJS)\coredll_markuptext.obj \ - $(OBJS)\coredll_msgdlgg.obj \ - $(OBJS)\coredll_numdlgg.obj \ - $(OBJS)\coredll_panelg.obj \ - $(OBJS)\coredll_progdlgg.obj \ - $(OBJS)\coredll_printps.obj \ - $(OBJS)\coredll_renderg.obj \ + $(OBJS)\coredll_markuptext.obj \ + $(OBJS)\coredll_msgdlgg.obj \ + $(OBJS)\coredll_numdlgg.obj \ + $(OBJS)\coredll_panelg.obj \ + $(OBJS)\coredll_progdlgg.obj \ + $(OBJS)\coredll_printps.obj \ + $(OBJS)\coredll_renderg.obj \ $(OBJS)\coredll_richmsgdlgg.obj \ $(OBJS)\coredll_scrlwing.obj \ $(OBJS)\coredll_selstore.obj \ @@ -3953,7 +3950,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_droptgt.obj \ $(OBJS)\corelib_oleutils.obj \ $(OBJS)\corelib_palette.obj \ - $(OBJS)\corelib_panel.obj \ $(OBJS)\corelib_pen.obj \ $(OBJS)\corelib_popupwin.obj \ $(OBJS)\corelib_printdlg.obj \ @@ -3963,7 +3959,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_settings.obj \ $(OBJS)\corelib_tooltip.obj \ $(OBJS)\corelib_toplevel.obj \ - $(OBJS)\corelib_uiaction.obj \ + $(OBJS)\corelib_uiaction.obj \ $(OBJS)\corelib_utilsgui.obj \ $(OBJS)\corelib_uxtheme.obj \ $(OBJS)\corelib_window.obj \ @@ -4007,6 +4003,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_msw_notebook.obj \ $(OBJS)\corelib_access.obj \ $(OBJS)\corelib_ownerdrw.obj \ + $(OBJS)\corelib_panel.obj \ $(OBJS)\corelib_progdlg.obj \ $(OBJS)\corelib_msw_radiobox.obj \ $(OBJS)\corelib_msw_radiobut.obj \ @@ -4106,7 +4103,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_layout.obj \ $(OBJS)\corelib_lboxcmn.obj \ $(OBJS)\corelib_listctrlcmn.obj \ - $(OBJS)\corelib_markupparser.obj \ + $(OBJS)\corelib_markupparser.obj \ $(OBJS)\corelib_matrix.obj \ $(OBJS)\corelib_menucmn.obj \ $(OBJS)\corelib_mousemanager.obj \ @@ -4165,13 +4162,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_infobar.obj \ $(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_logg.obj \ - $(OBJS)\corelib_markuptext.obj \ - $(OBJS)\corelib_msgdlgg.obj \ - $(OBJS)\corelib_numdlgg.obj \ - $(OBJS)\corelib_panelg.obj \ - $(OBJS)\corelib_progdlgg.obj \ - $(OBJS)\corelib_printps.obj \ - $(OBJS)\corelib_renderg.obj \ + $(OBJS)\corelib_markuptext.obj \ + $(OBJS)\corelib_msgdlgg.obj \ + $(OBJS)\corelib_numdlgg.obj \ + $(OBJS)\corelib_panelg.obj \ + $(OBJS)\corelib_progdlgg.obj \ + $(OBJS)\corelib_printps.obj \ + $(OBJS)\corelib_renderg.obj \ $(OBJS)\corelib_richmsgdlgg.obj \ $(OBJS)\corelib_scrlwing.obj \ $(OBJS)\corelib_selstore.obj \ @@ -4223,7 +4220,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_droptgt.obj \ $(OBJS)\corelib_oleutils.obj \ $(OBJS)\corelib_palette.obj \ - $(OBJS)\corelib_panel.obj \ $(OBJS)\corelib_pen.obj \ $(OBJS)\corelib_popupwin.obj \ $(OBJS)\corelib_printdlg.obj \ @@ -4233,7 +4229,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_settings.obj \ $(OBJS)\corelib_tooltip.obj \ $(OBJS)\corelib_toplevel.obj \ - $(OBJS)\corelib_uiaction.obj \ + $(OBJS)\corelib_uiaction.obj \ $(OBJS)\corelib_utilsgui.obj \ $(OBJS)\corelib_uxtheme.obj \ $(OBJS)\corelib_window.obj \ @@ -4372,7 +4368,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_layout.obj \ $(OBJS)\corelib_lboxcmn.obj \ $(OBJS)\corelib_listctrlcmn.obj \ - $(OBJS)\corelib_markupparser.obj \ + $(OBJS)\corelib_markupparser.obj \ $(OBJS)\corelib_matrix.obj \ $(OBJS)\corelib_menucmn.obj \ $(OBJS)\corelib_mousemanager.obj \ @@ -4431,13 +4427,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_infobar.obj \ $(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_logg.obj \ - $(OBJS)\corelib_markuptext.obj \ - $(OBJS)\corelib_msgdlgg.obj \ - $(OBJS)\corelib_numdlgg.obj \ - $(OBJS)\corelib_panelg.obj \ - $(OBJS)\corelib_progdlgg.obj \ - $(OBJS)\corelib_printps.obj \ - $(OBJS)\corelib_renderg.obj \ + $(OBJS)\corelib_markuptext.obj \ + $(OBJS)\corelib_msgdlgg.obj \ + $(OBJS)\corelib_numdlgg.obj \ + $(OBJS)\corelib_panelg.obj \ + $(OBJS)\corelib_progdlgg.obj \ + $(OBJS)\corelib_printps.obj \ + $(OBJS)\corelib_renderg.obj \ $(OBJS)\corelib_richmsgdlgg.obj \ $(OBJS)\corelib_scrlwing.obj \ $(OBJS)\corelib_selstore.obj \ @@ -6944,6 +6940,9 @@ $(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_msw_panel.obj: ..\..\src\msw\panel.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\panel.cpp + $(OBJS)\monodll_progdlg.obj: ..\..\src\msw\progdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\progdlg.cpp @@ -7517,7 +7516,7 @@ $(OBJS)\monodll_gallery.obj: ..\..\src\ribbon\gallery.cpp $(OBJS)\monodll_page.obj: ..\..\src\ribbon\page.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\page.cpp -$(OBJS)\monodll_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp +$(OBJS)\monodll_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp $(OBJS)\monodll_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp @@ -7734,11 +7733,6 @@ $(OBJS)\monodll_palette.obj: ..\..\src\msw\palette.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_msw_panel.obj: ..\..\src\msw\panel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\panel.cpp -!endif - -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_pen.obj: ..\..\src\msw\pen.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\pen.cpp !endif @@ -7784,11 +7778,11 @@ $(OBJS)\monodll_toplevel.obj: ..\..\src\msw\toplevel.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_uiaction.obj: ..\..\src\msw\uiaction.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_uiaction.obj: ..\..\src\msw\uiaction.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp !endif @@ -8239,11 +8233,11 @@ $(OBJS)\monodll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_markupparser.obj: ..\..\src\common\markupparser.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\markupparser.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_markupparser.obj: ..\..\src\common\markupparser.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\markupparser.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_matrix.obj: ..\..\src\common\matrix.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\matrix.cpp !endif @@ -8534,11 +8528,11 @@ $(OBJS)\monodll_logg.obj: ..\..\src\generic\logg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_markuptext.obj: ..\..\src\generic\markuptext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\markuptext.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_markuptext.obj: ..\..\src\generic\markuptext.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\markuptext.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp !endif @@ -8549,11 +8543,11 @@ $(OBJS)\monodll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_panelg.obj: ..\..\src\generic\panelg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\panelg.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_panelg.obj: ..\..\src\generic\panelg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\panelg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp !endif @@ -9291,6 +9285,9 @@ $(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_msw_panel.obj: ..\..\src\msw\panel.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\panel.cpp + $(OBJS)\monolib_progdlg.obj: ..\..\src\msw\progdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp @@ -9864,7 +9861,7 @@ $(OBJS)\monolib_gallery.obj: ..\..\src\ribbon\gallery.cpp $(OBJS)\monolib_page.obj: ..\..\src\ribbon\page.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp -$(OBJS)\monolib_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp +$(OBJS)\monolib_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp $(OBJS)\monolib_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp @@ -10081,11 +10078,6 @@ $(OBJS)\monolib_palette.obj: ..\..\src\msw\palette.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_msw_panel.obj: ..\..\src\msw\panel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\panel.cpp -!endif - -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_pen.obj: ..\..\src\msw\pen.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\pen.cpp !endif @@ -10131,11 +10123,11 @@ $(OBJS)\monolib_toplevel.obj: ..\..\src\msw\toplevel.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_uiaction.obj: ..\..\src\msw\uiaction.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_uiaction.obj: ..\..\src\msw\uiaction.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp !endif @@ -10586,11 +10578,11 @@ $(OBJS)\monolib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_markupparser.obj: ..\..\src\common\markupparser.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\markupparser.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_markupparser.obj: ..\..\src\common\markupparser.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\markupparser.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_matrix.obj: ..\..\src\common\matrix.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\matrix.cpp !endif @@ -10881,11 +10873,11 @@ $(OBJS)\monolib_logg.obj: ..\..\src\generic\logg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_markuptext.obj: ..\..\src\generic\markuptext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\markuptext.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_markuptext.obj: ..\..\src\generic\markuptext.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\markuptext.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp !endif @@ -10896,11 +10888,11 @@ $(OBJS)\monolib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_panelg.obj: ..\..\src\generic\panelg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\panelg.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_panelg.obj: ..\..\src\generic\panelg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\panelg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp !endif @@ -12049,6 +12041,9 @@ $(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_panel.obj: ..\..\src\msw\panel.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\panel.cpp + $(OBJS)\coredll_progdlg.obj: ..\..\src\msw\progdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\progdlg.cpp @@ -12422,11 +12417,6 @@ $(OBJS)\coredll_palette.obj: ..\..\src\msw\palette.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_panel.obj: ..\..\src\msw\panel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\panel.cpp -!endif - -!if "$(USE_GUI)" == "1" $(OBJS)\coredll_pen.obj: ..\..\src\msw\pen.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\pen.cpp !endif @@ -12472,11 +12462,11 @@ $(OBJS)\coredll_toplevel.obj: ..\..\src\msw\toplevel.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_uiaction.obj: ..\..\src\msw\uiaction.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_uiaction.obj: ..\..\src\msw\uiaction.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp !endif @@ -12927,11 +12917,11 @@ $(OBJS)\coredll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_markupparser.obj: ..\..\src\common\markupparser.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\markupparser.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_markupparser.obj: ..\..\src\common\markupparser.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\markupparser.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_matrix.obj: ..\..\src\common\matrix.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\matrix.cpp !endif @@ -13222,11 +13212,11 @@ $(OBJS)\coredll_logg.obj: ..\..\src\generic\logg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_markuptext.obj: ..\..\src\generic\markuptext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\markuptext.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_markuptext.obj: ..\..\src\generic\markuptext.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\markuptext.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp !endif @@ -13237,11 +13227,11 @@ $(OBJS)\coredll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_panelg.obj: ..\..\src\generic\panelg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\panelg.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_panelg.obj: ..\..\src\generic\panelg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\panelg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp !endif @@ -13451,6 +13441,9 @@ $(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_panel.obj: ..\..\src\msw\panel.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\panel.cpp + $(OBJS)\corelib_progdlg.obj: ..\..\src\msw\progdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp @@ -13824,11 +13817,6 @@ $(OBJS)\corelib_palette.obj: ..\..\src\msw\palette.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_panel.obj: ..\..\src\msw\panel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\panel.cpp -!endif - -!if "$(USE_GUI)" == "1" $(OBJS)\corelib_pen.obj: ..\..\src\msw\pen.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\pen.cpp !endif @@ -13874,11 +13862,11 @@ $(OBJS)\corelib_toplevel.obj: ..\..\src\msw\toplevel.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_uiaction.obj: ..\..\src\msw\uiaction.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_uiaction.obj: ..\..\src\msw\uiaction.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp !endif @@ -14329,11 +14317,11 @@ $(OBJS)\corelib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_markupparser.obj: ..\..\src\common\markupparser.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\markupparser.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_markupparser.obj: ..\..\src\common\markupparser.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\markupparser.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_matrix.obj: ..\..\src\common\matrix.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\matrix.cpp !endif @@ -14624,11 +14612,11 @@ $(OBJS)\corelib_logg.obj: ..\..\src\generic\logg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_markuptext.obj: ..\..\src\generic\markuptext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\markuptext.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_markuptext.obj: ..\..\src\generic\markuptext.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\markuptext.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp !endif @@ -14639,11 +14627,11 @@ $(OBJS)\corelib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_panelg.obj: ..\..\src\generic\panelg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\panelg.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_panelg.obj: ..\..\src\generic\panelg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\panelg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp !endif diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index d27edd2b75..1445bfec72 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -222,7 +222,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_ribbon_control.obj & $(OBJS)\monodll_gallery.obj & $(OBJS)\monodll_page.obj & - $(OBJS)\monodll_ribbon_panel.obj & + $(OBJS)\monodll_ribbon_panel.obj & $(OBJS)\monodll_ribbon_toolbar.obj & $(OBJS)\monodll_richtextctrl.obj & $(OBJS)\monodll_richtextbuffer.obj & @@ -275,7 +275,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_droptgt.obj & $(OBJS)\monodll_oleutils.obj & $(OBJS)\monodll_palette.obj & - $(OBJS)\monodll_msw_panel.obj & $(OBJS)\monodll_pen.obj & $(OBJS)\monodll_popupwin.obj & $(OBJS)\monodll_printdlg.obj & @@ -285,7 +284,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_settings.obj & $(OBJS)\monodll_tooltip.obj & $(OBJS)\monodll_toplevel.obj & - $(OBJS)\monodll_uiaction.obj & + $(OBJS)\monodll_uiaction.obj & $(OBJS)\monodll_utilsgui.obj & $(OBJS)\monodll_uxtheme.obj & $(OBJS)\monodll_window.obj & @@ -329,6 +328,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_msw_notebook.obj & $(OBJS)\monodll_access.obj & $(OBJS)\monodll_ownerdrw.obj & + $(OBJS)\monodll_msw_panel.obj & $(OBJS)\monodll_progdlg.obj & $(OBJS)\monodll_msw_radiobox.obj & $(OBJS)\monodll_msw_radiobut.obj & @@ -428,7 +428,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_layout.obj & $(OBJS)\monodll_lboxcmn.obj & $(OBJS)\monodll_listctrlcmn.obj & - $(OBJS)\monodll_markupparser.obj & + $(OBJS)\monodll_markupparser.obj & $(OBJS)\monodll_matrix.obj & $(OBJS)\monodll_menucmn.obj & $(OBJS)\monodll_mousemanager.obj & @@ -487,13 +487,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_infobar.obj & $(OBJS)\monodll_listbkg.obj & $(OBJS)\monodll_logg.obj & - $(OBJS)\monodll_markuptext.obj & - $(OBJS)\monodll_msgdlgg.obj & - $(OBJS)\monodll_numdlgg.obj & - $(OBJS)\monodll_panelg.obj & - $(OBJS)\monodll_progdlgg.obj & - $(OBJS)\monodll_printps.obj & - $(OBJS)\monodll_renderg.obj & + $(OBJS)\monodll_markuptext.obj & + $(OBJS)\monodll_msgdlgg.obj & + $(OBJS)\monodll_numdlgg.obj & + $(OBJS)\monodll_panelg.obj & + $(OBJS)\monodll_progdlgg.obj & + $(OBJS)\monodll_printps.obj & + $(OBJS)\monodll_renderg.obj & $(OBJS)\monodll_richmsgdlgg.obj & $(OBJS)\monodll_scrlwing.obj & $(OBJS)\monodll_selstore.obj & @@ -547,7 +547,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_droptgt.obj & $(OBJS)\monodll_oleutils.obj & $(OBJS)\monodll_palette.obj & - $(OBJS)\monodll_msw_panel.obj & $(OBJS)\monodll_pen.obj & $(OBJS)\monodll_popupwin.obj & $(OBJS)\monodll_printdlg.obj & @@ -557,7 +556,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_settings.obj & $(OBJS)\monodll_tooltip.obj & $(OBJS)\monodll_toplevel.obj & - $(OBJS)\monodll_uiaction.obj & + $(OBJS)\monodll_uiaction.obj & $(OBJS)\monodll_utilsgui.obj & $(OBJS)\monodll_uxtheme.obj & $(OBJS)\monodll_window.obj & @@ -696,7 +695,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_layout.obj & $(OBJS)\monodll_lboxcmn.obj & $(OBJS)\monodll_listctrlcmn.obj & - $(OBJS)\monodll_markupparser.obj & + $(OBJS)\monodll_markupparser.obj & $(OBJS)\monodll_matrix.obj & $(OBJS)\monodll_menucmn.obj & $(OBJS)\monodll_mousemanager.obj & @@ -755,13 +754,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_infobar.obj & $(OBJS)\monodll_listbkg.obj & $(OBJS)\monodll_logg.obj & - $(OBJS)\monodll_markuptext.obj & - $(OBJS)\monodll_msgdlgg.obj & - $(OBJS)\monodll_numdlgg.obj & - $(OBJS)\monodll_panelg.obj & - $(OBJS)\monodll_progdlgg.obj & - $(OBJS)\monodll_printps.obj & - $(OBJS)\monodll_renderg.obj & + $(OBJS)\monodll_markuptext.obj & + $(OBJS)\monodll_msgdlgg.obj & + $(OBJS)\monodll_numdlgg.obj & + $(OBJS)\monodll_panelg.obj & + $(OBJS)\monodll_progdlgg.obj & + $(OBJS)\monodll_printps.obj & + $(OBJS)\monodll_renderg.obj & $(OBJS)\monodll_richmsgdlgg.obj & $(OBJS)\monodll_scrlwing.obj & $(OBJS)\monodll_selstore.obj & @@ -996,7 +995,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_ribbon_control.obj & $(OBJS)\monolib_gallery.obj & $(OBJS)\monolib_page.obj & - $(OBJS)\monolib_ribbon_panel.obj & + $(OBJS)\monolib_ribbon_panel.obj & $(OBJS)\monolib_ribbon_toolbar.obj & $(OBJS)\monolib_richtextctrl.obj & $(OBJS)\monolib_richtextbuffer.obj & @@ -1049,7 +1048,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_droptgt.obj & $(OBJS)\monolib_oleutils.obj & $(OBJS)\monolib_palette.obj & - $(OBJS)\monolib_msw_panel.obj & $(OBJS)\monolib_pen.obj & $(OBJS)\monolib_popupwin.obj & $(OBJS)\monolib_printdlg.obj & @@ -1059,7 +1057,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_settings.obj & $(OBJS)\monolib_tooltip.obj & $(OBJS)\monolib_toplevel.obj & - $(OBJS)\monolib_uiaction.obj & + $(OBJS)\monolib_uiaction.obj & $(OBJS)\monolib_utilsgui.obj & $(OBJS)\monolib_uxtheme.obj & $(OBJS)\monolib_window.obj & @@ -1103,6 +1101,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_msw_notebook.obj & $(OBJS)\monolib_access.obj & $(OBJS)\monolib_ownerdrw.obj & + $(OBJS)\monolib_msw_panel.obj & $(OBJS)\monolib_progdlg.obj & $(OBJS)\monolib_msw_radiobox.obj & $(OBJS)\monolib_msw_radiobut.obj & @@ -1202,7 +1201,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_layout.obj & $(OBJS)\monolib_lboxcmn.obj & $(OBJS)\monolib_listctrlcmn.obj & - $(OBJS)\monolib_markupparser.obj & + $(OBJS)\monolib_markupparser.obj & $(OBJS)\monolib_matrix.obj & $(OBJS)\monolib_menucmn.obj & $(OBJS)\monolib_mousemanager.obj & @@ -1261,13 +1260,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_infobar.obj & $(OBJS)\monolib_listbkg.obj & $(OBJS)\monolib_logg.obj & - $(OBJS)\monolib_markuptext.obj & - $(OBJS)\monolib_msgdlgg.obj & - $(OBJS)\monolib_numdlgg.obj & - $(OBJS)\monolib_panelg.obj & - $(OBJS)\monolib_progdlgg.obj & - $(OBJS)\monolib_printps.obj & - $(OBJS)\monolib_renderg.obj & + $(OBJS)\monolib_markuptext.obj & + $(OBJS)\monolib_msgdlgg.obj & + $(OBJS)\monolib_numdlgg.obj & + $(OBJS)\monolib_panelg.obj & + $(OBJS)\monolib_progdlgg.obj & + $(OBJS)\monolib_printps.obj & + $(OBJS)\monolib_renderg.obj & $(OBJS)\monolib_richmsgdlgg.obj & $(OBJS)\monolib_scrlwing.obj & $(OBJS)\monolib_selstore.obj & @@ -1321,7 +1320,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_droptgt.obj & $(OBJS)\monolib_oleutils.obj & $(OBJS)\monolib_palette.obj & - $(OBJS)\monolib_msw_panel.obj & $(OBJS)\monolib_pen.obj & $(OBJS)\monolib_popupwin.obj & $(OBJS)\monolib_printdlg.obj & @@ -1331,7 +1329,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_settings.obj & $(OBJS)\monolib_tooltip.obj & $(OBJS)\monolib_toplevel.obj & - $(OBJS)\monolib_uiaction.obj & + $(OBJS)\monolib_uiaction.obj & $(OBJS)\monolib_utilsgui.obj & $(OBJS)\monolib_uxtheme.obj & $(OBJS)\monolib_window.obj & @@ -1470,7 +1468,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_layout.obj & $(OBJS)\monolib_lboxcmn.obj & $(OBJS)\monolib_listctrlcmn.obj & - $(OBJS)\monolib_markupparser.obj & + $(OBJS)\monolib_markupparser.obj & $(OBJS)\monolib_matrix.obj & $(OBJS)\monolib_menucmn.obj & $(OBJS)\monolib_mousemanager.obj & @@ -1529,13 +1527,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_infobar.obj & $(OBJS)\monolib_listbkg.obj & $(OBJS)\monolib_logg.obj & - $(OBJS)\monolib_markuptext.obj & - $(OBJS)\monolib_msgdlgg.obj & - $(OBJS)\monolib_numdlgg.obj & - $(OBJS)\monolib_panelg.obj & - $(OBJS)\monolib_progdlgg.obj & - $(OBJS)\monolib_printps.obj & - $(OBJS)\monolib_renderg.obj & + $(OBJS)\monolib_markuptext.obj & + $(OBJS)\monolib_msgdlgg.obj & + $(OBJS)\monolib_numdlgg.obj & + $(OBJS)\monolib_panelg.obj & + $(OBJS)\monolib_progdlgg.obj & + $(OBJS)\monolib_printps.obj & + $(OBJS)\monolib_renderg.obj & $(OBJS)\monolib_richmsgdlgg.obj & $(OBJS)\monolib_scrlwing.obj & $(OBJS)\monolib_selstore.obj & @@ -1727,7 +1725,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_droptgt.obj & $(OBJS)\coredll_oleutils.obj & $(OBJS)\coredll_palette.obj & - $(OBJS)\coredll_panel.obj & $(OBJS)\coredll_pen.obj & $(OBJS)\coredll_popupwin.obj & $(OBJS)\coredll_printdlg.obj & @@ -1737,7 +1734,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_settings.obj & $(OBJS)\coredll_tooltip.obj & $(OBJS)\coredll_toplevel.obj & - $(OBJS)\coredll_uiaction.obj & + $(OBJS)\coredll_uiaction.obj & $(OBJS)\coredll_utilsgui.obj & $(OBJS)\coredll_uxtheme.obj & $(OBJS)\coredll_window.obj & @@ -1781,6 +1778,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_msw_notebook.obj & $(OBJS)\coredll_access.obj & $(OBJS)\coredll_ownerdrw.obj & + $(OBJS)\coredll_panel.obj & $(OBJS)\coredll_progdlg.obj & $(OBJS)\coredll_msw_radiobox.obj & $(OBJS)\coredll_msw_radiobut.obj & @@ -1880,7 +1878,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_layout.obj & $(OBJS)\coredll_lboxcmn.obj & $(OBJS)\coredll_listctrlcmn.obj & - $(OBJS)\coredll_markupparser.obj & + $(OBJS)\coredll_markupparser.obj & $(OBJS)\coredll_matrix.obj & $(OBJS)\coredll_menucmn.obj & $(OBJS)\coredll_mousemanager.obj & @@ -1939,13 +1937,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_infobar.obj & $(OBJS)\coredll_listbkg.obj & $(OBJS)\coredll_logg.obj & - $(OBJS)\coredll_markuptext.obj & - $(OBJS)\coredll_msgdlgg.obj & - $(OBJS)\coredll_numdlgg.obj & - $(OBJS)\coredll_panelg.obj & - $(OBJS)\coredll_progdlgg.obj & - $(OBJS)\coredll_printps.obj & - $(OBJS)\coredll_renderg.obj & + $(OBJS)\coredll_markuptext.obj & + $(OBJS)\coredll_msgdlgg.obj & + $(OBJS)\coredll_numdlgg.obj & + $(OBJS)\coredll_panelg.obj & + $(OBJS)\coredll_progdlgg.obj & + $(OBJS)\coredll_printps.obj & + $(OBJS)\coredll_renderg.obj & $(OBJS)\coredll_richmsgdlgg.obj & $(OBJS)\coredll_scrlwing.obj & $(OBJS)\coredll_selstore.obj & @@ -1999,7 +1997,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_droptgt.obj & $(OBJS)\coredll_oleutils.obj & $(OBJS)\coredll_palette.obj & - $(OBJS)\coredll_panel.obj & $(OBJS)\coredll_pen.obj & $(OBJS)\coredll_popupwin.obj & $(OBJS)\coredll_printdlg.obj & @@ -2009,7 +2006,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_settings.obj & $(OBJS)\coredll_tooltip.obj & $(OBJS)\coredll_toplevel.obj & - $(OBJS)\coredll_uiaction.obj & + $(OBJS)\coredll_uiaction.obj & $(OBJS)\coredll_utilsgui.obj & $(OBJS)\coredll_uxtheme.obj & $(OBJS)\coredll_window.obj & @@ -2148,7 +2145,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_layout.obj & $(OBJS)\coredll_lboxcmn.obj & $(OBJS)\coredll_listctrlcmn.obj & - $(OBJS)\coredll_markupparser.obj & + $(OBJS)\coredll_markupparser.obj & $(OBJS)\coredll_matrix.obj & $(OBJS)\coredll_menucmn.obj & $(OBJS)\coredll_mousemanager.obj & @@ -2207,13 +2204,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_infobar.obj & $(OBJS)\coredll_listbkg.obj & $(OBJS)\coredll_logg.obj & - $(OBJS)\coredll_markuptext.obj & - $(OBJS)\coredll_msgdlgg.obj & - $(OBJS)\coredll_numdlgg.obj & - $(OBJS)\coredll_panelg.obj & - $(OBJS)\coredll_progdlgg.obj & - $(OBJS)\coredll_printps.obj & - $(OBJS)\coredll_renderg.obj & + $(OBJS)\coredll_markuptext.obj & + $(OBJS)\coredll_msgdlgg.obj & + $(OBJS)\coredll_numdlgg.obj & + $(OBJS)\coredll_panelg.obj & + $(OBJS)\coredll_progdlgg.obj & + $(OBJS)\coredll_printps.obj & + $(OBJS)\coredll_renderg.obj & $(OBJS)\coredll_richmsgdlgg.obj & $(OBJS)\coredll_scrlwing.obj & $(OBJS)\coredll_selstore.obj & @@ -2277,7 +2274,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_droptgt.obj & $(OBJS)\corelib_oleutils.obj & $(OBJS)\corelib_palette.obj & - $(OBJS)\corelib_panel.obj & $(OBJS)\corelib_pen.obj & $(OBJS)\corelib_popupwin.obj & $(OBJS)\corelib_printdlg.obj & @@ -2287,7 +2283,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_settings.obj & $(OBJS)\corelib_tooltip.obj & $(OBJS)\corelib_toplevel.obj & - $(OBJS)\corelib_uiaction.obj & + $(OBJS)\corelib_uiaction.obj & $(OBJS)\corelib_utilsgui.obj & $(OBJS)\corelib_uxtheme.obj & $(OBJS)\corelib_window.obj & @@ -2331,6 +2327,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_msw_notebook.obj & $(OBJS)\corelib_access.obj & $(OBJS)\corelib_ownerdrw.obj & + $(OBJS)\corelib_panel.obj & $(OBJS)\corelib_progdlg.obj & $(OBJS)\corelib_msw_radiobox.obj & $(OBJS)\corelib_msw_radiobut.obj & @@ -2430,7 +2427,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_layout.obj & $(OBJS)\corelib_lboxcmn.obj & $(OBJS)\corelib_listctrlcmn.obj & - $(OBJS)\corelib_markupparser.obj & + $(OBJS)\corelib_markupparser.obj & $(OBJS)\corelib_matrix.obj & $(OBJS)\corelib_menucmn.obj & $(OBJS)\corelib_mousemanager.obj & @@ -2489,13 +2486,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_infobar.obj & $(OBJS)\corelib_listbkg.obj & $(OBJS)\corelib_logg.obj & - $(OBJS)\corelib_markuptext.obj & - $(OBJS)\corelib_msgdlgg.obj & - $(OBJS)\corelib_numdlgg.obj & - $(OBJS)\corelib_panelg.obj & - $(OBJS)\corelib_progdlgg.obj & - $(OBJS)\corelib_printps.obj & - $(OBJS)\corelib_renderg.obj & + $(OBJS)\corelib_markuptext.obj & + $(OBJS)\corelib_msgdlgg.obj & + $(OBJS)\corelib_numdlgg.obj & + $(OBJS)\corelib_panelg.obj & + $(OBJS)\corelib_progdlgg.obj & + $(OBJS)\corelib_printps.obj & + $(OBJS)\corelib_renderg.obj & $(OBJS)\corelib_richmsgdlgg.obj & $(OBJS)\corelib_scrlwing.obj & $(OBJS)\corelib_selstore.obj & @@ -2549,7 +2546,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_droptgt.obj & $(OBJS)\corelib_oleutils.obj & $(OBJS)\corelib_palette.obj & - $(OBJS)\corelib_panel.obj & $(OBJS)\corelib_pen.obj & $(OBJS)\corelib_popupwin.obj & $(OBJS)\corelib_printdlg.obj & @@ -2559,7 +2555,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_settings.obj & $(OBJS)\corelib_tooltip.obj & $(OBJS)\corelib_toplevel.obj & - $(OBJS)\corelib_uiaction.obj & + $(OBJS)\corelib_uiaction.obj & $(OBJS)\corelib_utilsgui.obj & $(OBJS)\corelib_uxtheme.obj & $(OBJS)\corelib_window.obj & @@ -2698,7 +2694,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_layout.obj & $(OBJS)\corelib_lboxcmn.obj & $(OBJS)\corelib_listctrlcmn.obj & - $(OBJS)\corelib_markupparser.obj & + $(OBJS)\corelib_markupparser.obj & $(OBJS)\corelib_matrix.obj & $(OBJS)\corelib_menucmn.obj & $(OBJS)\corelib_mousemanager.obj & @@ -2757,13 +2753,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_infobar.obj & $(OBJS)\corelib_listbkg.obj & $(OBJS)\corelib_logg.obj & - $(OBJS)\corelib_markuptext.obj & - $(OBJS)\corelib_msgdlgg.obj & - $(OBJS)\corelib_numdlgg.obj & - $(OBJS)\corelib_panelg.obj & - $(OBJS)\corelib_progdlgg.obj & - $(OBJS)\corelib_printps.obj & - $(OBJS)\corelib_renderg.obj & + $(OBJS)\corelib_markuptext.obj & + $(OBJS)\corelib_msgdlgg.obj & + $(OBJS)\corelib_numdlgg.obj & + $(OBJS)\corelib_panelg.obj & + $(OBJS)\corelib_progdlgg.obj & + $(OBJS)\corelib_printps.obj & + $(OBJS)\corelib_renderg.obj & $(OBJS)\corelib_richmsgdlgg.obj & $(OBJS)\corelib_scrlwing.obj & $(OBJS)\corelib_selstore.obj & @@ -6773,6 +6769,9 @@ $(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_msw_panel.obj : .AUTODEPEND ..\..\src\msw\panel.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_progdlg.obj : .AUTODEPEND ..\..\src\msw\progdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7346,7 +7345,7 @@ $(OBJS)\monodll_gallery.obj : .AUTODEPEND ..\..\src\ribbon\gallery.cpp $(OBJS)\monodll_page.obj : .AUTODEPEND ..\..\src\ribbon\page.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_ribbon_panel.obj : .AUTODEPEND ..\..\src\ribbon\panel.cpp +$(OBJS)\monodll_ribbon_panel.obj : .AUTODEPEND ..\..\src\ribbon\panel.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_ribbon_toolbar.obj : .AUTODEPEND ..\..\src\ribbon\toolbar.cpp @@ -7563,11 +7562,6 @@ $(OBJS)\monodll_palette.obj : .AUTODEPEND ..\..\src\msw\palette.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_msw_panel.obj : .AUTODEPEND ..\..\src\msw\panel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 $(OBJS)\monodll_pen.obj : .AUTODEPEND ..\..\src\msw\pen.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -7613,11 +7607,11 @@ $(OBJS)\monodll_toplevel.obj : .AUTODEPEND ..\..\src\msw\toplevel.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_uiaction.obj : .AUTODEPEND ..\..\src\msw\uiaction.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 +$(OBJS)\monodll_uiaction.obj : .AUTODEPEND ..\..\src\msw\uiaction.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\monodll_utilsgui.obj : .AUTODEPEND ..\..\src\msw\utilsgui.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -8068,11 +8062,11 @@ $(OBJS)\monodll_listctrlcmn.obj : .AUTODEPEND ..\..\src\common\listctrlcmn.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_markupparser.obj : .AUTODEPEND ..\..\src\common\markupparser.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 +$(OBJS)\monodll_markupparser.obj : .AUTODEPEND ..\..\src\common\markupparser.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\monodll_matrix.obj : .AUTODEPEND ..\..\src\common\matrix.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -8363,26 +8357,26 @@ $(OBJS)\monodll_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_markuptext.obj : .AUTODEPEND ..\..\src\generic\markuptext.cpp +$(OBJS)\monodll_markuptext.obj : .AUTODEPEND ..\..\src\generic\markuptext.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp +$(OBJS)\monodll_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp +$(OBJS)\monodll_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 $(OBJS)\monodll_progdlgg.obj : .AUTODEPEND ..\..\src\generic\progdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -9120,6 +9114,9 @@ $(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_msw_panel.obj : .AUTODEPEND ..\..\src\msw\panel.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_progdlg.obj : .AUTODEPEND ..\..\src\msw\progdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -9693,7 +9690,7 @@ $(OBJS)\monolib_gallery.obj : .AUTODEPEND ..\..\src\ribbon\gallery.cpp $(OBJS)\monolib_page.obj : .AUTODEPEND ..\..\src\ribbon\page.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_ribbon_panel.obj : .AUTODEPEND ..\..\src\ribbon\panel.cpp +$(OBJS)\monolib_ribbon_panel.obj : .AUTODEPEND ..\..\src\ribbon\panel.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_ribbon_toolbar.obj : .AUTODEPEND ..\..\src\ribbon\toolbar.cpp @@ -9910,11 +9907,6 @@ $(OBJS)\monolib_palette.obj : .AUTODEPEND ..\..\src\msw\palette.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_msw_panel.obj : .AUTODEPEND ..\..\src\msw\panel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 $(OBJS)\monolib_pen.obj : .AUTODEPEND ..\..\src\msw\pen.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -9960,11 +9952,11 @@ $(OBJS)\monolib_toplevel.obj : .AUTODEPEND ..\..\src\msw\toplevel.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_uiaction.obj : .AUTODEPEND ..\..\src\msw\uiaction.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 +$(OBJS)\monolib_uiaction.obj : .AUTODEPEND ..\..\src\msw\uiaction.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\monolib_utilsgui.obj : .AUTODEPEND ..\..\src\msw\utilsgui.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -10415,11 +10407,11 @@ $(OBJS)\monolib_listctrlcmn.obj : .AUTODEPEND ..\..\src\common\listctrlcmn.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_markupparser.obj : .AUTODEPEND ..\..\src\common\markupparser.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 +$(OBJS)\monolib_markupparser.obj : .AUTODEPEND ..\..\src\common\markupparser.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\monolib_matrix.obj : .AUTODEPEND ..\..\src\common\matrix.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -10710,26 +10702,26 @@ $(OBJS)\monolib_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_markuptext.obj : .AUTODEPEND ..\..\src\generic\markuptext.cpp +$(OBJS)\monolib_markuptext.obj : .AUTODEPEND ..\..\src\generic\markuptext.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp +$(OBJS)\monolib_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp +$(OBJS)\monolib_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 $(OBJS)\monolib_progdlgg.obj : .AUTODEPEND ..\..\src\generic\progdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -11878,6 +11870,9 @@ $(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_panel.obj : .AUTODEPEND ..\..\src\msw\panel.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_progdlg.obj : .AUTODEPEND ..\..\src\msw\progdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -12251,11 +12246,6 @@ $(OBJS)\coredll_palette.obj : .AUTODEPEND ..\..\src\msw\palette.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_panel.obj : .AUTODEPEND ..\..\src\msw\panel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 $(OBJS)\coredll_pen.obj : .AUTODEPEND ..\..\src\msw\pen.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif @@ -12301,11 +12291,11 @@ $(OBJS)\coredll_toplevel.obj : .AUTODEPEND ..\..\src\msw\toplevel.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_uiaction.obj : .AUTODEPEND ..\..\src\msw\uiaction.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 +$(OBJS)\coredll_uiaction.obj : .AUTODEPEND ..\..\src\msw\uiaction.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\coredll_utilsgui.obj : .AUTODEPEND ..\..\src\msw\utilsgui.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif @@ -12756,11 +12746,11 @@ $(OBJS)\coredll_listctrlcmn.obj : .AUTODEPEND ..\..\src\common\listctrlcmn.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_markupparser.obj : .AUTODEPEND ..\..\src\common\markupparser.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 +$(OBJS)\coredll_markupparser.obj : .AUTODEPEND ..\..\src\common\markupparser.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\coredll_matrix.obj : .AUTODEPEND ..\..\src\common\matrix.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif @@ -13051,26 +13041,26 @@ $(OBJS)\coredll_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_markuptext.obj : .AUTODEPEND ..\..\src\generic\markuptext.cpp +$(OBJS)\coredll_markuptext.obj : .AUTODEPEND ..\..\src\generic\markuptext.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp +$(OBJS)\coredll_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp +$(OBJS)\coredll_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 $(OBJS)\coredll_progdlgg.obj : .AUTODEPEND ..\..\src\generic\progdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif @@ -13280,6 +13270,9 @@ $(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_panel.obj : .AUTODEPEND ..\..\src\msw\panel.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_progdlg.obj : .AUTODEPEND ..\..\src\msw\progdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -13653,11 +13646,6 @@ $(OBJS)\corelib_palette.obj : .AUTODEPEND ..\..\src\msw\palette.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_panel.obj : .AUTODEPEND ..\..\src\msw\panel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 $(OBJS)\corelib_pen.obj : .AUTODEPEND ..\..\src\msw\pen.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif @@ -13703,11 +13691,11 @@ $(OBJS)\corelib_toplevel.obj : .AUTODEPEND ..\..\src\msw\toplevel.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_uiaction.obj : .AUTODEPEND ..\..\src\msw\uiaction.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 +$(OBJS)\corelib_uiaction.obj : .AUTODEPEND ..\..\src\msw\uiaction.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\corelib_utilsgui.obj : .AUTODEPEND ..\..\src\msw\utilsgui.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif @@ -14158,11 +14146,11 @@ $(OBJS)\corelib_listctrlcmn.obj : .AUTODEPEND ..\..\src\common\listctrlcmn.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_markupparser.obj : .AUTODEPEND ..\..\src\common\markupparser.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 +$(OBJS)\corelib_markupparser.obj : .AUTODEPEND ..\..\src\common\markupparser.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\corelib_matrix.obj : .AUTODEPEND ..\..\src\common\matrix.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif @@ -14453,26 +14441,26 @@ $(OBJS)\corelib_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_markuptext.obj : .AUTODEPEND ..\..\src\generic\markuptext.cpp +$(OBJS)\corelib_markuptext.obj : .AUTODEPEND ..\..\src\generic\markuptext.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp +$(OBJS)\corelib_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp +$(OBJS)\corelib_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 $(OBJS)\corelib_progdlgg.obj : .AUTODEPEND ..\..\src\generic\progdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index cfb0d02cb4..e5032676c5 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -566,10 +566,10 @@ SOURCE=..\..\src\common\listctrlcmn.cpp # End Source File # Begin Source File -SOURCE=..\..\src\common\markupparser.cpp -# End Source File -# Begin Source File - +SOURCE=..\..\src\common\markupparser.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\matrix.cpp # End Source File # Begin Source File @@ -2073,10 +2073,41 @@ SOURCE=..\..\src\msw\palette.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\panel.cpp -# End Source File -# Begin Source File - +SOURCE=..\..\src\msw\panel.cpp + +!IF "$(CFG)" == "core - Win32 DLL Universal Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Release" + + +!ELSEIF "$(CFG)" == "core - Win32 Debug" + + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=..\..\src\msw\pen.cpp # End Source File # Begin Source File @@ -3123,10 +3154,10 @@ SOURCE=..\..\src\generic\logg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\markuptext.cpp -# End Source File -# Begin Source File - +SOURCE=..\..\src\generic\markuptext.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\generic\mdig.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -3170,10 +3201,10 @@ SOURCE=..\..\src\generic\numdlgg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\panelg.cpp -# End Source File -# Begin Source File - +SOURCE=..\..\src\generic\panelg.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\generic\printps.cpp # End Source File # Begin Source File @@ -5222,6 +5253,10 @@ SOURCE=..\..\include\wx\msw\palette.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\panel.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\pen.h # End Source File # Begin Source File @@ -5682,10 +5717,10 @@ SOURCE=..\..\include\wx\univ\notebook.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\panel.h -# End Source File -# Begin Source File - +SOURCE=..\..\include\wx\univ\panel.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\univ\radiobox.h # End Source File # Begin Source File diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index cb6d859d93..01639cb3b1 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -817,9 +817,9 @@ RelativePath="..\..\src\common\listctrlcmn.cpp"> - - + + - - + + + + + + - - + + - - + + + + @@ -4858,9 +4873,9 @@ RelativePath="..\..\include\wx\univ\notebook.h"> - - + + - - + + @@ -2616,10 +2616,26 @@ > - - + + + + + + @@ -3757,10 +3773,10 @@ > - - + + - - + + @@ -6035,6 +6051,10 @@ RelativePath="..\..\include\wx\msw\palette.h" > + + @@ -6498,10 +6518,10 @@ > - - + + diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index 298bad8643..4713e649fc 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -1119,10 +1119,10 @@ > - - + + @@ -2612,10 +2612,26 @@ > - - + + + + + + @@ -3753,10 +3769,10 @@ > - - + + - - + + @@ -6031,6 +6047,10 @@ RelativePath="..\..\include\wx\msw\palette.h" > + + @@ -6494,10 +6514,10 @@ > - - + +