Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add XRC handler for wxSimplebook.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

16
build/msw/makefile.gcc
View File

@@ -1230,6 +1230,7 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_scrol.o \
$(OBJS)\xrcdll_xh_scwin.o \
$(OBJS)\xrcdll_xh_htmllbox.o \
$(OBJS)\xrcdll_xh_simplebook.o \
$(OBJS)\xrcdll_xh_sizer.o \
$(OBJS)\xrcdll_xh_slidr.o \
$(OBJS)\xrcdll_xh_spin.o \
@@ -1305,6 +1306,7 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_scrol.o \
$(OBJS)\xrclib_xh_scwin.o \
$(OBJS)\xrclib_xh_htmllbox.o \
$(OBJS)\xrclib_xh_simplebook.o \
$(OBJS)\xrclib_xh_sizer.o \
$(OBJS)\xrclib_xh_slidr.o \
$(OBJS)\xrclib_xh_spin.o \
@@ -1705,6 +1707,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_scrol.o \
$(OBJS)\monodll_xh_scwin.o \
$(OBJS)\monodll_xh_htmllbox.o \
$(OBJS)\monodll_xh_simplebook.o \
$(OBJS)\monodll_xh_sizer.o \
$(OBJS)\monodll_xh_slidr.o \
$(OBJS)\monodll_xh_spin.o \
@@ -2518,6 +2521,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_scrol.o \
$(OBJS)\monolib_xh_scwin.o \
$(OBJS)\monolib_xh_htmllbox.o \
$(OBJS)\monolib_xh_simplebook.o \
$(OBJS)\monolib_xh_sizer.o \
$(OBJS)\monolib_xh_slidr.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
$(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
$(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
$(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
$(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
$(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
$(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
$(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
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<