Add XRC handler for wxSimplebook.

Similar to wxNotebook but even simpler as wxSimplebook doesn't use images.

Also add wxSimplebook::Create() as the version inherited from wxBookCtrlBase
didn't _quite_ work: we need to add wxBK_TOP style to prevent asserts due to
unknown alignment in the base class when creating wxSimplebook.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-08-05 22:01:52 +00:00
parent 5575cc59c2
commit 5f9bd3678f
22 changed files with 353 additions and 19 deletions

View File

@@ -1765,6 +1765,7 @@ XRCDLL_OBJECTS = \
xrcdll_xh_scrol.o \ xrcdll_xh_scrol.o \
xrcdll_xh_scwin.o \ xrcdll_xh_scwin.o \
xrcdll_xh_htmllbox.o \ xrcdll_xh_htmllbox.o \
xrcdll_xh_simplebook.o \
xrcdll_xh_sizer.o \ xrcdll_xh_sizer.o \
xrcdll_xh_slidr.o \ xrcdll_xh_slidr.o \
xrcdll_xh_spin.o \ xrcdll_xh_spin.o \
@@ -1837,6 +1838,7 @@ XRCLIB_OBJECTS = \
xrclib_xh_scrol.o \ xrclib_xh_scrol.o \
xrclib_xh_scwin.o \ xrclib_xh_scwin.o \
xrclib_xh_htmllbox.o \ xrclib_xh_htmllbox.o \
xrclib_xh_simplebook.o \
xrclib_xh_sizer.o \ xrclib_xh_sizer.o \
xrclib_xh_slidr.o \ xrclib_xh_slidr.o \
xrclib_xh_spin.o \ xrclib_xh_spin.o \
@@ -4222,6 +4224,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \
wx/xrc/xh_scrol.h \ wx/xrc/xh_scrol.h \
wx/xrc/xh_scwin.h \ wx/xrc/xh_scwin.h \
wx/xrc/xh_htmllbox.h \ wx/xrc/xh_htmllbox.h \
wx/xrc/xh_simplebook.h \
wx/xrc/xh_sizer.h \ wx/xrc/xh_sizer.h \
wx/xrc/xh_slidr.h \ wx/xrc/xh_slidr.h \
wx/xrc/xh_spin.h \ wx/xrc/xh_spin.h \
@@ -4533,6 +4536,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \
monodll_xh_scrol.o \ monodll_xh_scrol.o \
monodll_xh_scwin.o \ monodll_xh_scwin.o \
monodll_xh_htmllbox.o \ monodll_xh_htmllbox.o \
monodll_xh_simplebook.o \
monodll_xh_sizer.o \ monodll_xh_sizer.o \
monodll_xh_slidr.o \ monodll_xh_slidr.o \
monodll_xh_spin.o \ monodll_xh_spin.o \
@@ -6676,6 +6680,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \
monolib_xh_scrol.o \ monolib_xh_scrol.o \
monolib_xh_scwin.o \ monolib_xh_scwin.o \
monolib_xh_htmllbox.o \ monolib_xh_htmllbox.o \
monolib_xh_simplebook.o \
monolib_xh_sizer.o \ monolib_xh_sizer.o \
monolib_xh_slidr.o \ monolib_xh_slidr.o \
monolib_xh_spin.o \ monolib_xh_spin.o \
@@ -8621,7 +8626,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
@COND_TOOLKIT_OSX_CARBON@ = monolib_carbon_mediactrl.o @COND_TOOLKIT_OSX_CARBON@ = monolib_carbon_mediactrl.o
@COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 \ @COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 \
@COND_TOOLKIT_OSX_COCOA@ = monolib_osx_cocoa_mediactrl.o @COND_TOOLKIT_OSX_COCOA@ = monolib_osx_cocoa_mediactrl.o
@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_1 = @COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_1 \
@COND_TOOLKIT_OSX_IPHONE@ = monolib_osx_cocoa_mediactrl.o
@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \ @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
@COND_TOOLKIT_WINCE@ monolib_mediactrl_am.o monolib_mediactrl_wmp10.o \ @COND_TOOLKIT_WINCE@ monolib_mediactrl_am.o monolib_mediactrl_wmp10.o \
@COND_TOOLKIT_WINCE@ monolib_mediactrl_qt.o @COND_TOOLKIT_WINCE@ monolib_mediactrl_qt.o
@@ -12964,7 +12970,8 @@ COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_2 = \
@COND_TOOLKIT_OSX_CARBON@ = mediadll_carbon_mediactrl.o @COND_TOOLKIT_OSX_CARBON@ = mediadll_carbon_mediactrl.o
@COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_2 \ @COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_2 \
@COND_TOOLKIT_OSX_COCOA@ = mediadll_osx_cocoa_mediactrl.o @COND_TOOLKIT_OSX_COCOA@ = mediadll_osx_cocoa_mediactrl.o
@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_2 = @COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_2 \
@COND_TOOLKIT_OSX_IPHONE@ = mediadll_osx_cocoa_mediactrl.o
@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \ @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \
@COND_TOOLKIT_WINCE@ mediadll_mediactrl_am.o mediadll_mediactrl_wmp10.o \ @COND_TOOLKIT_WINCE@ mediadll_mediactrl_am.o mediadll_mediactrl_wmp10.o \
@COND_TOOLKIT_WINCE@ mediadll_mediactrl_qt.o @COND_TOOLKIT_WINCE@ mediadll_mediactrl_qt.o
@@ -12997,7 +13004,8 @@ COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_3 = \
@COND_TOOLKIT_OSX_CARBON@ = medialib_carbon_mediactrl.o @COND_TOOLKIT_OSX_CARBON@ = medialib_carbon_mediactrl.o
@COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_3 \ @COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_3 \
@COND_TOOLKIT_OSX_COCOA@ = medialib_osx_cocoa_mediactrl.o @COND_TOOLKIT_OSX_COCOA@ = medialib_osx_cocoa_mediactrl.o
@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_3 = @COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_3 \
@COND_TOOLKIT_OSX_IPHONE@ = medialib_osx_cocoa_mediactrl.o
@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \ @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
@COND_TOOLKIT_WINCE@ medialib_mediactrl_am.o medialib_mediactrl_wmp10.o \ @COND_TOOLKIT_WINCE@ medialib_mediactrl_am.o medialib_mediactrl_wmp10.o \
@COND_TOOLKIT_WINCE@ medialib_mediactrl_qt.o @COND_TOOLKIT_WINCE@ medialib_mediactrl_qt.o
@@ -17660,9 +17668,6 @@ monodll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MONODLL_ODEP)
monodll_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MONODLL_ODEP) monodll_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
monodll_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
monodll_src_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MONODLL_ODEP) monodll_src_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
@@ -17897,6 +17902,9 @@ monodll_xh_scwin.o: $(srcdir)/src/xrc/xh_scwin.cpp $(MONODLL_ODEP)
monodll_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(MONODLL_ODEP) monodll_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp
monodll_xh_simplebook.o: $(srcdir)/src/xrc/xh_simplebook.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_simplebook.cpp
monodll_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(MONODLL_ODEP) monodll_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp
@@ -21899,6 +21907,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MONODLL_ODEP)
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MONODLL_ODEP)
@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
@@ -23231,9 +23245,6 @@ monolib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MONOLIB_ODEP)
monolib_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MONOLIB_ODEP) monolib_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
monolib_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
monolib_src_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MONOLIB_ODEP) monolib_src_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
@@ -23468,6 +23479,9 @@ monolib_xh_scwin.o: $(srcdir)/src/xrc/xh_scwin.cpp $(MONOLIB_ODEP)
monolib_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(MONOLIB_ODEP) monolib_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp
monolib_xh_simplebook.o: $(srcdir)/src/xrc/xh_simplebook.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_simplebook.cpp
monolib_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(MONOLIB_ODEP) monolib_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp
@@ -27470,6 +27484,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MONOLIB_ODEP)
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MONOLIB_ODEP)
@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
@@ -37742,9 +37762,6 @@ mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP)
mediadll_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MEDIADLL_ODEP) mediadll_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MEDIADLL_ODEP)
$(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
mediadll_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MEDIADLL_ODEP)
$(CXXC) -c -o $@ $(MEDIADLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
mediadll_src_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIADLL_ODEP) mediadll_src_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIADLL_ODEP)
$(CXXC) -c -o $@ $(MEDIADLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm $(CXXC) -c -o $@ $(MEDIADLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
@@ -37766,6 +37783,12 @@ mediadll_src_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIADLL_ODEP
@COND_TOOLKIT_WINCE@mediadll_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MEDIADLL_ODEP) @COND_TOOLKIT_WINCE@mediadll_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp @COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
@COND_TOOLKIT_OSX_COCOA@mediadll_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MEDIADLL_ODEP)
@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(MEDIADLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
@COND_TOOLKIT_OSX_IPHONE@mediadll_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MEDIADLL_ODEP)
@COND_TOOLKIT_OSX_IPHONE@ $(CXXC) -c -o $@ $(MEDIADLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
@COND_TOOLKIT_MOTIF@mediadll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIADLL_ODEP) @COND_TOOLKIT_MOTIF@mediadll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp @COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
@@ -37781,9 +37804,6 @@ medialib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIALIB_ODEP)
medialib_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MEDIALIB_ODEP) medialib_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MEDIALIB_ODEP)
$(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
medialib_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MEDIALIB_ODEP)
$(CXXC) -c -o $@ $(MEDIALIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
medialib_src_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIALIB_ODEP) medialib_src_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIALIB_ODEP)
$(CXXC) -c -o $@ $(MEDIALIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm $(CXXC) -c -o $@ $(MEDIALIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
@@ -37805,6 +37825,12 @@ medialib_src_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIALIB_ODEP
@COND_TOOLKIT_WINCE@medialib_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MEDIALIB_ODEP) @COND_TOOLKIT_WINCE@medialib_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp @COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
@COND_TOOLKIT_OSX_COCOA@medialib_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MEDIALIB_ODEP)
@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(MEDIALIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
@COND_TOOLKIT_OSX_IPHONE@medialib_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MEDIALIB_ODEP)
@COND_TOOLKIT_OSX_IPHONE@ $(CXXC) -c -o $@ $(MEDIALIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
@COND_TOOLKIT_MOTIF@medialib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP) @COND_TOOLKIT_MOTIF@medialib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp @COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
@@ -38186,6 +38212,9 @@ xrcdll_xh_scwin.o: $(srcdir)/src/xrc/xh_scwin.cpp $(XRCDLL_ODEP)
xrcdll_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(XRCDLL_ODEP) xrcdll_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp
xrcdll_xh_simplebook.o: $(srcdir)/src/xrc/xh_simplebook.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_simplebook.cpp
xrcdll_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(XRCDLL_ODEP) xrcdll_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp
@@ -38381,6 +38410,9 @@ xrclib_xh_scwin.o: $(srcdir)/src/xrc/xh_scwin.cpp $(XRCLIB_ODEP)
xrclib_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(XRCLIB_ODEP) xrclib_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp
xrclib_xh_simplebook.o: $(srcdir)/src/xrc/xh_simplebook.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_simplebook.cpp
xrclib_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(XRCLIB_ODEP) xrclib_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp

