From d6397a9f35045cfb65cbbf59cd519559963c915e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 4 Sep 2011 23:01:45 +0000 Subject: [PATCH] Add persistence support for wxSplitterWindow. New wxPersistentSplitter class allows to easily save and restore the splitter position in config. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 1 + build/bakefiles/files.bkl | 1 + build/msw/makefile.bcc | 128 +++++++++++++++++----------------- build/msw/makefile.gcc | 128 +++++++++++++++++----------------- build/msw/makefile.vc | 128 +++++++++++++++++----------------- build/msw/makefile.wat | 128 +++++++++++++++++----------------- build/msw/wx_adv.dsp | 32 ++++----- build/msw/wx_core.dsp | 12 ++-- build/msw/wx_vc7_adv.vcproj | 24 +++---- build/msw/wx_vc7_core.vcproj | 9 ++- build/msw/wx_vc7_xrc.vcproj | 12 ++-- build/msw/wx_vc8_adv.vcproj | 32 ++++----- build/msw/wx_vc8_core.vcproj | 12 ++-- build/msw/wx_vc8_xrc.vcproj | 16 ++--- build/msw/wx_vc9_adv.vcproj | 32 ++++----- build/msw/wx_vc9_core.vcproj | 12 ++-- build/msw/wx_vc9_xrc.vcproj | 16 ++--- build/msw/wx_xrc.dsp | 16 ++--- docs/changes.txt | 1 + include/wx/persist/splitter.h | 69 ++++++++++++++++++ 20 files changed, 448 insertions(+), 361 deletions(-) create mode 100644 include/wx/persist/splitter.h diff --git a/Makefile.in b/Makefile.in index 5ac45616bd..e0e07d6d24 100644 --- a/Makefile.in +++ b/Makefile.in @@ -4030,6 +4030,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/paper.h \ wx/persist.h \ wx/persist/bookctrl.h \ + wx/persist/splitter.h \ wx/persist/toplevel.h \ wx/persist/treebook.h \ wx/persist/window.h \ diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 91712bde3e..ec23135fa0 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -998,6 +998,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/paper.h wx/persist.h wx/persist/bookctrl.h + wx/persist/splitter.h wx/persist/toplevel.h wx/persist/treebook.h wx/persist/window.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 87b410e2f7..c70b3205df 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1136,7 +1136,7 @@ XRCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_dummy.obj \ $(OBJS)\xrcdll_xh_animatctrl.obj \ - $(OBJS)\xrcdll_xh_bannerwindow.obj \ + $(OBJS)\xrcdll_xh_bannerwindow.obj \ $(OBJS)\xrcdll_xh_bmp.obj \ $(OBJS)\xrcdll_xh_bmpcbox.obj \ $(OBJS)\xrcdll_xh_bmpbt.obj \ @@ -1211,7 +1211,7 @@ XRCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_dummy.obj \ $(OBJS)\xrclib_xh_animatctrl.obj \ - $(OBJS)\xrclib_xh_bannerwindow.obj \ + $(OBJS)\xrclib_xh_bannerwindow.obj \ $(OBJS)\xrclib_xh_bmp.obj \ $(OBJS)\xrclib_xh_bmpcbox.obj \ $(OBJS)\xrclib_xh_bmpbt.obj \ @@ -1580,7 +1580,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_debugrpt.obj \ $(OBJS)\monodll_dbgrptg.obj \ $(OBJS)\monodll_xh_animatctrl.obj \ - $(OBJS)\monodll_xh_bannerwindow.obj \ + $(OBJS)\monodll_xh_bannerwindow.obj \ $(OBJS)\monodll_xh_bmp.obj \ $(OBJS)\monodll_xh_bmpcbox.obj \ $(OBJS)\monodll_xh_bmpbt.obj \ @@ -2229,7 +2229,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_hyperlnkcmn.obj \ $(OBJS)\monodll_odcombocmn.obj \ $(OBJS)\monodll_aboutdlgg.obj \ - $(OBJS)\monodll_bannerwindow.obj \ + $(OBJS)\monodll_bannerwindow.obj \ $(OBJS)\monodll_bmpcboxg.obj \ $(OBJS)\monodll_calctrlg.obj \ $(OBJS)\monodll_commandlinkbuttong.obj \ @@ -2249,7 +2249,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_sashwin.obj \ $(OBJS)\monodll_splash.obj \ $(OBJS)\monodll_tipdlg.obj \ - $(OBJS)\monodll_treelist.obj \ + $(OBJS)\monodll_treelist.obj \ $(OBJS)\monodll_wizard.obj \ $(OBJS)\monodll_taskbarcmn.obj \ $(OBJS)\monodll_aboutdlg.obj \ @@ -2275,7 +2275,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_hyperlnkcmn.obj \ $(OBJS)\monodll_odcombocmn.obj \ $(OBJS)\monodll_aboutdlgg.obj \ - $(OBJS)\monodll_bannerwindow.obj \ + $(OBJS)\monodll_bannerwindow.obj \ $(OBJS)\monodll_bmpcboxg.obj \ $(OBJS)\monodll_calctrlg.obj \ $(OBJS)\monodll_commandlinkbuttong.obj \ @@ -2295,7 +2295,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_sashwin.obj \ $(OBJS)\monodll_splash.obj \ $(OBJS)\monodll_tipdlg.obj \ - $(OBJS)\monodll_treelist.obj \ + $(OBJS)\monodll_treelist.obj \ $(OBJS)\monodll_wizard.obj \ $(OBJS)\monodll_taskbarcmn.obj \ $(OBJS)\monodll_aboutdlg.obj \ @@ -2349,7 +2349,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_debugrpt.obj \ $(OBJS)\monolib_dbgrptg.obj \ $(OBJS)\monolib_xh_animatctrl.obj \ - $(OBJS)\monolib_xh_bannerwindow.obj \ + $(OBJS)\monolib_xh_bannerwindow.obj \ $(OBJS)\monolib_xh_bmp.obj \ $(OBJS)\monolib_xh_bmpcbox.obj \ $(OBJS)\monolib_xh_bmpbt.obj \ @@ -2998,7 +2998,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_hyperlnkcmn.obj \ $(OBJS)\monolib_odcombocmn.obj \ $(OBJS)\monolib_aboutdlgg.obj \ - $(OBJS)\monolib_bannerwindow.obj \ + $(OBJS)\monolib_bannerwindow.obj \ $(OBJS)\monolib_bmpcboxg.obj \ $(OBJS)\monolib_calctrlg.obj \ $(OBJS)\monolib_commandlinkbuttong.obj \ @@ -3018,7 +3018,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_sashwin.obj \ $(OBJS)\monolib_splash.obj \ $(OBJS)\monolib_tipdlg.obj \ - $(OBJS)\monolib_treelist.obj \ + $(OBJS)\monolib_treelist.obj \ $(OBJS)\monolib_wizard.obj \ $(OBJS)\monolib_taskbarcmn.obj \ $(OBJS)\monolib_aboutdlg.obj \ @@ -3044,7 +3044,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_hyperlnkcmn.obj \ $(OBJS)\monolib_odcombocmn.obj \ $(OBJS)\monolib_aboutdlgg.obj \ - $(OBJS)\monolib_bannerwindow.obj \ + $(OBJS)\monolib_bannerwindow.obj \ $(OBJS)\monolib_bmpcboxg.obj \ $(OBJS)\monolib_calctrlg.obj \ $(OBJS)\monolib_commandlinkbuttong.obj \ @@ -3064,7 +3064,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_sashwin.obj \ $(OBJS)\monolib_splash.obj \ $(OBJS)\monolib_tipdlg.obj \ - $(OBJS)\monolib_treelist.obj \ + $(OBJS)\monolib_treelist.obj \ $(OBJS)\monolib_wizard.obj \ $(OBJS)\monolib_taskbarcmn.obj \ $(OBJS)\monolib_aboutdlg.obj \ @@ -4206,7 +4206,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_hyperlnkcmn.obj \ $(OBJS)\advdll_odcombocmn.obj \ $(OBJS)\advdll_aboutdlgg.obj \ - $(OBJS)\advdll_bannerwindow.obj \ + $(OBJS)\advdll_bannerwindow.obj \ $(OBJS)\advdll_bmpcboxg.obj \ $(OBJS)\advdll_calctrlg.obj \ $(OBJS)\advdll_commandlinkbuttong.obj \ @@ -4226,7 +4226,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_sashwin.obj \ $(OBJS)\advdll_splash.obj \ $(OBJS)\advdll_tipdlg.obj \ - $(OBJS)\advdll_treelist.obj \ + $(OBJS)\advdll_treelist.obj \ $(OBJS)\advdll_wizard.obj \ $(OBJS)\advdll_taskbarcmn.obj \ $(OBJS)\advdll_aboutdlg.obj \ @@ -4252,7 +4252,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_hyperlnkcmn.obj \ $(OBJS)\advdll_odcombocmn.obj \ $(OBJS)\advdll_aboutdlgg.obj \ - $(OBJS)\advdll_bannerwindow.obj \ + $(OBJS)\advdll_bannerwindow.obj \ $(OBJS)\advdll_bmpcboxg.obj \ $(OBJS)\advdll_calctrlg.obj \ $(OBJS)\advdll_commandlinkbuttong.obj \ @@ -4272,7 +4272,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_sashwin.obj \ $(OBJS)\advdll_splash.obj \ $(OBJS)\advdll_tipdlg.obj \ - $(OBJS)\advdll_treelist.obj \ + $(OBJS)\advdll_treelist.obj \ $(OBJS)\advdll_wizard.obj \ $(OBJS)\advdll_taskbarcmn.obj \ $(OBJS)\advdll_aboutdlg.obj \ @@ -4296,7 +4296,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_hyperlnkcmn.obj \ $(OBJS)\advlib_odcombocmn.obj \ $(OBJS)\advlib_aboutdlgg.obj \ - $(OBJS)\advlib_bannerwindow.obj \ + $(OBJS)\advlib_bannerwindow.obj \ $(OBJS)\advlib_bmpcboxg.obj \ $(OBJS)\advlib_calctrlg.obj \ $(OBJS)\advlib_commandlinkbuttong.obj \ @@ -4316,7 +4316,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_sashwin.obj \ $(OBJS)\advlib_splash.obj \ $(OBJS)\advlib_tipdlg.obj \ - $(OBJS)\advlib_treelist.obj \ + $(OBJS)\advlib_treelist.obj \ $(OBJS)\advlib_wizard.obj \ $(OBJS)\advlib_taskbarcmn.obj \ $(OBJS)\advlib_aboutdlg.obj \ @@ -4342,7 +4342,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_hyperlnkcmn.obj \ $(OBJS)\advlib_odcombocmn.obj \ $(OBJS)\advlib_aboutdlgg.obj \ - $(OBJS)\advlib_bannerwindow.obj \ + $(OBJS)\advlib_bannerwindow.obj \ $(OBJS)\advlib_bmpcboxg.obj \ $(OBJS)\advlib_calctrlg.obj \ $(OBJS)\advlib_commandlinkbuttong.obj \ @@ -4362,7 +4362,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_sashwin.obj \ $(OBJS)\advlib_splash.obj \ $(OBJS)\advlib_tipdlg.obj \ - $(OBJS)\advlib_treelist.obj \ + $(OBJS)\advlib_treelist.obj \ $(OBJS)\advlib_wizard.obj \ $(OBJS)\advlib_taskbarcmn.obj \ $(OBJS)\advlib_aboutdlg.obj \ @@ -6718,9 +6718,9 @@ $(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp $(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp -$(OBJS)\monodll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp - +$(OBJS)\monodll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp + $(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp @@ -8140,11 +8140,11 @@ $(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp !endif @@ -8240,11 +8240,11 @@ $(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_treelist.obj: ..\..\src\generic\treelist.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treelist.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_treelist.obj: ..\..\src\generic\treelist.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treelist.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\wizard.cpp !endif @@ -9082,9 +9082,9 @@ $(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp $(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp -$(OBJS)\monolib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp - +$(OBJS)\monolib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp + $(OBJS)\monolib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp @@ -10504,11 +10504,11 @@ $(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp !endif @@ -10604,11 +10604,11 @@ $(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_treelist.obj: ..\..\src\generic\treelist.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_treelist.obj: ..\..\src\generic\treelist.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp !endif @@ -14271,9 +14271,9 @@ $(OBJS)\advdll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp $(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp -$(OBJS)\advdll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp - +$(OBJS)\advdll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp + $(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp @@ -14331,9 +14331,9 @@ $(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp $(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp -$(OBJS)\advdll_treelist.obj: ..\..\src\generic\treelist.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\treelist.cpp - +$(OBJS)\advdll_treelist.obj: ..\..\src\generic\treelist.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\treelist.cpp + $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\wizard.cpp @@ -14403,9 +14403,9 @@ $(OBJS)\advlib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp $(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp -$(OBJS)\advlib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp - +$(OBJS)\advlib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp + $(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp @@ -14463,9 +14463,9 @@ $(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp $(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp -$(OBJS)\advlib_treelist.obj: ..\..\src\generic\treelist.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp - +$(OBJS)\advlib_treelist.obj: ..\..\src\generic\treelist.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp + $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp @@ -14739,9 +14739,9 @@ $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp -$(OBJS)\xrcdll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp - +$(OBJS)\xrcdll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp + $(OBJS)\xrcdll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp @@ -14934,9 +14934,9 @@ $(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp $(OBJS)\xrclib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp -$(OBJS)\xrclib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp - +$(OBJS)\xrclib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp + $(OBJS)\xrclib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index bd9107fbc0..4fb5bb0b6e 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1134,7 +1134,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_dummy.o \ $(OBJS)\xrcdll_version_rc.o \ $(OBJS)\xrcdll_xh_animatctrl.o \ - $(OBJS)\xrcdll_xh_bannerwindow.o \ + $(OBJS)\xrcdll_xh_bannerwindow.o \ $(OBJS)\xrcdll_xh_bmp.o \ $(OBJS)\xrcdll_xh_bmpcbox.o \ $(OBJS)\xrcdll_xh_bmpbt.o \ @@ -1208,7 +1208,7 @@ XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) XRCLIB_OBJECTS = \ $(OBJS)\xrclib_dummy.o \ $(OBJS)\xrclib_xh_animatctrl.o \ - $(OBJS)\xrclib_xh_bannerwindow.o \ + $(OBJS)\xrclib_xh_bannerwindow.o \ $(OBJS)\xrclib_xh_bmp.o \ $(OBJS)\xrclib_xh_bmpcbox.o \ $(OBJS)\xrclib_xh_bmpbt.o \ @@ -1590,7 +1590,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_debugrpt.o \ $(OBJS)\monodll_dbgrptg.o \ $(OBJS)\monodll_xh_animatctrl.o \ - $(OBJS)\monodll_xh_bannerwindow.o \ + $(OBJS)\monodll_xh_bannerwindow.o \ $(OBJS)\monodll_xh_bmp.o \ $(OBJS)\monodll_xh_bmpcbox.o \ $(OBJS)\monodll_xh_bmpbt.o \ @@ -2243,7 +2243,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_hyperlnkcmn.o \ $(OBJS)\monodll_odcombocmn.o \ $(OBJS)\monodll_aboutdlgg.o \ - $(OBJS)\monodll_bannerwindow.o \ + $(OBJS)\monodll_bannerwindow.o \ $(OBJS)\monodll_bmpcboxg.o \ $(OBJS)\monodll_calctrlg.o \ $(OBJS)\monodll_commandlinkbuttong.o \ @@ -2263,7 +2263,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_sashwin.o \ $(OBJS)\monodll_splash.o \ $(OBJS)\monodll_tipdlg.o \ - $(OBJS)\monodll_treelist.o \ + $(OBJS)\monodll_treelist.o \ $(OBJS)\monodll_wizard.o \ $(OBJS)\monodll_taskbarcmn.o \ $(OBJS)\monodll_aboutdlg.o \ @@ -2289,7 +2289,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_hyperlnkcmn.o \ $(OBJS)\monodll_odcombocmn.o \ $(OBJS)\monodll_aboutdlgg.o \ - $(OBJS)\monodll_bannerwindow.o \ + $(OBJS)\monodll_bannerwindow.o \ $(OBJS)\monodll_bmpcboxg.o \ $(OBJS)\monodll_calctrlg.o \ $(OBJS)\monodll_commandlinkbuttong.o \ @@ -2309,7 +2309,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_sashwin.o \ $(OBJS)\monodll_splash.o \ $(OBJS)\monodll_tipdlg.o \ - $(OBJS)\monodll_treelist.o \ + $(OBJS)\monodll_treelist.o \ $(OBJS)\monodll_wizard.o \ $(OBJS)\monodll_taskbarcmn.o \ $(OBJS)\monodll_aboutdlg.o \ @@ -2365,7 +2365,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_debugrpt.o \ $(OBJS)\monolib_dbgrptg.o \ $(OBJS)\monolib_xh_animatctrl.o \ - $(OBJS)\monolib_xh_bannerwindow.o \ + $(OBJS)\monolib_xh_bannerwindow.o \ $(OBJS)\monolib_xh_bmp.o \ $(OBJS)\monolib_xh_bmpcbox.o \ $(OBJS)\monolib_xh_bmpbt.o \ @@ -3018,7 +3018,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_hyperlnkcmn.o \ $(OBJS)\monolib_odcombocmn.o \ $(OBJS)\monolib_aboutdlgg.o \ - $(OBJS)\monolib_bannerwindow.o \ + $(OBJS)\monolib_bannerwindow.o \ $(OBJS)\monolib_bmpcboxg.o \ $(OBJS)\monolib_calctrlg.o \ $(OBJS)\monolib_commandlinkbuttong.o \ @@ -3038,7 +3038,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_sashwin.o \ $(OBJS)\monolib_splash.o \ $(OBJS)\monolib_tipdlg.o \ - $(OBJS)\monolib_treelist.o \ + $(OBJS)\monolib_treelist.o \ $(OBJS)\monolib_wizard.o \ $(OBJS)\monolib_taskbarcmn.o \ $(OBJS)\monolib_aboutdlg.o \ @@ -3064,7 +3064,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_hyperlnkcmn.o \ $(OBJS)\monolib_odcombocmn.o \ $(OBJS)\monolib_aboutdlgg.o \ - $(OBJS)\monolib_bannerwindow.o \ + $(OBJS)\monolib_bannerwindow.o \ $(OBJS)\monolib_bmpcboxg.o \ $(OBJS)\monolib_calctrlg.o \ $(OBJS)\monolib_commandlinkbuttong.o \ @@ -3084,7 +3084,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_sashwin.o \ $(OBJS)\monolib_splash.o \ $(OBJS)\monolib_tipdlg.o \ - $(OBJS)\monolib_treelist.o \ + $(OBJS)\monolib_treelist.o \ $(OBJS)\monolib_wizard.o \ $(OBJS)\monolib_taskbarcmn.o \ $(OBJS)\monolib_aboutdlg.o \ @@ -4254,7 +4254,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_hyperlnkcmn.o \ $(OBJS)\advdll_odcombocmn.o \ $(OBJS)\advdll_aboutdlgg.o \ - $(OBJS)\advdll_bannerwindow.o \ + $(OBJS)\advdll_bannerwindow.o \ $(OBJS)\advdll_bmpcboxg.o \ $(OBJS)\advdll_calctrlg.o \ $(OBJS)\advdll_commandlinkbuttong.o \ @@ -4274,7 +4274,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_sashwin.o \ $(OBJS)\advdll_splash.o \ $(OBJS)\advdll_tipdlg.o \ - $(OBJS)\advdll_treelist.o \ + $(OBJS)\advdll_treelist.o \ $(OBJS)\advdll_wizard.o \ $(OBJS)\advdll_taskbarcmn.o \ $(OBJS)\advdll_aboutdlg.o \ @@ -4300,7 +4300,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_hyperlnkcmn.o \ $(OBJS)\advdll_odcombocmn.o \ $(OBJS)\advdll_aboutdlgg.o \ - $(OBJS)\advdll_bannerwindow.o \ + $(OBJS)\advdll_bannerwindow.o \ $(OBJS)\advdll_bmpcboxg.o \ $(OBJS)\advdll_calctrlg.o \ $(OBJS)\advdll_commandlinkbuttong.o \ @@ -4320,7 +4320,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_sashwin.o \ $(OBJS)\advdll_splash.o \ $(OBJS)\advdll_tipdlg.o \ - $(OBJS)\advdll_treelist.o \ + $(OBJS)\advdll_treelist.o \ $(OBJS)\advdll_wizard.o \ $(OBJS)\advdll_taskbarcmn.o \ $(OBJS)\advdll_aboutdlg.o \ @@ -4348,7 +4348,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_hyperlnkcmn.o \ $(OBJS)\advlib_odcombocmn.o \ $(OBJS)\advlib_aboutdlgg.o \ - $(OBJS)\advlib_bannerwindow.o \ + $(OBJS)\advlib_bannerwindow.o \ $(OBJS)\advlib_bmpcboxg.o \ $(OBJS)\advlib_calctrlg.o \ $(OBJS)\advlib_commandlinkbuttong.o \ @@ -4368,7 +4368,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_sashwin.o \ $(OBJS)\advlib_splash.o \ $(OBJS)\advlib_tipdlg.o \ - $(OBJS)\advlib_treelist.o \ + $(OBJS)\advlib_treelist.o \ $(OBJS)\advlib_wizard.o \ $(OBJS)\advlib_taskbarcmn.o \ $(OBJS)\advlib_aboutdlg.o \ @@ -4394,7 +4394,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_hyperlnkcmn.o \ $(OBJS)\advlib_odcombocmn.o \ $(OBJS)\advlib_aboutdlgg.o \ - $(OBJS)\advlib_bannerwindow.o \ + $(OBJS)\advlib_bannerwindow.o \ $(OBJS)\advlib_bmpcboxg.o \ $(OBJS)\advlib_calctrlg.o \ $(OBJS)\advlib_commandlinkbuttong.o \ @@ -4414,7 +4414,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_sashwin.o \ $(OBJS)\advlib_splash.o \ $(OBJS)\advlib_tipdlg.o \ - $(OBJS)\advlib_treelist.o \ + $(OBJS)\advlib_treelist.o \ $(OBJS)\advlib_wizard.o \ $(OBJS)\advlib_taskbarcmn.o \ $(OBJS)\advlib_aboutdlg.o \ @@ -6868,9 +6868,9 @@ $(OBJS)\monodll_dbgrptg.o: ../../src/generic/dbgrptg.cpp $(OBJS)\monodll_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\monodll_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_xh_bmp.o: ../../src/xrc/xh_bmp.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -8290,11 +8290,11 @@ $(OBJS)\monodll_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_bannerwindow.o: ../../src/generic/bannerwindow.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\monodll_bannerwindow.o: ../../src/generic/bannerwindow.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monodll_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -8390,11 +8390,11 @@ $(OBJS)\monodll_tipdlg.o: ../../src/generic/tipdlg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_treelist.o: ../../src/generic/treelist.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\monodll_treelist.o: ../../src/generic/treelist.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monodll_wizard.o: ../../src/generic/wizard.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -9232,9 +9232,9 @@ $(OBJS)\monolib_dbgrptg.o: ../../src/generic/dbgrptg.cpp $(OBJS)\monolib_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\monolib_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_xh_bmp.o: ../../src/xrc/xh_bmp.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10654,11 +10654,11 @@ $(OBJS)\monolib_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monolib_bannerwindow.o: ../../src/generic/bannerwindow.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\monolib_bannerwindow.o: ../../src/generic/bannerwindow.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monolib_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -10754,11 +10754,11 @@ $(OBJS)\monolib_tipdlg.o: ../../src/generic/tipdlg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monolib_treelist.o: ../../src/generic/treelist.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\monolib_treelist.o: ../../src/generic/treelist.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monolib_wizard.o: ../../src/generic/wizard.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -14421,9 +14421,9 @@ $(OBJS)\advdll_odcombocmn.o: ../../src/common/odcombocmn.cpp $(OBJS)\advdll_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\advdll_bannerwindow.o: ../../src/generic/bannerwindow.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\advdll_bannerwindow.o: ../../src/generic/bannerwindow.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advdll_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14481,9 +14481,9 @@ $(OBJS)\advdll_splash.o: ../../src/generic/splash.cpp $(OBJS)\advdll_tipdlg.o: ../../src/generic/tipdlg.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\advdll_treelist.o: ../../src/generic/treelist.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\advdll_treelist.o: ../../src/generic/treelist.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advdll_wizard.o: ../../src/generic/wizard.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14553,9 +14553,9 @@ $(OBJS)\advlib_odcombocmn.o: ../../src/common/odcombocmn.cpp $(OBJS)\advlib_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\advlib_bannerwindow.o: ../../src/generic/bannerwindow.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\advlib_bannerwindow.o: ../../src/generic/bannerwindow.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advlib_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< @@ -14613,9 +14613,9 @@ $(OBJS)\advlib_splash.o: ../../src/generic/splash.cpp $(OBJS)\advlib_tipdlg.o: ../../src/generic/tipdlg.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\advlib_treelist.o: ../../src/generic/treelist.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\advlib_treelist.o: ../../src/generic/treelist.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advlib_wizard.o: ../../src/generic/wizard.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< @@ -14889,9 +14889,9 @@ $(OBJS)\xrcdll_version_rc.o: ../../src/msw/version.rc $(OBJS)\xrcdll_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\xrcdll_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\xrcdll_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrcdll_xh_bmp.o: ../../src/xrc/xh_bmp.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< @@ -15084,9 +15084,9 @@ $(OBJS)\xrclib_dummy.o: ../../src/common/dummy.cpp $(OBJS)\xrclib_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\xrclib_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\xrclib_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrclib_xh_bmp.o: ../../src/xrc/xh_bmp.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 7d6dab6a0d..2fd05a0b24 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1211,7 +1211,7 @@ XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_395)$(__DEBUGRUNTIME) /DWIN32 \ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_dummy.obj \ $(OBJS)\xrcdll_xh_animatctrl.obj \ - $(OBJS)\xrcdll_xh_bannerwindow.obj \ + $(OBJS)\xrcdll_xh_bannerwindow.obj \ $(OBJS)\xrcdll_xh_bmp.obj \ $(OBJS)\xrcdll_xh_bmpcbox.obj \ $(OBJS)\xrcdll_xh_bmpbt.obj \ @@ -1290,7 +1290,7 @@ XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_410)$(__DEBUGRUNTIME) /DWIN32 \ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_dummy.obj \ $(OBJS)\xrclib_xh_animatctrl.obj \ - $(OBJS)\xrclib_xh_bannerwindow.obj \ + $(OBJS)\xrclib_xh_bannerwindow.obj \ $(OBJS)\xrclib_xh_bmp.obj \ $(OBJS)\xrclib_xh_bmpcbox.obj \ $(OBJS)\xrclib_xh_bmpbt.obj \ @@ -1788,7 +1788,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_debugrpt.obj \ $(OBJS)\monodll_dbgrptg.obj \ $(OBJS)\monodll_xh_animatctrl.obj \ - $(OBJS)\monodll_xh_bannerwindow.obj \ + $(OBJS)\monodll_xh_bannerwindow.obj \ $(OBJS)\monodll_xh_bmp.obj \ $(OBJS)\monodll_xh_bmpcbox.obj \ $(OBJS)\monodll_xh_bmpbt.obj \ @@ -2437,7 +2437,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_hyperlnkcmn.obj \ $(OBJS)\monodll_odcombocmn.obj \ $(OBJS)\monodll_aboutdlgg.obj \ - $(OBJS)\monodll_bannerwindow.obj \ + $(OBJS)\monodll_bannerwindow.obj \ $(OBJS)\monodll_bmpcboxg.obj \ $(OBJS)\monodll_calctrlg.obj \ $(OBJS)\monodll_commandlinkbuttong.obj \ @@ -2457,7 +2457,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_sashwin.obj \ $(OBJS)\monodll_splash.obj \ $(OBJS)\monodll_tipdlg.obj \ - $(OBJS)\monodll_treelist.obj \ + $(OBJS)\monodll_treelist.obj \ $(OBJS)\monodll_wizard.obj \ $(OBJS)\monodll_taskbarcmn.obj \ $(OBJS)\monodll_aboutdlg.obj \ @@ -2483,7 +2483,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_hyperlnkcmn.obj \ $(OBJS)\monodll_odcombocmn.obj \ $(OBJS)\monodll_aboutdlgg.obj \ - $(OBJS)\monodll_bannerwindow.obj \ + $(OBJS)\monodll_bannerwindow.obj \ $(OBJS)\monodll_bmpcboxg.obj \ $(OBJS)\monodll_calctrlg.obj \ $(OBJS)\monodll_commandlinkbuttong.obj \ @@ -2503,7 +2503,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_sashwin.obj \ $(OBJS)\monodll_splash.obj \ $(OBJS)\monodll_tipdlg.obj \ - $(OBJS)\monodll_treelist.obj \ + $(OBJS)\monodll_treelist.obj \ $(OBJS)\monodll_wizard.obj \ $(OBJS)\monodll_taskbarcmn.obj \ $(OBJS)\monodll_aboutdlg.obj \ @@ -2563,7 +2563,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_debugrpt.obj \ $(OBJS)\monolib_dbgrptg.obj \ $(OBJS)\monolib_xh_animatctrl.obj \ - $(OBJS)\monolib_xh_bannerwindow.obj \ + $(OBJS)\monolib_xh_bannerwindow.obj \ $(OBJS)\monolib_xh_bmp.obj \ $(OBJS)\monolib_xh_bmpcbox.obj \ $(OBJS)\monolib_xh_bmpbt.obj \ @@ -3212,7 +3212,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_hyperlnkcmn.obj \ $(OBJS)\monolib_odcombocmn.obj \ $(OBJS)\monolib_aboutdlgg.obj \ - $(OBJS)\monolib_bannerwindow.obj \ + $(OBJS)\monolib_bannerwindow.obj \ $(OBJS)\monolib_bmpcboxg.obj \ $(OBJS)\monolib_calctrlg.obj \ $(OBJS)\monolib_commandlinkbuttong.obj \ @@ -3232,7 +3232,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_sashwin.obj \ $(OBJS)\monolib_splash.obj \ $(OBJS)\monolib_tipdlg.obj \ - $(OBJS)\monolib_treelist.obj \ + $(OBJS)\monolib_treelist.obj \ $(OBJS)\monolib_wizard.obj \ $(OBJS)\monolib_taskbarcmn.obj \ $(OBJS)\monolib_aboutdlg.obj \ @@ -3258,7 +3258,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_hyperlnkcmn.obj \ $(OBJS)\monolib_odcombocmn.obj \ $(OBJS)\monolib_aboutdlgg.obj \ - $(OBJS)\monolib_bannerwindow.obj \ + $(OBJS)\monolib_bannerwindow.obj \ $(OBJS)\monolib_bmpcboxg.obj \ $(OBJS)\monolib_calctrlg.obj \ $(OBJS)\monolib_commandlinkbuttong.obj \ @@ -3278,7 +3278,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_sashwin.obj \ $(OBJS)\monolib_splash.obj \ $(OBJS)\monolib_tipdlg.obj \ - $(OBJS)\monolib_treelist.obj \ + $(OBJS)\monolib_treelist.obj \ $(OBJS)\monolib_wizard.obj \ $(OBJS)\monolib_taskbarcmn.obj \ $(OBJS)\monolib_aboutdlg.obj \ @@ -4510,7 +4510,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_hyperlnkcmn.obj \ $(OBJS)\advdll_odcombocmn.obj \ $(OBJS)\advdll_aboutdlgg.obj \ - $(OBJS)\advdll_bannerwindow.obj \ + $(OBJS)\advdll_bannerwindow.obj \ $(OBJS)\advdll_bmpcboxg.obj \ $(OBJS)\advdll_calctrlg.obj \ $(OBJS)\advdll_commandlinkbuttong.obj \ @@ -4530,7 +4530,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_sashwin.obj \ $(OBJS)\advdll_splash.obj \ $(OBJS)\advdll_tipdlg.obj \ - $(OBJS)\advdll_treelist.obj \ + $(OBJS)\advdll_treelist.obj \ $(OBJS)\advdll_wizard.obj \ $(OBJS)\advdll_taskbarcmn.obj \ $(OBJS)\advdll_aboutdlg.obj \ @@ -4556,7 +4556,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_hyperlnkcmn.obj \ $(OBJS)\advdll_odcombocmn.obj \ $(OBJS)\advdll_aboutdlgg.obj \ - $(OBJS)\advdll_bannerwindow.obj \ + $(OBJS)\advdll_bannerwindow.obj \ $(OBJS)\advdll_bmpcboxg.obj \ $(OBJS)\advdll_calctrlg.obj \ $(OBJS)\advdll_commandlinkbuttong.obj \ @@ -4576,7 +4576,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_sashwin.obj \ $(OBJS)\advdll_splash.obj \ $(OBJS)\advdll_tipdlg.obj \ - $(OBJS)\advdll_treelist.obj \ + $(OBJS)\advdll_treelist.obj \ $(OBJS)\advdll_wizard.obj \ $(OBJS)\advdll_taskbarcmn.obj \ $(OBJS)\advdll_aboutdlg.obj \ @@ -4606,7 +4606,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_hyperlnkcmn.obj \ $(OBJS)\advlib_odcombocmn.obj \ $(OBJS)\advlib_aboutdlgg.obj \ - $(OBJS)\advlib_bannerwindow.obj \ + $(OBJS)\advlib_bannerwindow.obj \ $(OBJS)\advlib_bmpcboxg.obj \ $(OBJS)\advlib_calctrlg.obj \ $(OBJS)\advlib_commandlinkbuttong.obj \ @@ -4626,7 +4626,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_sashwin.obj \ $(OBJS)\advlib_splash.obj \ $(OBJS)\advlib_tipdlg.obj \ - $(OBJS)\advlib_treelist.obj \ + $(OBJS)\advlib_treelist.obj \ $(OBJS)\advlib_wizard.obj \ $(OBJS)\advlib_taskbarcmn.obj \ $(OBJS)\advlib_aboutdlg.obj \ @@ -4652,7 +4652,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_hyperlnkcmn.obj \ $(OBJS)\advlib_odcombocmn.obj \ $(OBJS)\advlib_aboutdlgg.obj \ - $(OBJS)\advlib_bannerwindow.obj \ + $(OBJS)\advlib_bannerwindow.obj \ $(OBJS)\advlib_bmpcboxg.obj \ $(OBJS)\advlib_calctrlg.obj \ $(OBJS)\advlib_commandlinkbuttong.obj \ @@ -4672,7 +4672,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_sashwin.obj \ $(OBJS)\advlib_splash.obj \ $(OBJS)\advlib_tipdlg.obj \ - $(OBJS)\advlib_treelist.obj \ + $(OBJS)\advlib_treelist.obj \ $(OBJS)\advlib_wizard.obj \ $(OBJS)\advlib_taskbarcmn.obj \ $(OBJS)\advlib_aboutdlg.obj \ @@ -7298,9 +7298,9 @@ $(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp $(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp -$(OBJS)\monodll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp - +$(OBJS)\monodll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp + $(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp @@ -8720,11 +8720,11 @@ $(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp !endif @@ -8820,11 +8820,11 @@ $(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_treelist.obj: ..\..\src\generic\treelist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treelist.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_treelist.obj: ..\..\src\generic\treelist.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treelist.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\wizard.cpp !endif @@ -9662,9 +9662,9 @@ $(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp $(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp -$(OBJS)\monolib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp - +$(OBJS)\monolib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp + $(OBJS)\monolib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp @@ -11084,11 +11084,11 @@ $(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp !endif @@ -11184,11 +11184,11 @@ $(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_treelist.obj: ..\..\src\generic\treelist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_treelist.obj: ..\..\src\generic\treelist.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp !endif @@ -14851,9 +14851,9 @@ $(OBJS)\advdll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp $(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp -$(OBJS)\advdll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp - +$(OBJS)\advdll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp + $(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp @@ -14911,9 +14911,9 @@ $(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp $(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp -$(OBJS)\advdll_treelist.obj: ..\..\src\generic\treelist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\treelist.cpp - +$(OBJS)\advdll_treelist.obj: ..\..\src\generic\treelist.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\treelist.cpp + $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\wizard.cpp @@ -14983,9 +14983,9 @@ $(OBJS)\advlib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp $(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp -$(OBJS)\advlib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp - +$(OBJS)\advlib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp + $(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp @@ -15043,9 +15043,9 @@ $(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp $(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp -$(OBJS)\advlib_treelist.obj: ..\..\src\generic\treelist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp - +$(OBJS)\advlib_treelist.obj: ..\..\src\generic\treelist.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp + $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp @@ -15319,9 +15319,9 @@ $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp -$(OBJS)\xrcdll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp - +$(OBJS)\xrcdll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp + $(OBJS)\xrcdll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp @@ -15514,9 +15514,9 @@ $(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp $(OBJS)\xrclib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp -$(OBJS)\xrclib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp - +$(OBJS)\xrclib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp + $(OBJS)\xrclib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 3ad7e77598..e554a25f36 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -138,7 +138,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_debugrpt.obj & $(OBJS)\monodll_dbgrptg.obj & $(OBJS)\monodll_xh_animatctrl.obj & - $(OBJS)\monodll_xh_bannerwindow.obj & + $(OBJS)\monodll_xh_bannerwindow.obj & $(OBJS)\monodll_xh_bmp.obj & $(OBJS)\monodll_xh_bmpcbox.obj & $(OBJS)\monodll_xh_bmpbt.obj & @@ -793,7 +793,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_hyperlnkcmn.obj & $(OBJS)\monodll_odcombocmn.obj & $(OBJS)\monodll_aboutdlgg.obj & - $(OBJS)\monodll_bannerwindow.obj & + $(OBJS)\monodll_bannerwindow.obj & $(OBJS)\monodll_bmpcboxg.obj & $(OBJS)\monodll_calctrlg.obj & $(OBJS)\monodll_commandlinkbuttong.obj & @@ -813,7 +813,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_sashwin.obj & $(OBJS)\monodll_splash.obj & $(OBJS)\monodll_tipdlg.obj & - $(OBJS)\monodll_treelist.obj & + $(OBJS)\monodll_treelist.obj & $(OBJS)\monodll_wizard.obj & $(OBJS)\monodll_taskbarcmn.obj & $(OBJS)\monodll_aboutdlg.obj & @@ -839,7 +839,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_hyperlnkcmn.obj & $(OBJS)\monodll_odcombocmn.obj & $(OBJS)\monodll_aboutdlgg.obj & - $(OBJS)\monodll_bannerwindow.obj & + $(OBJS)\monodll_bannerwindow.obj & $(OBJS)\monodll_bmpcboxg.obj & $(OBJS)\monodll_calctrlg.obj & $(OBJS)\monodll_commandlinkbuttong.obj & @@ -859,7 +859,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_sashwin.obj & $(OBJS)\monodll_splash.obj & $(OBJS)\monodll_tipdlg.obj & - $(OBJS)\monodll_treelist.obj & + $(OBJS)\monodll_treelist.obj & $(OBJS)\monodll_wizard.obj & $(OBJS)\monodll_taskbarcmn.obj & $(OBJS)\monodll_aboutdlg.obj & @@ -918,7 +918,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_debugrpt.obj & $(OBJS)\monolib_dbgrptg.obj & $(OBJS)\monolib_xh_animatctrl.obj & - $(OBJS)\monolib_xh_bannerwindow.obj & + $(OBJS)\monolib_xh_bannerwindow.obj & $(OBJS)\monolib_xh_bmp.obj & $(OBJS)\monolib_xh_bmpcbox.obj & $(OBJS)\monolib_xh_bmpbt.obj & @@ -1573,7 +1573,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_hyperlnkcmn.obj & $(OBJS)\monolib_odcombocmn.obj & $(OBJS)\monolib_aboutdlgg.obj & - $(OBJS)\monolib_bannerwindow.obj & + $(OBJS)\monolib_bannerwindow.obj & $(OBJS)\monolib_bmpcboxg.obj & $(OBJS)\monolib_calctrlg.obj & $(OBJS)\monolib_commandlinkbuttong.obj & @@ -1593,7 +1593,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_sashwin.obj & $(OBJS)\monolib_splash.obj & $(OBJS)\monolib_tipdlg.obj & - $(OBJS)\monolib_treelist.obj & + $(OBJS)\monolib_treelist.obj & $(OBJS)\monolib_wizard.obj & $(OBJS)\monolib_taskbarcmn.obj & $(OBJS)\monolib_aboutdlg.obj & @@ -1619,7 +1619,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_hyperlnkcmn.obj & $(OBJS)\monolib_odcombocmn.obj & $(OBJS)\monolib_aboutdlgg.obj & - $(OBJS)\monolib_bannerwindow.obj & + $(OBJS)\monolib_bannerwindow.obj & $(OBJS)\monolib_bmpcboxg.obj & $(OBJS)\monolib_calctrlg.obj & $(OBJS)\monolib_commandlinkbuttong.obj & @@ -1639,7 +1639,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_sashwin.obj & $(OBJS)\monolib_splash.obj & $(OBJS)\monolib_tipdlg.obj & - $(OBJS)\monolib_treelist.obj & + $(OBJS)\monolib_treelist.obj & $(OBJS)\monolib_wizard.obj & $(OBJS)\monolib_taskbarcmn.obj & $(OBJS)\monolib_aboutdlg.obj & @@ -2825,7 +2825,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_hyperlnkcmn.obj & $(OBJS)\advdll_odcombocmn.obj & $(OBJS)\advdll_aboutdlgg.obj & - $(OBJS)\advdll_bannerwindow.obj & + $(OBJS)\advdll_bannerwindow.obj & $(OBJS)\advdll_bmpcboxg.obj & $(OBJS)\advdll_calctrlg.obj & $(OBJS)\advdll_commandlinkbuttong.obj & @@ -2845,7 +2845,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_sashwin.obj & $(OBJS)\advdll_splash.obj & $(OBJS)\advdll_tipdlg.obj & - $(OBJS)\advdll_treelist.obj & + $(OBJS)\advdll_treelist.obj & $(OBJS)\advdll_wizard.obj & $(OBJS)\advdll_taskbarcmn.obj & $(OBJS)\advdll_aboutdlg.obj & @@ -2871,7 +2871,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_hyperlnkcmn.obj & $(OBJS)\advdll_odcombocmn.obj & $(OBJS)\advdll_aboutdlgg.obj & - $(OBJS)\advdll_bannerwindow.obj & + $(OBJS)\advdll_bannerwindow.obj & $(OBJS)\advdll_bmpcboxg.obj & $(OBJS)\advdll_calctrlg.obj & $(OBJS)\advdll_commandlinkbuttong.obj & @@ -2891,7 +2891,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_sashwin.obj & $(OBJS)\advdll_splash.obj & $(OBJS)\advdll_tipdlg.obj & - $(OBJS)\advdll_treelist.obj & + $(OBJS)\advdll_treelist.obj & $(OBJS)\advdll_wizard.obj & $(OBJS)\advdll_taskbarcmn.obj & $(OBJS)\advdll_aboutdlg.obj & @@ -2921,7 +2921,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_hyperlnkcmn.obj & $(OBJS)\advlib_odcombocmn.obj & $(OBJS)\advlib_aboutdlgg.obj & - $(OBJS)\advlib_bannerwindow.obj & + $(OBJS)\advlib_bannerwindow.obj & $(OBJS)\advlib_bmpcboxg.obj & $(OBJS)\advlib_calctrlg.obj & $(OBJS)\advlib_commandlinkbuttong.obj & @@ -2941,7 +2941,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_sashwin.obj & $(OBJS)\advlib_splash.obj & $(OBJS)\advlib_tipdlg.obj & - $(OBJS)\advlib_treelist.obj & + $(OBJS)\advlib_treelist.obj & $(OBJS)\advlib_wizard.obj & $(OBJS)\advlib_taskbarcmn.obj & $(OBJS)\advlib_aboutdlg.obj & @@ -2967,7 +2967,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_hyperlnkcmn.obj & $(OBJS)\advlib_odcombocmn.obj & $(OBJS)\advlib_aboutdlgg.obj & - $(OBJS)\advlib_bannerwindow.obj & + $(OBJS)\advlib_bannerwindow.obj & $(OBJS)\advlib_bmpcboxg.obj & $(OBJS)\advlib_calctrlg.obj & $(OBJS)\advlib_commandlinkbuttong.obj & @@ -2987,7 +2987,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_sashwin.obj & $(OBJS)\advlib_splash.obj & $(OBJS)\advlib_tipdlg.obj & - $(OBJS)\advlib_treelist.obj & + $(OBJS)\advlib_treelist.obj & $(OBJS)\advlib_wizard.obj & $(OBJS)\advlib_taskbarcmn.obj & $(OBJS)\advlib_aboutdlg.obj & @@ -4578,7 +4578,7 @@ XRCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & XRCDLL_OBJECTS = & $(OBJS)\xrcdll_dummy.obj & $(OBJS)\xrcdll_xh_animatctrl.obj & - $(OBJS)\xrcdll_xh_bannerwindow.obj & + $(OBJS)\xrcdll_xh_bannerwindow.obj & $(OBJS)\xrcdll_xh_bmp.obj & $(OBJS)\xrcdll_xh_bmpcbox.obj & $(OBJS)\xrcdll_xh_bmpbt.obj & @@ -4653,7 +4653,7 @@ XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & XRCLIB_OBJECTS = & $(OBJS)\xrclib_dummy.obj & $(OBJS)\xrclib_xh_animatctrl.obj & - $(OBJS)\xrclib_xh_bannerwindow.obj & + $(OBJS)\xrclib_xh_bannerwindow.obj & $(OBJS)\xrclib_xh_bmp.obj & $(OBJS)\xrclib_xh_bmpcbox.obj & $(OBJS)\xrclib_xh_bmpbt.obj & @@ -7127,9 +7127,9 @@ $(OBJS)\monodll_dbgrptg.obj : .AUTODEPEND ..\..\src\generic\dbgrptg.cpp $(OBJS)\monodll_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_xh_bannerwindow.obj : .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - +$(OBJS)\monodll_xh_bannerwindow.obj : .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -8549,11 +8549,11 @@ $(OBJS)\monodll_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_bannerwindow.obj : .AUTODEPEND ..\..\src\generic\bannerwindow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 +$(OBJS)\monodll_bannerwindow.obj : .AUTODEPEND ..\..\src\generic\bannerwindow.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\monodll_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -8649,11 +8649,11 @@ $(OBJS)\monodll_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_treelist.obj : .AUTODEPEND ..\..\src\generic\treelist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 +$(OBJS)\monodll_treelist.obj : .AUTODEPEND ..\..\src\generic\treelist.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\monodll_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -9491,9 +9491,9 @@ $(OBJS)\monolib_dbgrptg.obj : .AUTODEPEND ..\..\src\generic\dbgrptg.cpp $(OBJS)\monolib_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_xh_bannerwindow.obj : .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - +$(OBJS)\monolib_xh_bannerwindow.obj : .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10913,11 +10913,11 @@ $(OBJS)\monolib_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_bannerwindow.obj : .AUTODEPEND ..\..\src\generic\bannerwindow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 +$(OBJS)\monolib_bannerwindow.obj : .AUTODEPEND ..\..\src\generic\bannerwindow.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\monolib_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -11013,11 +11013,11 @@ $(OBJS)\monolib_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_treelist.obj : .AUTODEPEND ..\..\src\generic\treelist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 +$(OBJS)\monolib_treelist.obj : .AUTODEPEND ..\..\src\generic\treelist.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\monolib_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -14680,9 +14680,9 @@ $(OBJS)\advdll_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp $(OBJS)\advdll_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< -$(OBJS)\advdll_bannerwindow.obj : .AUTODEPEND ..\..\src\generic\bannerwindow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - +$(OBJS)\advdll_bannerwindow.obj : .AUTODEPEND ..\..\src\generic\bannerwindow.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< @@ -14740,9 +14740,9 @@ $(OBJS)\advdll_splash.obj : .AUTODEPEND ..\..\src\generic\splash.cpp $(OBJS)\advdll_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< -$(OBJS)\advdll_treelist.obj : .AUTODEPEND ..\..\src\generic\treelist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - +$(OBJS)\advdll_treelist.obj : .AUTODEPEND ..\..\src\generic\treelist.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< @@ -14812,9 +14812,9 @@ $(OBJS)\advlib_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp $(OBJS)\advlib_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< -$(OBJS)\advlib_bannerwindow.obj : .AUTODEPEND ..\..\src\generic\bannerwindow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - +$(OBJS)\advlib_bannerwindow.obj : .AUTODEPEND ..\..\src\generic\bannerwindow.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< @@ -14872,9 +14872,9 @@ $(OBJS)\advlib_splash.obj : .AUTODEPEND ..\..\src\generic\splash.cpp $(OBJS)\advlib_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< -$(OBJS)\advlib_treelist.obj : .AUTODEPEND ..\..\src\generic\treelist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - +$(OBJS)\advlib_treelist.obj : .AUTODEPEND ..\..\src\generic\treelist.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< @@ -15148,9 +15148,9 @@ $(OBJS)\xrcdll_version.res : .AUTODEPEND ..\..\src\msw\version.rc $(OBJS)\xrcdll_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< -$(OBJS)\xrcdll_xh_bannerwindow.obj : .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - +$(OBJS)\xrcdll_xh_bannerwindow.obj : .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + $(OBJS)\xrcdll_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< @@ -15343,9 +15343,9 @@ $(OBJS)\xrclib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(OBJS)\xrclib_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< -$(OBJS)\xrclib_xh_bannerwindow.obj : .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - +$(OBJS)\xrclib_xh_bannerwindow.obj : .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\xrclib_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp index 90f6bba1f7..7b4632fa04 100644 --- a/build/msw/wx_adv.dsp +++ b/build/msw/wx_adv.dsp @@ -563,10 +563,10 @@ SOURCE=..\..\src\generic\animateg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\bannerwindow.cpp -# End Source File -# Begin Source File - +SOURCE=..\..\src\generic\bannerwindow.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\generic\bmpcboxg.cpp # End Source File # Begin Source File @@ -643,10 +643,10 @@ SOURCE=..\..\src\generic\tipdlg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\treelist.cpp -# End Source File -# Begin Source File - +SOURCE=..\..\src\generic\treelist.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\generic\wizard.cpp # End Source File # End Group @@ -1020,10 +1020,10 @@ SOURCE=..\..\include\wx\animate.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\bannerwindow.h -# End Source File -# Begin Source File - +SOURCE=..\..\include\wx\bannerwindow.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\bmpcbox.h # End Source File # Begin Source File @@ -1108,10 +1108,10 @@ SOURCE=..\..\include\wx\tipdlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\treelist.h -# End Source File -# Begin Source File - +SOURCE=..\..\include\wx\treelist.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\wizard.h # End Source File # End Group diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index edc5cdac67..2d554d77b2 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -6808,6 +6808,10 @@ SOURCE=..\..\include\wx\splash.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\persist\splitter.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\splitter.h # End Source File # Begin Source File @@ -6924,10 +6928,10 @@ SOURCE=..\..\include\wx\treectrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\treelist.h -# End Source File -# Begin Source File - +SOURCE=..\..\include\wx\treelist.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\uiaction.h # End Source File # Begin Source File diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj index 408d485eeb..efd6dce9da 100644 --- a/build/msw/wx_vc7_adv.vcproj +++ b/build/msw/wx_vc7_adv.vcproj @@ -738,9 +738,9 @@ RelativePath="..\..\src\generic\animateg.cpp"> - - + + - - + + @@ -1074,9 +1074,9 @@ RelativePath="..\..\include\wx\animate.h"> - - + + - - + + diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index b04d4058e2..2bf160f215 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -5681,6 +5681,9 @@ + + @@ -5769,9 +5772,9 @@ RelativePath="..\..\include\wx\treectrl.h"> - - + + - - + + - - + + - - + + @@ -1097,10 +1097,10 @@ > - - + + @@ -1453,10 +1453,10 @@ > - - + + @@ -1541,10 +1541,10 @@ > - - + + diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index 9147697c0f..595588453e 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -7595,6 +7595,10 @@ RelativePath="..\..\include\wx\splash.h" > + + @@ -7712,10 +7716,10 @@ > - - + + diff --git a/build/msw/wx_vc8_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj index a5af2d1002..c39718f689 100644 --- a/build/msw/wx_vc8_xrc.vcproj +++ b/build/msw/wx_vc8_xrc.vcproj @@ -1059,10 +1059,10 @@ > - - + + @@ -1313,10 +1313,10 @@ > - - + + diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj index 05fdb24bdd..91dd723c2a 100644 --- a/build/msw/wx_vc9_adv.vcproj +++ b/build/msw/wx_vc9_adv.vcproj @@ -1013,10 +1013,10 @@ > - - + + @@ -1093,10 +1093,10 @@ > - - + + @@ -1449,10 +1449,10 @@ > - - + + @@ -1537,10 +1537,10 @@ > - - + + diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index d2033f6f06..03ca401d2c 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -7591,6 +7591,10 @@ RelativePath="..\..\include\wx\splash.h" > + + @@ -7708,10 +7712,10 @@ > - - + + diff --git a/build/msw/wx_vc9_xrc.vcproj b/build/msw/wx_vc9_xrc.vcproj index 60ae208560..dc51f76e83 100644 --- a/build/msw/wx_vc9_xrc.vcproj +++ b/build/msw/wx_vc9_xrc.vcproj @@ -1055,10 +1055,10 @@ > - - + + @@ -1309,10 +1309,10 @@ > - - + + diff --git a/build/msw/wx_xrc.dsp b/build/msw/wx_xrc.dsp index 7c65856699..0ccabeb54a 100644 --- a/build/msw/wx_xrc.dsp +++ b/build/msw/wx_xrc.dsp @@ -538,10 +538,10 @@ SOURCE=..\..\include\wx\xrc\xh_animatctrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\xrc\xh_bannerwindow.h -# End Source File -# Begin Source File - +SOURCE=..\..\include\wx\xrc\xh_bannerwindow.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xrc\xh_bmp.h # End Source File # Begin Source File @@ -790,10 +790,10 @@ SOURCE=..\..\src\xrc\xh_animatctrl.cpp # End Source File # Begin Source File -SOURCE=..\..\src\xrc\xh_bannerwindow.cpp -# End Source File -# Begin Source File - +SOURCE=..\..\src\xrc\xh_bannerwindow.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\xrc\xh_bmp.cpp # End Source File # Begin Source File diff --git a/docs/changes.txt b/docs/changes.txt index 2b489f8058..067e8e03bb 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -467,6 +467,7 @@ All (GUI): - Added wxDataViewCtrl::GetSelectedItemsCount() and HasSelection(). - Added wxFLP_SMALL and wxDIRP_SMALL styles. - Added support for saving alpha with TIFF images. +- Added wxPersistentSplitter. OSX: diff --git a/include/wx/persist/splitter.h b/include/wx/persist/splitter.h new file mode 100644 index 0000000000..d80b378a4b --- /dev/null +++ b/include/wx/persist/splitter.h @@ -0,0 +1,69 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/persist/splitter.h +// Purpose: Persistence support for wxSplitterWindow. +// Author: Vadim Zeitlin +// Created: 2011-08-31 +// 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_PERSIST_SPLITTER_H_ +#define _WX_PERSIST_SPLITTER_H_ + +#include "wx/persist/window.h" + +#include "wx/splitter.h" + +// ---------------------------------------------------------------------------- +// string constants used by wxPersistentSplitter +// ---------------------------------------------------------------------------- + +#define wxPERSIST_SPLITTER_KIND "Splitter" + +// Special position value of -1 means the splitter is not split at all. +#define wxPERSIST_SPLITTER_POSITION "Position" + +// ---------------------------------------------------------------------------- +// wxPersistentSplitter: supports saving/restoring splitter position +// ---------------------------------------------------------------------------- + +class wxPersistentSplitter : public wxPersistentWindow +{ +public: + wxPersistentSplitter(wxSplitterWindow* splitter) + : wxPersistentWindow(splitter) + { + } + + virtual void Save() const + { + wxSplitterWindow* const splitter = Get(); + + int pos = splitter->IsSplit() ? splitter->GetSashPosition() : -1; + SaveValue(wxPERSIST_SPLITTER_POSITION, pos); + } + + virtual bool Restore() + { + int pos; + if ( RestoreValue(wxPERSIST_SPLITTER_POSITION, &pos) ) + { + if ( pos == -1 ) + Get()->Unsplit(); + else + Get()->SetSashPosition(pos); + } + + return false; + } + + virtual wxString GetKind() const { return wxPERSIST_SPLITTER_KIND; } +}; + +inline wxPersistentObject *wxCreatePersistentObject(wxSplitterWindow* splitter) +{ + return new wxPersistentSplitter(splitter); +} + +#endif // _WX_PERSIST_SPLITTER_H_ -- 2.47.2