From 5b87bd6c0b694fa7634e7a16ed030033ff8e8bdd Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 20 Mar 2011 00:00:38 +0000 Subject: [PATCH] Split wxPanel in wxPanelBase and platform-specific files. So far we have only wxMSW-specific implementation (and also a trivial wxUniv-specific one) but it's still tidier to have all platform-specific code in separate files, especially as we're going to have more of it for wxMSW soon. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 69 ++++++++++++++-------- build/bakefiles/files.bkl | 3 +- build/msw/makefile.bcc | 64 ++++++++++----------- build/msw/makefile.gcc | 80 +++++++++++++------------- build/msw/makefile.vc | 64 ++++++++++----------- build/msw/makefile.wat | 80 +++++++++++++------------- build/msw/wx_core.dsp | 12 ++-- build/msw/wx_vc7_core.vcproj | 9 ++- build/msw/wx_vc8_core.vcproj | 12 ++-- build/msw/wx_vc9_core.vcproj | 12 ++-- include/wx/generic/panelg.h | 68 ++-------------------- include/wx/msw/panel.h | 50 ++++++++++++++++ include/wx/panel.h | 62 +++++++++++++++++++- include/wx/univ/panel.h | 47 +++++++++++++++ src/common/panelcmn.cpp | 49 ++++++++++++++++ src/generic/panelg.cpp | 107 ----------------------------------- src/msw/panel.cpp | 46 +++++++++++++++ 17 files changed, 479 insertions(+), 355 deletions(-) create mode 100644 include/wx/msw/panel.h create mode 100644 include/wx/univ/panel.h delete mode 100644 src/generic/panelg.cpp create mode 100644 src/msw/panel.cpp diff --git a/Makefile.in b/Makefile.in index 9c1aef16f3..92c9649f61 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3807,6 +3807,7 @@ COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS = \ wx/univ/menu.h \ wx/univ/menuitem.h \ wx/univ/notebook.h \ + wx/univ/panel.h \ wx/univ/radiobox.h \ wx/univ/radiobut.h \ wx/univ/renderer.h \ @@ -4455,7 +4456,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_ribbon_control.o \ monodll_gallery.o \ monodll_page.o \ - monodll_panel.o \ + monodll_ribbon_panel.o \ monodll_ribbon_toolbar.o \ monodll_richtextctrl.o \ monodll_richtextbuffer.o \ @@ -4615,7 +4616,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_markuptext.o \ monodll_msgdlgg.o \ monodll_numdlgg.o \ - monodll_panelg.o \ monodll_progdlgg.o \ monodll_printps.o \ monodll_renderg.o \ @@ -4831,7 +4831,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_markuptext.o \ monodll_msgdlgg.o \ monodll_numdlgg.o \ - monodll_panelg.o \ monodll_progdlgg.o \ monodll_printps.o \ monodll_renderg.o \ @@ -5048,6 +5047,7 @@ 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 \ @@ -5107,6 +5107,7 @@ 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 \ @@ -5920,6 +5921,7 @@ 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 \ @@ -5979,6 +5981,7 @@ 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 \ @@ -6373,7 +6376,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_ribbon_control.o \ monolib_gallery.o \ monolib_page.o \ - monolib_panel.o \ + monolib_ribbon_panel.o \ monolib_ribbon_toolbar.o \ monolib_richtextctrl.o \ monolib_richtextbuffer.o \ @@ -6533,7 +6536,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_markuptext.o \ monolib_msgdlgg.o \ monolib_numdlgg.o \ - monolib_panelg.o \ monolib_progdlgg.o \ monolib_printps.o \ monolib_renderg.o \ @@ -6749,7 +6751,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_markuptext.o \ monolib_msgdlgg.o \ monolib_numdlgg.o \ - monolib_panelg.o \ monolib_progdlgg.o \ monolib_printps.o \ monolib_renderg.o \ @@ -6966,6 +6967,7 @@ 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 \ @@ -7025,6 +7027,7 @@ 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 \ @@ -7838,6 +7841,7 @@ 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 \ @@ -7897,6 +7901,7 @@ 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 \ @@ -8635,7 +8640,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_markuptext.o \ coredll_msgdlgg.o \ coredll_numdlgg.o \ - coredll_panelg.o \ coredll_progdlgg.o \ coredll_printps.o \ coredll_renderg.o \ @@ -8851,7 +8855,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_markuptext.o \ coredll_msgdlgg.o \ coredll_numdlgg.o \ - coredll_panelg.o \ coredll_progdlgg.o \ coredll_printps.o \ coredll_renderg.o \ @@ -9068,6 +9071,7 @@ 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 \ @@ -9127,6 +9131,7 @@ 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 \ @@ -9940,6 +9945,7 @@ 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 \ @@ -9999,6 +10005,7 @@ 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 \ @@ -10215,7 +10222,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_markuptext.o \ corelib_msgdlgg.o \ corelib_numdlgg.o \ - corelib_panelg.o \ corelib_progdlgg.o \ corelib_printps.o \ corelib_renderg.o \ @@ -10431,7 +10437,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_markuptext.o \ corelib_msgdlgg.o \ corelib_numdlgg.o \ - corelib_panelg.o \ corelib_progdlgg.o \ corelib_printps.o \ corelib_renderg.o \ @@ -10648,6 +10653,7 @@ 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 \ @@ -10707,6 +10713,7 @@ 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 \ @@ -11520,6 +11527,7 @@ 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 \ @@ -11579,6 +11587,7 @@ 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 \ @@ -17326,7 +17335,7 @@ monodll_gallery.o: $(srcdir)/src/ribbon/gallery.cpp $(MONODLL_ODEP) monodll_page.o: $(srcdir)/src/ribbon/page.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/page.cpp -monodll_panel.o: $(srcdir)/src/ribbon/panel.cpp $(MONODLL_ODEP) +monodll_ribbon_panel.o: $(srcdir)/src/ribbon/panel.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/panel.cpp monodll_ribbon_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(MONODLL_ODEP) @@ -18070,6 +18079,12 @@ 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 @@ -20158,9 +20173,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp -@COND_USE_GUI_1@monodll_panelg.o: $(srcdir)/src/generic/panelg.cpp $(MONODLL_ODEP) -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/panelg.cpp - @COND_USE_GUI_1@monodll_progdlgg.o: $(srcdir)/src/generic/progdlgg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/progdlgg.cpp @@ -22615,7 +22627,7 @@ monolib_gallery.o: $(srcdir)/src/ribbon/gallery.cpp $(MONOLIB_ODEP) monolib_page.o: $(srcdir)/src/ribbon/page.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/page.cpp -monolib_panel.o: $(srcdir)/src/ribbon/panel.cpp $(MONOLIB_ODEP) +monolib_ribbon_panel.o: $(srcdir)/src/ribbon/panel.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/panel.cpp monolib_ribbon_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(MONOLIB_ODEP) @@ -23359,6 +23371,12 @@ 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 @@ -25447,9 +25465,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp -@COND_USE_GUI_1@monolib_panelg.o: $(srcdir)/src/generic/panelg.cpp $(MONOLIB_ODEP) -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/panelg.cpp - @COND_USE_GUI_1@monolib_progdlgg.o: $(srcdir)/src/generic/progdlgg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/progdlgg.cpp @@ -28828,6 +28843,12 @@ 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 @@ -30916,9 +30937,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp -@COND_USE_GUI_1@coredll_panelg.o: $(srcdir)/src/generic/panelg.cpp $(COREDLL_ODEP) -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/panelg.cpp - @COND_USE_GUI_1@coredll_progdlgg.o: $(srcdir)/src/generic/progdlgg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/progdlgg.cpp @@ -32800,6 +32818,12 @@ 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 @@ -34888,9 +34912,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp -@COND_USE_GUI_1@corelib_panelg.o: $(srcdir)/src/generic/panelg.cpp $(CORELIB_ODEP) -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/panelg.cpp - @COND_USE_GUI_1@corelib_progdlgg.o: $(srcdir)/src/generic/progdlgg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/progdlgg.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 1d6c020d17..09bdf1928e 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -788,7 +788,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/markuptext.cpp src/generic/msgdlgg.cpp src/generic/numdlgg.cpp - src/generic/panelg.cpp src/generic/progdlgg.cpp src/generic/printps.cpp src/generic/renderg.cpp @@ -1681,6 +1680,7 @@ 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 @@ -2898,6 +2898,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/univ/menu.h wx/univ/menuitem.h wx/univ/notebook.h + wx/univ/panel.h wx/univ/radiobox.h wx/univ/radiobut.h wx/univ/renderer.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index c0249b8827..3cae13b177 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_panel.obj \ + $(OBJS)\monodll_ribbon_panel.obj \ $(OBJS)\monodll_ribbon_toolbar.obj \ $(OBJS)\monodll_richtextctrl.obj \ $(OBJS)\monodll_richtextbuffer.obj \ @@ -1713,6 +1713,7 @@ ____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 \ @@ -1927,7 +1928,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(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 \ @@ -1982,6 +1982,7 @@ ____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 \ @@ -2192,7 +2193,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(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 \ @@ -2423,7 +2423,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_ribbon_control.obj \ $(OBJS)\monolib_gallery.obj \ $(OBJS)\monolib_page.obj \ - $(OBJS)\monolib_panel.obj \ + $(OBJS)\monolib_ribbon_panel.obj \ $(OBJS)\monolib_ribbon_toolbar.obj \ $(OBJS)\monolib_richtextctrl.obj \ $(OBJS)\monolib_richtextbuffer.obj \ @@ -2474,6 +2474,7 @@ ____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 \ @@ -2688,7 +2689,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(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 \ @@ -2743,6 +2743,7 @@ ____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 \ @@ -2953,7 +2954,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(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 \ @@ -3123,6 +3123,7 @@ ____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 \ @@ -3337,7 +3338,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(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 \ @@ -3392,6 +3392,7 @@ ____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 \ @@ -3602,7 +3603,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(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 \ @@ -3661,6 +3661,7 @@ ____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 \ @@ -3875,7 +3876,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(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 \ @@ -3930,6 +3930,7 @@ ____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 \ @@ -4140,7 +4141,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(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 \ @@ -6929,7 +6929,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_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 @@ -7146,6 +7146,11 @@ $(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 @@ -7955,11 +7960,6 @@ $(OBJS)\monodll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\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_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp @@ -9271,7 +9271,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_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 @@ -9488,6 +9488,11 @@ $(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 @@ -10297,11 +10302,6 @@ $(OBJS)\monolib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\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_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp @@ -11824,6 +11824,11 @@ $(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 @@ -12633,11 +12638,6 @@ $(OBJS)\coredll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\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_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp @@ -13221,6 +13221,11 @@ $(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 @@ -14030,11 +14035,6 @@ $(OBJS)\corelib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\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_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 90a939b6ac..79c2013b0e 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_panel.o \ + $(OBJS)\monodll_ribbon_panel.o \ $(OBJS)\monodll_ribbon_toolbar.o \ $(OBJS)\monodll_richtextctrl.o \ $(OBJS)\monodll_richtextbuffer.o \ @@ -1724,6 +1724,7 @@ ____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 \ @@ -1938,7 +1939,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(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 \ @@ -1995,6 +1995,7 @@ ____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 \ @@ -2205,7 +2206,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(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 \ @@ -2439,7 +2439,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_ribbon_control.o \ $(OBJS)\monolib_gallery.o \ $(OBJS)\monolib_page.o \ - $(OBJS)\monolib_panel.o \ + $(OBJS)\monolib_ribbon_panel.o \ $(OBJS)\monolib_ribbon_toolbar.o \ $(OBJS)\monolib_richtextctrl.o \ $(OBJS)\monolib_richtextbuffer.o \ @@ -2491,6 +2491,7 @@ ____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 \ @@ -2705,7 +2706,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(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 \ @@ -2762,6 +2762,7 @@ ____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 \ @@ -2972,7 +2973,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(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 \ @@ -3156,6 +3156,7 @@ ____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 \ @@ -3370,7 +3371,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(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 \ @@ -3427,6 +3427,7 @@ ____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 \ @@ -3637,7 +3638,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(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 \ @@ -3702,6 +3702,7 @@ ____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 \ @@ -3916,7 +3917,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(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 \ @@ -3973,6 +3973,7 @@ ____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 \ @@ -4183,7 +4184,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(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 \ @@ -7079,7 +7079,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_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 @@ -7296,6 +7296,11 @@ $(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 @@ -8092,21 +8097,16 @@ endif ifeq ($(USE_GUI),1) $(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 $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_numdlgg.o: ../../src/generic/numdlgg.cpp +$(OBJS)\monodll_msgdlgg.o: ../../src/generic/msgdlgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_panelg.o: ../../src/generic/panelg.cpp +$(OBJS)\monodll_numdlgg.o: ../../src/generic/numdlgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -9421,7 +9421,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_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 @@ -9638,6 +9638,11 @@ $(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 @@ -10434,21 +10439,16 @@ endif ifeq ($(USE_GUI),1) $(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 $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monolib_numdlgg.o: ../../src/generic/numdlgg.cpp +$(OBJS)\monolib_msgdlgg.o: ../../src/generic/msgdlgg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monolib_panelg.o: ../../src/generic/panelg.cpp +$(OBJS)\monolib_numdlgg.o: ../../src/generic/numdlgg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -11974,6 +11974,11 @@ $(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 @@ -12770,21 +12775,16 @@ endif ifeq ($(USE_GUI),1) $(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 $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\coredll_numdlgg.o: ../../src/generic/numdlgg.cpp +$(OBJS)\coredll_msgdlgg.o: ../../src/generic/msgdlgg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\coredll_panelg.o: ../../src/generic/panelg.cpp +$(OBJS)\coredll_numdlgg.o: ../../src/generic/numdlgg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -13371,6 +13371,11 @@ $(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 @@ -14167,21 +14172,16 @@ endif ifeq ($(USE_GUI),1) $(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 $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\corelib_numdlgg.o: ../../src/generic/numdlgg.cpp +$(OBJS)\corelib_msgdlgg.o: ../../src/generic/msgdlgg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\corelib_panelg.o: ../../src/generic/panelg.cpp +$(OBJS)\corelib_numdlgg.o: ../../src/generic/numdlgg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 4d6f1e7e99..dbd4a94bbc 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_panel.obj \ + $(OBJS)\monodll_ribbon_panel.obj \ $(OBJS)\monodll_ribbon_toolbar.obj \ $(OBJS)\monodll_richtextctrl.obj \ $(OBJS)\monodll_richtextbuffer.obj \ @@ -1921,6 +1921,7 @@ ____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 \ @@ -2135,7 +2136,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(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 \ @@ -2190,6 +2190,7 @@ ____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 \ @@ -2400,7 +2401,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(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 \ @@ -2637,7 +2637,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_ribbon_control.obj \ $(OBJS)\monolib_gallery.obj \ $(OBJS)\monolib_page.obj \ - $(OBJS)\monolib_panel.obj \ + $(OBJS)\monolib_ribbon_panel.obj \ $(OBJS)\monolib_ribbon_toolbar.obj \ $(OBJS)\monolib_richtextctrl.obj \ $(OBJS)\monolib_richtextbuffer.obj \ @@ -2688,6 +2688,7 @@ ____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 \ @@ -2902,7 +2903,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(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 \ @@ -2957,6 +2957,7 @@ ____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 \ @@ -3167,7 +3168,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(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 \ @@ -3403,6 +3403,7 @@ ____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 \ @@ -3617,7 +3618,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(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 \ @@ -3672,6 +3672,7 @@ ____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 \ @@ -3882,7 +3883,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(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 \ @@ -3947,6 +3947,7 @@ ____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 \ @@ -4161,7 +4162,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(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 \ @@ -4216,6 +4216,7 @@ ____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 \ @@ -4426,7 +4427,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(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 \ @@ -7509,7 +7509,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_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 @@ -7726,6 +7726,11 @@ $(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 @@ -8535,11 +8540,6 @@ $(OBJS)\monodll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\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_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp @@ -9851,7 +9851,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_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 @@ -10068,6 +10068,11 @@ $(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 @@ -10877,11 +10882,6 @@ $(OBJS)\monolib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\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_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp @@ -12404,6 +12404,11 @@ $(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 @@ -13213,11 +13218,6 @@ $(OBJS)\coredll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\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_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp @@ -13801,6 +13801,11 @@ $(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 @@ -14610,11 +14615,6 @@ $(OBJS)\corelib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\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_progdlgg.obj: ..\..\src\generic\progdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index cb5d9c2d50..3a623ac6f5 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_panel.obj & + $(OBJS)\monodll_ribbon_panel.obj & $(OBJS)\monodll_ribbon_toolbar.obj & $(OBJS)\monodll_richtextctrl.obj & $(OBJS)\monodll_richtextbuffer.obj & @@ -275,6 +275,7 @@ ____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 & @@ -489,7 +490,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(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 & @@ -546,6 +546,7 @@ ____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 & @@ -756,7 +757,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(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 & @@ -994,7 +994,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_ribbon_control.obj & $(OBJS)\monolib_gallery.obj & $(OBJS)\monolib_page.obj & - $(OBJS)\monolib_panel.obj & + $(OBJS)\monolib_ribbon_panel.obj & $(OBJS)\monolib_ribbon_toolbar.obj & $(OBJS)\monolib_richtextctrl.obj & $(OBJS)\monolib_richtextbuffer.obj & @@ -1047,6 +1047,7 @@ ____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 & @@ -1261,7 +1262,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(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 & @@ -1318,6 +1318,7 @@ ____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 & @@ -1528,7 +1529,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(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 & @@ -1723,6 +1723,7 @@ ____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 & @@ -1937,7 +1938,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(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 & @@ -1994,6 +1994,7 @@ ____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 & @@ -2204,7 +2205,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(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 & @@ -2271,6 +2271,7 @@ ____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 & @@ -2485,7 +2486,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(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 & @@ -2542,6 +2542,7 @@ ____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 & @@ -2752,7 +2753,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(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 & @@ -7338,7 +7338,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_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 @@ -7555,6 +7555,11 @@ $(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 @@ -8351,21 +8356,16 @@ $(OBJS)\monodll_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp !ifeq USE_GUI 1 $(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 $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp +$(OBJS)\monodll_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp +$(OBJS)\monodll_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -9680,7 +9680,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_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 @@ -9897,6 +9897,11 @@ $(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 @@ -10693,21 +10698,16 @@ $(OBJS)\monolib_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp !ifeq USE_GUI 1 $(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 $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp +$(OBJS)\monolib_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp +$(OBJS)\monolib_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -12233,6 +12233,11 @@ $(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 @@ -13029,21 +13034,16 @@ $(OBJS)\coredll_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp !ifeq USE_GUI 1 $(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 $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp +$(OBJS)\coredll_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp +$(OBJS)\coredll_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif @@ -13630,6 +13630,11 @@ $(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 @@ -14426,21 +14431,16 @@ $(OBJS)\corelib_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp !ifeq USE_GUI 1 $(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 $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp +$(OBJS)\corelib_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp +$(OBJS)\corelib_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index ac645061b9..7848f4842d 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -2073,6 +2073,10 @@ 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\pen.cpp # End Source File # Begin Source File @@ -3166,10 +3170,6 @@ 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\printps.cpp # End Source File # Begin Source File @@ -5678,6 +5678,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\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 e246c2db20..52709cd698 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -1937,6 +1937,9 @@ RelativePath="..\..\src\msw\palette.cpp"> + + - - @@ -4855,6 +4855,9 @@ RelativePath="..\..\include\wx\univ\notebook.h"> + + + + @@ -3784,10 +3788,6 @@ RelativePath="..\..\src\generic\numdlgg.cpp" > - - @@ -6494,6 +6494,10 @@ > + + diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index eac94b6882..d612227094 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -2612,6 +2612,10 @@ > + + @@ -3780,10 +3784,6 @@ RelativePath="..\..\src\generic\numdlgg.cpp" > - - @@ -6490,6 +6490,10 @@ > + + diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h index ca552db5fb..3c815485f2 100644 --- a/include/wx/generic/panelg.h +++ b/include/wx/generic/panelg.h @@ -9,28 +9,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_GENERIC_PANEL_H_ -#define _WX_GENERIC_PANEL_H_ +#ifndef _WX_GENERIC_PANELG_H_ +#define _WX_GENERIC_PANELG_H_ -// ---------------------------------------------------------------------------- -// headers and forward declarations -// ---------------------------------------------------------------------------- - -#include "wx/window.h" -#include "wx/containr.h" - -class WXDLLIMPEXP_FWD_CORE wxControlContainer; - -extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[]; - -// ---------------------------------------------------------------------------- -// wxPanel contains other controls and implements TAB traversal between them -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPanel : public wxWindow +class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase { public: - wxPanel() { Init(); } + wxPanel() { } // Old-style constructor (no default values for coordinates to avoid // ambiguity with the new one) @@ -39,8 +24,6 @@ public: long style = wxTAB_TRAVERSAL | wxNO_BORDER, const wxString& name = wxPanelNameStr) { - Init(); - Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name); } @@ -52,50 +35,11 @@ public: long style = wxTAB_TRAVERSAL | wxNO_BORDER, const wxString& name = wxPanelNameStr) { - Init(); - Create(parent, winid, pos, size, style, name); } - // Pseudo ctor - bool Create(wxWindow *parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTAB_TRAVERSAL | wxNO_BORDER, - const wxString& name = wxPanelNameStr); - - virtual ~wxPanel(); - - // implementation from now on - // -------------------------- - - virtual void InitDialog(); - -#ifdef __WXUNIVERSAL__ - virtual bool IsCanvasWindow() const { return true; } -#endif - -#ifdef __WXMSW__ - // This is overridden for MSW to return true for all panels that are child - // of a window with themed background (such as wxNotebook) which should - // show through the child panels. - virtual bool HasTransparentBackground(); -#endif // __WXMSW__ - - WX_DECLARE_CONTROL_CONTAINER(); - -protected: - // common part of all ctors - void Init(); - - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxWindowBase::GetDefaultBorder(); } - private: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel) - DECLARE_EVENT_TABLE() + wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel); }; -#endif - // _WX_GENERIC_PANEL_H_ +#endif // _WX_GENERIC_PANELG_H_ diff --git a/include/wx/msw/panel.h b/include/wx/msw/panel.h new file mode 100644 index 0000000000..3e24bd8223 --- /dev/null +++ b/include/wx/msw/panel.h @@ -0,0 +1,50 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/msw/panel.h +// Purpose: wxMSW-specific wxPanel class. +// Author: Vadim Zeitlin +// Created: 2011-03-18 +// RCS-ID: $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_MSW_PANEL_H_ +#define _WX_MSW_PANEL_H_ + +// ---------------------------------------------------------------------------- +// wxPanel +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase +{ +public: + wxPanel() { } + + wxPanel(wxWindow *parent, + int x, int y, int width, int height, + long style = wxTAB_TRAVERSAL | wxNO_BORDER, + const wxString& name = wxPanelNameStr) + { + Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name); + } + + wxPanel(wxWindow *parent, + wxWindowID winid = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTAB_TRAVERSAL | wxNO_BORDER, + const wxString& name = wxPanelNameStr) + { + Create(parent, winid, pos, size, style, name); + } + + // This is overridden for MSW to return true for all panels that are child + // of a window with themed background (such as wxNotebook) which should + // show through the child panels. + virtual bool HasTransparentBackground(); + +private: + wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel); +}; + +#endif // _WX_MSW_PANEL_H_ diff --git a/include/wx/panel.h b/include/wx/panel.h index fb5892207f..396a2af9cf 100644 --- a/include/wx/panel.h +++ b/include/wx/panel.h @@ -6,13 +6,71 @@ // Created: // RCS-ID: $Id$ // Copyright: (c) Julian Smart +// (c) 2011 Vadim Zeitlin // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_PANEL_H_BASE_ #define _WX_PANEL_H_BASE_ -#include "wx/generic/panelg.h" +// ---------------------------------------------------------------------------- +// headers and forward declarations +// ---------------------------------------------------------------------------- +#include "wx/window.h" +#include "wx/containr.h" + +class WXDLLIMPEXP_FWD_CORE wxControlContainer; + +extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[]; + +// ---------------------------------------------------------------------------- +// wxPanel contains other controls and implements TAB traversal between them +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxPanelBase : public wxWindow +{ +public: + wxPanelBase(); + + // Derived classes should also provide this constructor: + /* + wxPanelBase(wxWindow *parent, + wxWindowID winid = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTAB_TRAVERSAL | wxNO_BORDER, + const wxString& name = wxPanelNameStr); + */ + + // Pseudo ctor + bool Create(wxWindow *parent, + wxWindowID winid = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTAB_TRAVERSAL | wxNO_BORDER, + const wxString& name = wxPanelNameStr); + + + // implementation from now on + // -------------------------- + + virtual void InitDialog(); + + WX_DECLARE_CONTROL_CONTAINER(); + +private: + wxDECLARE_EVENT_TABLE(); + + wxDECLARE_NO_COPY_CLASS(wxPanelBase); +}; + +#if defined(__WXUNIVERSAL__) + #include "wx/univ/panel.h" +#elif defined(__WXMSW__) + #include "wx/msw/panel.h" +#else + #include "wx/generic/panelg.h" #endif - // _WX_PANELH_BASE_ + +#endif // _WX_PANELH_BASE_ diff --git a/include/wx/univ/panel.h b/include/wx/univ/panel.h new file mode 100644 index 0000000000..5217bcbcd8 --- /dev/null +++ b/include/wx/univ/panel.h @@ -0,0 +1,47 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/univ/panel.h +// Purpose: wxUniversal-specific wxPanel class. +// Author: Vadim Zeitlin +// Created: 2011-03-18 +// RCS-ID: $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_UNIV_PANEL_H_ +#define _WX_UNIV_PANEL_H_ + +// ---------------------------------------------------------------------------- +// wxPanel +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase +{ +public: + wxPanel() { } + + wxPanel(wxWindow *parent, + int x, int y, int width, int height, + long style = wxTAB_TRAVERSAL | wxNO_BORDER, + const wxString& name = wxPanelNameStr) + { + Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name); + } + + wxPanel(wxWindow *parent, + wxWindowID winid = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTAB_TRAVERSAL | wxNO_BORDER, + const wxString& name = wxPanelNameStr) + { + Create(parent, winid, pos, size, style, name); + } + + virtual bool IsCanvasWindow() const { return true; } + +private: + wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel); +}; + +#endif // _WX_UNIV_PANEL_H_ diff --git a/src/common/panelcmn.cpp b/src/common/panelcmn.cpp index fc6788c3ae..a800434b5e 100644 --- a/src/common/panelcmn.cpp +++ b/src/common/panelcmn.cpp @@ -85,3 +85,52 @@ wxCONSTRUCTOR_6( wxPanel, wxWindow*, Parent, wxWindowID, Id, \ wxString, Name) +// ---------------------------------------------------------------------------- +// wxWin macros +// ---------------------------------------------------------------------------- + +BEGIN_EVENT_TABLE(wxPanelBase, wxWindow) + WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanelBase) +END_EVENT_TABLE() + +// ============================================================================ +// implementation +// ============================================================================ + +WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanelBase, wxWindow) + +// ---------------------------------------------------------------------------- +// wxPanelBase creation +// ---------------------------------------------------------------------------- + +wxPanelBase::wxPanelBase() +{ + WX_INIT_CONTROL_CONTAINER(); +} + +bool wxPanelBase::Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) +{ + if ( !wxWindow::Create(parent, id, pos, size, style, name) ) + return false; + + // so that non-solid background renders correctly under GTK+: + SetThemeEnabled(true); + +#if defined(__WXWINCE__) && (defined(__POCKETPC__) || defined(__SMARTPHONE__)) + // Required to get solid control backgrounds under WinCE + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); +#endif + + return true; +} + +void wxPanelBase::InitDialog() +{ + wxInitDialogEvent event(GetId()); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); +} diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp deleted file mode 100644 index 6ca4edace5..0000000000 --- a/src/generic/panelg.cpp +++ /dev/null @@ -1,107 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/panelg.cpp -// Purpose: wxPanel and the keyboard handling code -// Author: Julian Smart, Robert Roebling, Vadim Zeitlin -// Modified by: -// Created: 04/01/98 -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/object.h" - #include "wx/font.h" - #include "wx/colour.h" - #include "wx/settings.h" - #include "wx/log.h" - #include "wx/panel.h" - #include "wx/containr.h" -#endif - -// ---------------------------------------------------------------------------- -// wxWin macros -// ---------------------------------------------------------------------------- - -BEGIN_EVENT_TABLE(wxPanel, wxWindow) - WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanel) -END_EVENT_TABLE() - -// ============================================================================ -// implementation -// ============================================================================ - -WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel, wxWindow) - -// ---------------------------------------------------------------------------- -// wxPanel creation -// ---------------------------------------------------------------------------- - -void wxPanel::Init() -{ - WX_INIT_CONTROL_CONTAINER(); -} - -bool wxPanel::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - if ( !wxWindow::Create(parent, id, pos, size, style, name) ) - return false; - - // so that non-solid background renders correctly under GTK+: - SetThemeEnabled(true); - -#if defined(__WXWINCE__) && (defined(__POCKETPC__) || defined(__SMARTPHONE__)) - // Required to get solid control backgrounds under WinCE - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); -#endif - - return true; -} - -wxPanel::~wxPanel() -{ -} - -void wxPanel::InitDialog() -{ - wxInitDialogEvent event(GetId()); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); -} - -#ifdef __WXMSW__ - -bool wxPanel::HasTransparentBackground() -{ - for ( wxWindow *win = GetParent(); win; win = win->GetParent() ) - { - if ( win->MSWHasInheritableBackground() ) - return true; - - if ( win->IsTopLevel() ) - break; - } - - return false; -} - -#endif // __WXMSW__ diff --git a/src/msw/panel.cpp b/src/msw/panel.cpp new file mode 100644 index 0000000000..65a25144c8 --- /dev/null +++ b/src/msw/panel.cpp @@ -0,0 +1,46 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: src/msw/panel.cpp +// Purpose: Implementation of wxMSW-specific wxPanel class. +// Author: Vadim Zeitlin +// Created: 2011-03-18 +// RCS-ID: $Id: wxhead.cpp,v 1.11 2010-04-22 12:44:51 zeitlin Exp $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#ifndef WX_PRECOMP + #include "wx/panel.h" +#endif // WX_PRECOMP + +// ============================================================================ +// implementation +// ============================================================================ + +bool wxPanel::HasTransparentBackground() +{ + for ( wxWindow *win = GetParent(); win; win = win->GetParent() ) + { + if ( win->MSWHasInheritableBackground() ) + return true; + + if ( win->IsTopLevel() ) + break; + } + + return false; +} -- 2.47.2