View File

@@ -3265,6 +3265,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/xrc/xh_scrol.cpp src/xrc/xh_scrol.cpp
src/xrc/xh_scwin.cpp src/xrc/xh_scwin.cpp
src/xrc/xh_htmllbox.cpp src/xrc/xh_htmllbox.cpp
src/xrc/xh_simplebook.cpp
src/xrc/xh_sizer.cpp src/xrc/xh_sizer.cpp
src/xrc/xh_slidr.cpp src/xrc/xh_slidr.cpp
src/xrc/xh_spin.cpp src/xrc/xh_spin.cpp
@@ -3333,6 +3334,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/xrc/xh_scrol.h wx/xrc/xh_scrol.h
wx/xrc/xh_scwin.h wx/xrc/xh_scwin.h
wx/xrc/xh_htmllbox.h wx/xrc/xh_htmllbox.h
wx/xrc/xh_simplebook.h
wx/xrc/xh_sizer.h wx/xrc/xh_sizer.h
wx/xrc/xh_slidr.h wx/xrc/xh_slidr.h
wx/xrc/xh_spin.h wx/xrc/xh_spin.h

View File

@@ -2926,6 +2926,7 @@ XRC_SRC =
src/xrc/xh_scrol.cpp src/xrc/xh_scrol.cpp
src/xrc/xh_scwin.cpp src/xrc/xh_scwin.cpp
src/xrc/xh_htmllbox.cpp src/xrc/xh_htmllbox.cpp
src/xrc/xh_simplebook.cpp
src/xrc/xh_sizer.cpp src/xrc/xh_sizer.cpp
src/xrc/xh_slidr.cpp src/xrc/xh_slidr.cpp
src/xrc/xh_spin.cpp src/xrc/xh_spin.cpp
@@ -2993,6 +2994,7 @@ XRC_HDR =
wx/xrc/xh_scrol.h wx/xrc/xh_scrol.h
wx/xrc/xh_scwin.h wx/xrc/xh_scwin.h
wx/xrc/xh_htmllbox.h wx/xrc/xh_htmllbox.h
wx/xrc/xh_simplebook.h
wx/xrc/xh_sizer.h wx/xrc/xh_sizer.h
wx/xrc/xh_slidr.h wx/xrc/xh_slidr.h
wx/xrc/xh_spin.h wx/xrc/xh_spin.h

View File

@@ -1226,6 +1226,7 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_scrol.obj \ $(OBJS)\xrcdll_xh_scrol.obj \
$(OBJS)\xrcdll_xh_scwin.obj \ $(OBJS)\xrcdll_xh_scwin.obj \
$(OBJS)\xrcdll_xh_htmllbox.obj \ $(OBJS)\xrcdll_xh_htmllbox.obj \
$(OBJS)\xrcdll_xh_simplebook.obj \
$(OBJS)\xrcdll_xh_sizer.obj \ $(OBJS)\xrcdll_xh_sizer.obj \
$(OBJS)\xrcdll_xh_slidr.obj \ $(OBJS)\xrcdll_xh_slidr.obj \
$(OBJS)\xrcdll_xh_spin.obj \ $(OBJS)\xrcdll_xh_spin.obj \
@@ -1301,6 +1302,7 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_scrol.obj \ $(OBJS)\xrclib_xh_scrol.obj \
$(OBJS)\xrclib_xh_scwin.obj \ $(OBJS)\xrclib_xh_scwin.obj \
$(OBJS)\xrclib_xh_htmllbox.obj \ $(OBJS)\xrclib_xh_htmllbox.obj \
$(OBJS)\xrclib_xh_simplebook.obj \
$(OBJS)\xrclib_xh_sizer.obj \ $(OBJS)\xrclib_xh_sizer.obj \
$(OBJS)\xrclib_xh_slidr.obj \ $(OBJS)\xrclib_xh_slidr.obj \
$(OBJS)\xrclib_xh_spin.obj \ $(OBJS)\xrclib_xh_spin.obj \
@@ -1687,6 +1689,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_scrol.obj \ $(OBJS)\monodll_xh_scrol.obj \
$(OBJS)\monodll_xh_scwin.obj \ $(OBJS)\monodll_xh_scwin.obj \
$(OBJS)\monodll_xh_htmllbox.obj \ $(OBJS)\monodll_xh_htmllbox.obj \
$(OBJS)\monodll_xh_simplebook.obj \
$(OBJS)\monodll_xh_sizer.obj \ $(OBJS)\monodll_xh_sizer.obj \
$(OBJS)\monodll_xh_slidr.obj \ $(OBJS)\monodll_xh_slidr.obj \
$(OBJS)\monodll_xh_spin.obj \ $(OBJS)\monodll_xh_spin.obj \
@@ -2494,6 +2497,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_scrol.obj \ $(OBJS)\monolib_xh_scrol.obj \
$(OBJS)\monolib_xh_scwin.obj \ $(OBJS)\monolib_xh_scwin.obj \
$(OBJS)\monolib_xh_htmllbox.obj \ $(OBJS)\monolib_xh_htmllbox.obj \
$(OBJS)\monolib_xh_simplebook.obj \
$(OBJS)\monolib_xh_sizer.obj \ $(OBJS)\monolib_xh_sizer.obj \
$(OBJS)\monolib_xh_slidr.obj \ $(OBJS)\monolib_xh_slidr.obj \
$(OBJS)\monolib_xh_spin.obj \ $(OBJS)\monolib_xh_spin.obj \
@@ -7188,6 +7192,9 @@ $(OBJS)\monodll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
$(OBJS)\monodll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp $(OBJS)\monodll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp
$(OBJS)\monodll_xh_simplebook.obj: ..\..\src\xrc\xh_simplebook.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_simplebook.cpp
$(OBJS)\monodll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(OBJS)\monodll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp
@@ -9656,6 +9663,9 @@ $(OBJS)\monolib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
$(OBJS)\monolib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp $(OBJS)\monolib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp
$(OBJS)\monolib_xh_simplebook.obj: ..\..\src\xrc\xh_simplebook.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_simplebook.cpp
$(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp
@@ -15549,6 +15559,9 @@ $(OBJS)\xrcdll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
$(OBJS)\xrcdll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp $(OBJS)\xrcdll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp
$(OBJS)\xrcdll_xh_simplebook.obj: ..\..\src\xrc\xh_simplebook.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_simplebook.cpp
$(OBJS)\xrcdll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(OBJS)\xrcdll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp
@@ -15747,6 +15760,9 @@ $(OBJS)\xrclib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
$(OBJS)\xrclib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp $(OBJS)\xrclib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp
$(OBJS)\xrclib_xh_simplebook.obj: ..\..\src\xrc\xh_simplebook.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_simplebook.cpp
$(OBJS)\xrclib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(OBJS)\xrclib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp

View File

@@ -1230,6 +1230,7 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_scrol.o \ $(OBJS)\xrcdll_xh_scrol.o \
$(OBJS)\xrcdll_xh_scwin.o \ $(OBJS)\xrcdll_xh_scwin.o \
$(OBJS)\xrcdll_xh_htmllbox.o \ $(OBJS)\xrcdll_xh_htmllbox.o \
$(OBJS)\xrcdll_xh_simplebook.o \
$(OBJS)\xrcdll_xh_sizer.o \ $(OBJS)\xrcdll_xh_sizer.o \
$(OBJS)\xrcdll_xh_slidr.o \ $(OBJS)\xrcdll_xh_slidr.o \
$(OBJS)\xrcdll_xh_spin.o \ $(OBJS)\xrcdll_xh_spin.o \
@@ -1305,6 +1306,7 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_scrol.o \ $(OBJS)\xrclib_xh_scrol.o \
$(OBJS)\xrclib_xh_scwin.o \ $(OBJS)\xrclib_xh_scwin.o \
$(OBJS)\xrclib_xh_htmllbox.o \ $(OBJS)\xrclib_xh_htmllbox.o \
$(OBJS)\xrclib_xh_simplebook.o \
$(OBJS)\xrclib_xh_sizer.o \ $(OBJS)\xrclib_xh_sizer.o \
$(OBJS)\xrclib_xh_slidr.o \ $(OBJS)\xrclib_xh_slidr.o \
$(OBJS)\xrclib_xh_spin.o \ $(OBJS)\xrclib_xh_spin.o \
@@ -1705,6 +1707,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_scrol.o \ $(OBJS)\monodll_xh_scrol.o \
$(OBJS)\monodll_xh_scwin.o \ $(OBJS)\monodll_xh_scwin.o \
$(OBJS)\monodll_xh_htmllbox.o \ $(OBJS)\monodll_xh_htmllbox.o \
$(OBJS)\monodll_xh_simplebook.o \
$(OBJS)\monodll_xh_sizer.o \ $(OBJS)\monodll_xh_sizer.o \
$(OBJS)\monodll_xh_slidr.o \ $(OBJS)\monodll_xh_slidr.o \
$(OBJS)\monodll_xh_spin.o \ $(OBJS)\monodll_xh_spin.o \
@@ -2518,6 +2521,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_scrol.o \ $(OBJS)\monolib_xh_scrol.o \
$(OBJS)\monolib_xh_scwin.o \ $(OBJS)\monolib_xh_scwin.o \
$(OBJS)\monolib_xh_htmllbox.o \ $(OBJS)\monolib_xh_htmllbox.o \
$(OBJS)\monolib_xh_simplebook.o \
$(OBJS)\monolib_xh_sizer.o \ $(OBJS)\monolib_xh_sizer.o \
$(OBJS)\monolib_xh_slidr.o \ $(OBJS)\monolib_xh_slidr.o \
$(OBJS)\monolib_xh_spin.o \ $(OBJS)\monolib_xh_spin.o \
@@ -7363,6 +7367,9 @@ $(OBJS)\monodll_xh_scwin.o: ../../src/xrc/xh_scwin.cpp
$(OBJS)\monodll_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp $(OBJS)\monodll_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xh_simplebook.o: ../../src/xrc/xh_simplebook.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xh_sizer.o: ../../src/xrc/xh_sizer.cpp $(OBJS)\monodll_xh_sizer.o: ../../src/xrc/xh_sizer.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9831,6 +9838,9 @@ $(OBJS)\monolib_xh_scwin.o: ../../src/xrc/xh_scwin.cpp
$(OBJS)\monolib_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp $(OBJS)\monolib_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xh_simplebook.o: ../../src/xrc/xh_simplebook.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xh_sizer.o: ../../src/xrc/xh_sizer.cpp $(OBJS)\monolib_xh_sizer.o: ../../src/xrc/xh_sizer.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -15724,6 +15734,9 @@ $(OBJS)\xrcdll_xh_scwin.o: ../../src/xrc/xh_scwin.cpp
$(OBJS)\xrcdll_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp $(OBJS)\xrcdll_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrcdll_xh_simplebook.o: ../../src/xrc/xh_simplebook.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrcdll_xh_sizer.o: ../../src/xrc/xh_sizer.cpp $(OBJS)\xrcdll_xh_sizer.o: ../../src/xrc/xh_sizer.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -15922,6 +15935,9 @@ $(OBJS)\xrclib_xh_scwin.o: ../../src/xrc/xh_scwin.cpp
$(OBJS)\xrclib_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp $(OBJS)\xrclib_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrclib_xh_simplebook.o: ../../src/xrc/xh_simplebook.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrclib_xh_sizer.o: ../../src/xrc/xh_sizer.cpp $(OBJS)\xrclib_xh_sizer.o: ../../src/xrc/xh_sizer.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<

View File

@@ -1359,6 +1359,7 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_scrol.obj \ $(OBJS)\xrcdll_xh_scrol.obj \
$(OBJS)\xrcdll_xh_scwin.obj \ $(OBJS)\xrcdll_xh_scwin.obj \
$(OBJS)\xrcdll_xh_htmllbox.obj \ $(OBJS)\xrcdll_xh_htmllbox.obj \
$(OBJS)\xrcdll_xh_simplebook.obj \
$(OBJS)\xrcdll_xh_sizer.obj \ $(OBJS)\xrcdll_xh_sizer.obj \
$(OBJS)\xrcdll_xh_slidr.obj \ $(OBJS)\xrcdll_xh_slidr.obj \
$(OBJS)\xrcdll_xh_spin.obj \ $(OBJS)\xrcdll_xh_spin.obj \
@@ -1440,6 +1441,7 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_scrol.obj \ $(OBJS)\xrclib_xh_scrol.obj \
$(OBJS)\xrclib_xh_scwin.obj \ $(OBJS)\xrclib_xh_scwin.obj \
$(OBJS)\xrclib_xh_htmllbox.obj \ $(OBJS)\xrclib_xh_htmllbox.obj \
$(OBJS)\xrclib_xh_simplebook.obj \
$(OBJS)\xrclib_xh_sizer.obj \ $(OBJS)\xrclib_xh_sizer.obj \
$(OBJS)\xrclib_xh_slidr.obj \ $(OBJS)\xrclib_xh_slidr.obj \
$(OBJS)\xrclib_xh_spin.obj \ $(OBJS)\xrclib_xh_spin.obj \
@@ -1987,6 +1989,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_scrol.obj \ $(OBJS)\monodll_xh_scrol.obj \
$(OBJS)\monodll_xh_scwin.obj \ $(OBJS)\monodll_xh_scwin.obj \
$(OBJS)\monodll_xh_htmllbox.obj \ $(OBJS)\monodll_xh_htmllbox.obj \
$(OBJS)\monodll_xh_simplebook.obj \
$(OBJS)\monodll_xh_sizer.obj \ $(OBJS)\monodll_xh_sizer.obj \
$(OBJS)\monodll_xh_slidr.obj \ $(OBJS)\monodll_xh_slidr.obj \
$(OBJS)\monodll_xh_spin.obj \ $(OBJS)\monodll_xh_spin.obj \
@@ -2800,6 +2803,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_scrol.obj \ $(OBJS)\monolib_xh_scrol.obj \
$(OBJS)\monolib_xh_scwin.obj \ $(OBJS)\monolib_xh_scwin.obj \
$(OBJS)\monolib_xh_htmllbox.obj \ $(OBJS)\monolib_xh_htmllbox.obj \
$(OBJS)\monolib_xh_simplebook.obj \
$(OBJS)\monolib_xh_sizer.obj \ $(OBJS)\monolib_xh_sizer.obj \
$(OBJS)\monolib_xh_slidr.obj \ $(OBJS)\monolib_xh_slidr.obj \
$(OBJS)\monolib_xh_spin.obj \ $(OBJS)\monolib_xh_spin.obj \
@@ -7880,6 +7884,9 @@ $(OBJS)\monodll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
$(OBJS)\monodll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp $(OBJS)\monodll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp
$(OBJS)\monodll_xh_simplebook.obj: ..\..\src\xrc\xh_simplebook.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_simplebook.cpp
$(OBJS)\monodll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(OBJS)\monodll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp
@@ -10348,6 +10355,9 @@ $(OBJS)\monolib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
$(OBJS)\monolib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp $(OBJS)\monolib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp
$(OBJS)\monolib_xh_simplebook.obj: ..\..\src\xrc\xh_simplebook.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_simplebook.cpp
$(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp
@@ -16241,6 +16251,9 @@ $(OBJS)\xrcdll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
$(OBJS)\xrcdll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp $(OBJS)\xrcdll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp
$(OBJS)\xrcdll_xh_simplebook.obj: ..\..\src\xrc\xh_simplebook.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_simplebook.cpp
$(OBJS)\xrcdll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(OBJS)\xrcdll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp
@@ -16439,6 +16452,9 @@ $(OBJS)\xrclib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
$(OBJS)\xrclib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp $(OBJS)\xrclib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp
$(OBJS)\xrclib_xh_simplebook.obj: ..\..\src\xrc\xh_simplebook.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_simplebook.cpp
$(OBJS)\xrclib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(OBJS)\xrclib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp

View File

@@ -2831,6 +2831,9 @@
<File <File
RelativePath="..\..\include\wx\xrc\xh_scwin.h"> RelativePath="..\..\include\wx\xrc\xh_scwin.h">
</File> </File>
<File
RelativePath="..\..\include\wx\xrc\xh_simplebook.h">
</File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_sizer.h"> RelativePath="..\..\include\wx\xrc\xh_sizer.h">
</File> </File>

View File

@@ -545,6 +545,9 @@
<File <File
RelativePath="..\..\include\wx\xrc\xh_scwin.h"> RelativePath="..\..\include\wx\xrc\xh_scwin.h">
</File> </File>
<File
RelativePath="..\..\include\wx\xrc\xh_simplebook.h">
</File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_sizer.h"> RelativePath="..\..\include\wx\xrc\xh_sizer.h">
</File> </File>
@@ -739,6 +742,9 @@
<File <File
RelativePath="..\..\src\xrc\xh_scwin.cpp"> RelativePath="..\..\src\xrc\xh_scwin.cpp">
</File> </File>
<File
RelativePath="..\..\src\xrc\xh_simplebook.cpp">
</File>
<File <File
RelativePath="..\..\src\xrc\xh_sizer.cpp"> RelativePath="..\..\src\xrc\xh_sizer.cpp">
</File> </File>

View File

@@ -4276,6 +4276,10 @@
RelativePath="..\..\include\wx\xrc\xh_scwin.h" RelativePath="..\..\include\wx\xrc\xh_scwin.h"
> >
</File> </File>
<File
RelativePath="..\..\include\wx\xrc\xh_simplebook.h"
>
</File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_sizer.h" RelativePath="..\..\include\wx\xrc\xh_sizer.h"
> >

View File

@@ -1229,6 +1229,10 @@
RelativePath="..\..\include\wx\xrc\xh_scwin.h" RelativePath="..\..\include\wx\xrc\xh_scwin.h"
> >
</File> </File>
<File
RelativePath="..\..\include\wx\xrc\xh_simplebook.h"
>
</File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_sizer.h" RelativePath="..\..\include\wx\xrc\xh_sizer.h"
> >
@@ -1487,6 +1491,10 @@
RelativePath="..\..\src\xrc\xh_scwin.cpp" RelativePath="..\..\src\xrc\xh_scwin.cpp"
> >
</File> </File>
<File
RelativePath="..\..\src\xrc\xh_simplebook.cpp"
>
</File>
<File <File
RelativePath="..\..\src\xrc\xh_sizer.cpp" RelativePath="..\..\src\xrc\xh_sizer.cpp"
> >

View File

@@ -4272,6 +4272,10 @@
RelativePath="..\..\include\wx\xrc\xh_scwin.h" RelativePath="..\..\include\wx\xrc\xh_scwin.h"
> >
</File> </File>
<File
RelativePath="..\..\include\wx\xrc\xh_simplebook.h"
>
</File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_sizer.h" RelativePath="..\..\include\wx\xrc\xh_sizer.h"
> >

View File

@@ -1225,6 +1225,10 @@
RelativePath="..\..\include\wx\xrc\xh_scwin.h" RelativePath="..\..\include\wx\xrc\xh_scwin.h"
> >
</File> </File>
<File
RelativePath="..\..\include\wx\xrc\xh_simplebook.h"
>
</File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_sizer.h" RelativePath="..\..\include\wx\xrc\xh_sizer.h"
> >
@@ -1483,6 +1487,10 @@
RelativePath="..\..\src\xrc\xh_scwin.cpp" RelativePath="..\..\src\xrc\xh_scwin.cpp"
> >
</File> </File>
<File
RelativePath="..\..\src\xrc\xh_simplebook.cpp"
>
</File>
<File <File
RelativePath="..\..\src\xrc\xh_sizer.cpp" RelativePath="..\..\src\xrc\xh_sizer.cpp"
> >

View File

@@ -499,6 +499,7 @@
<ClCompile Include="..\..\src\xrc\xh_radbx.cpp" /> <ClCompile Include="..\..\src\xrc\xh_radbx.cpp" />
<ClCompile Include="..\..\src\xrc\xh_scrol.cpp" /> <ClCompile Include="..\..\src\xrc\xh_scrol.cpp" />
<ClCompile Include="..\..\src\xrc\xh_scwin.cpp" /> <ClCompile Include="..\..\src\xrc\xh_scwin.cpp" />
<ClCompile Include="..\..\src\xrc\xh_simplebook.cpp" />
<ClCompile Include="..\..\src\xrc\xh_sizer.cpp" /> <ClCompile Include="..\..\src\xrc\xh_sizer.cpp" />
<ClCompile Include="..\..\src\xrc\xh_slidr.cpp" /> <ClCompile Include="..\..\src\xrc\xh_slidr.cpp" />
<ClCompile Include="..\..\src\xrc\xh_spin.cpp" /> <ClCompile Include="..\..\src\xrc\xh_spin.cpp" />
@@ -595,6 +596,7 @@
<ClInclude Include="..\..\include\wx\xrc\xh_radbx.h" /> <ClInclude Include="..\..\include\wx\xrc\xh_radbx.h" />
<ClInclude Include="..\..\include\wx\xrc\xh_scrol.h" /> <ClInclude Include="..\..\include\wx\xrc\xh_scrol.h" />
<ClInclude Include="..\..\include\wx\xrc\xh_scwin.h" /> <ClInclude Include="..\..\include\wx\xrc\xh_scwin.h" />
<ClInclude Include="..\..\include\wx\xrc\xh_simplebook.h" />
<ClInclude Include="..\..\include\wx\xrc\xh_sizer.h" /> <ClInclude Include="..\..\include\wx\xrc\xh_sizer.h" />
<ClInclude Include="..\..\include\wx\xrc\xh_slidr.h" /> <ClInclude Include="..\..\include\wx\xrc\xh_slidr.h" />
<ClInclude Include="..\..\include\wx\xrc\xh_spin.h" /> <ClInclude Include="..\..\include\wx\xrc\xh_spin.h" />

View File

@@ -154,6 +154,9 @@
<ClCompile Include="..\..\src\xrc\xh_scwin.cpp"> <ClCompile Include="..\..\src\xrc\xh_scwin.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\xrc\xh_simplebook.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\xrc\xh_sizer.cpp"> <ClCompile Include="..\..\src\xrc\xh_sizer.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@@ -359,6 +362,9 @@
<ClInclude Include="..\..\include\wx\xrc\xh_scwin.h"> <ClInclude Include="..\..\include\wx\xrc\xh_scwin.h">
<Filter>Common Headers</Filter> <Filter>Common Headers</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\wx\xrc\xh_simplebook.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\xrc\xh_sizer.h"> <ClInclude Include="..\..\include\wx\xrc\xh_sizer.h">
<Filter>Common Headers</Filter> <Filter>Common Headers</Filter>
</ClInclude> </ClInclude>

View File

@@ -1726,6 +1726,32 @@ HTML markup. Note that the markup has to be escaped:
@endcode @endcode
@subsubsection xrc_wxsimplebook wxSimplebook
wxSimplebook is similar to @ref xrc_wxnotebook "wxNotebook" but simpler: as it
doesn't show any page headers, it doesn't use neither image list nor individual
page bitmaps and while it still accepts page labels, they are optional as they
are not shown to the user neither.
So @c simplebookpage child elements, that must occur inside this object, only
have the following properties:
@c choicebookpage objects have the following properties:
@beginTable
@hdr3col{property, type, description}
@row3col{label, @ref overview_xrcformat_type_text,
Page's label (default: empty).}
@row3col{selected, @ref overview_xrcformat_type_bool,
Is the page selected initially (only one page can be selected; default: 0)?}
@endTable
As with all the other book page elements, each @c simplebookpage must have
exactly one non-toplevel window as its child.
@since 3.0.2
@subsubsection xrc_wxslider wxSlider @subsubsection xrc_wxslider wxSlider
@beginTable @beginTable

View File

@@ -41,6 +41,16 @@ public:
Init(); Init();
} }
bool Create(wxWindow *parent,
wxWindowID winid = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxEmptyString)
{
return wxBookCtrlBase::Create(parent, winid, pos, size, style | wxBK_TOP, name);
}
// Methods specific to this class. // Methods specific to this class.

View File

@@ -56,6 +56,7 @@
#include "wx/xrc/xh_radbx.h" #include "wx/xrc/xh_radbx.h"
#include "wx/xrc/xh_scrol.h" #include "wx/xrc/xh_scrol.h"
#include "wx/xrc/xh_scwin.h" #include "wx/xrc/xh_scwin.h"
#include "wx/xrc/xh_simplebook.h"
#include "wx/xrc/xh_sizer.h" #include "wx/xrc/xh_sizer.h"
#include "wx/xrc/xh_slidr.h" #include "wx/xrc/xh_slidr.h"
#include "wx/xrc/xh_spin.h" #include "wx/xrc/xh_spin.h"

View File

@@ -0,0 +1,36 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/xrc/xh_simplebook.h
// Purpose: XML resource handler for wxSimplebook
// Author: Vadim Zeitlin
// Created: 2014-08-05
// Copyright: (c) 2014 Vadim Zeitlin
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_XH_SIMPLEBOOK_H_
#define _WX_XH_SIMPLEBOOK_H_
#include "wx/xrc/xmlres.h"
#if wxUSE_XRC && wxUSE_BOOKCTRL
class wxSimplebook;
class WXDLLIMPEXP_XRC wxSimplebookXmlHandler : public wxXmlResourceHandler
{
public:
wxSimplebookXmlHandler();
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
bool m_isInside;
wxSimplebook *m_simplebook;
wxDECLARE_DYNAMIC_CLASS(wxSimplebookXmlHandler);
};
#endif // wxUSE_XRC && wxUSE_BOOKCTRL
#endif // _WX_XH_SIMPLEBOOK_H_

View File

@@ -43,8 +43,7 @@ public:
/** /**
Default constructor. Default constructor.
Use Create() (inherited from the base class) later to really create the Use Create() later to really create the control.
control.
*/ */
wxSimplebook(); wxSimplebook();
@@ -58,6 +57,18 @@ public:
long style = 0, long style = 0,
const wxString& name = wxEmptyString); const wxString& name = wxEmptyString);
/**
Really create the window of an object created using default
constructor.
@since 3.0.2
*/
bool Create(wxWindow* parent,
wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxEmptyString);
/** /**
Set the effects to use for showing and hiding the pages. Set the effects to use for showing and hiding the pages.

View File

@@ -203,6 +203,7 @@ builtinWindowClasses =
| wxScrollBar | wxScrollBar
| wxScrolledWindow | wxScrolledWindow
| wxSimpleHtmlListBox | wxSimpleHtmlListBox
| wxSimplebook
| wxSlider | wxSlider
| wxSpinButton | wxSpinButton
| wxSpinCtrl | wxSpinCtrl
@@ -292,6 +293,7 @@ builtinClassesNames =
| "wxScrollBar" | "wxScrollBar"
| "wxScrolledWindow" | "wxScrolledWindow"
| "wxSimpleHtmlListBox" | "wxSimpleHtmlListBox"
| "wxSimplebook"
| "wxSlider" | "wxSlider"
| "wxSpinButton" | "wxSpinButton"
| "wxSpinCtrl" | "wxSpinCtrl"
@@ -332,6 +334,7 @@ builtinNestedClassesNames =
| "notebookpage" | "notebookpage"
| "choicebookpage" | "choicebookpage"
| "listbookpage" | "listbookpage"
| "simplebookpage"
| "treebookpage" | "treebookpage"
| "propertysheetpage" | "propertysheetpage"
| "ownerdrawnitem" | "ownerdrawnitem"
@@ -1276,6 +1279,24 @@ wxSimpleHtmlListBox =
} }
wxSimplebook =
element object {
attribute class { "wxSimplebook" } &
stdObjectNodeAttributes &
stdWindowProperties &
(wxSimplebook_simplebookpage | objectRef)*
}
wxSimplebook_simplebookpage =
element object {
attribute class { "simplebookpage" } &
platform &
element label {_, t_text }* &
[xrc:p="o"] element selected {_, t_bool }* &
windowNode
}
wxSlider = wxSlider =
element object { element object {
attribute class { "wxSlider" } & attribute class { "wxSlider" } &

101
src/xrc/xh_simplebook.cpp Normal file
View File

@@ -0,0 +1,101 @@
/////////////////////////////////////////////////////////////////////////////
// Name: src/xrc/xh_simplebook.cpp
// Purpose: XRC resource handler for wxSimplebook
// Author: Vaclav Slavik
// Created: 2014-08-05
// Copyright: (c) 2014 Vadim Zeitlin
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if wxUSE_XRC && wxUSE_BOOKCTRL
#include "wx/xrc/xh_simplebook.h"
#ifndef WX_PRECOMP
#endif
#include "wx/simplebook.h"
wxIMPLEMENT_DYNAMIC_CLASS(wxSimplebookXmlHandler, wxXmlResourceHandler);
wxSimplebookXmlHandler::wxSimplebookXmlHandler()
: wxXmlResourceHandler(),
m_isInside(false),
m_simplebook(NULL)
{
AddWindowStyles();
}
wxObject *wxSimplebookXmlHandler::DoCreateResource()
{
if (m_class == wxS("simplebookpage"))
{
wxXmlNode *n = GetParamNode(wxS("object"));
if ( !n )
n = GetParamNode(wxS("object_ref"));
if (n)
{
bool old_ins = m_isInside;
m_isInside = false;
wxObject *item = CreateResFromNode(n, m_simplebook, NULL);
m_isInside = old_ins;
wxWindow *wnd = wxDynamicCast(item, wxWindow);
if (wnd)
{
m_simplebook->AddPage(wnd, GetText(wxS("label")),
GetBool(wxS("selected")));
}
else
{
ReportError(n, "simplebookpage child must be a window");
}
return wnd;
}
else
{
ReportError("simplebookpage must have a window child");
return NULL;
}
}
else
{
XRC_MAKE_INSTANCE(sb, wxSimplebook)
sb->Create(m_parentAsWindow,
GetID(),
GetPosition(), GetSize(),
GetStyle(wxS("style")),
GetName());
SetupWindow(sb);
wxSimplebook *old_par = m_simplebook;
m_simplebook = sb;
bool old_ins = m_isInside;
m_isInside = true;
CreateChildren(m_simplebook, true/*only this handler*/);
m_isInside = old_ins;
m_simplebook = old_par;
return sb;
}
}
bool wxSimplebookXmlHandler::CanHandle(wxXmlNode *node)
{
return ((!m_isInside && IsOfClass(node, wxS("wxSimplebook"))) ||
(m_isInside && IsOfClass(node, wxS("simplebookpage"))));
}
#endif // wxUSE_XRC && wxUSE_BOOKCTRL

View File

@@ -151,6 +151,9 @@ void wxXmlResource::InitAllHandlers()
#if wxUSE_SEARCHCTRL #if wxUSE_SEARCHCTRL
AddHandler(new wxSearchCtrlXmlHandler); AddHandler(new wxSearchCtrlXmlHandler);
#endif #endif
#if wxUSE_BOOKCTRL
AddHandler(new wxSimplebookXmlHandler);
#endif
#if wxUSE_SLIDER #if wxUSE_SLIDER
AddHandler(new wxSliderXmlHandler); AddHandler(new wxSliderXmlHandler);
#endif #endif