AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add XRC handler for wxAuiToolBar.

Browse Source 
Also add the demonstration of AUI handlers (this one and the existing one for
wxAuiNotebook) to the xrc sample.

See #15686.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2013-11-23 00:34:55 +00:00
parent 76845041b7
commit f269f868d7
37 changed files with 856 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.in
View File

@ -1884,6 +1884,7 @@ AUIDLL_OBJECTS = \
auidll_tabmdi.o \
auidll_tabart.o \
auidll_xh_auinotbk.o \
auidll_xh_auitoolb.o \
$(__AUI_GTK_SRC_OBJECTS_2)
AUIDLL_ODEP = $(_____pch_wxprec_auidll_wx_wxprec_h_gch___depname)
AUILIB_CXXFLAGS = $(__auilib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
@ -1900,6 +1901,7 @@ AUILIB_OBJECTS = \
auilib_tabmdi.o \
auilib_tabart.o \
auilib_xh_auinotbk.o \
auilib_xh_auitoolb.o \
$(__AUI_GTK_SRC_OBJECTS_3)
AUILIB_ODEP = $(_____pch_wxprec_auilib_wx_wxprec_h_gch___depname)
RIBBONDLL_CXXFLAGS = $(__ribbondll_PCH_INC) -D__WX$(TOOLKIT)__ \
@ -4381,6 +4383,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \
wx/aui/aui.h \
wx/aui/tabart.h \
wx/xrc/xh_auinotbk.h \
wx/xrc/xh_auitoolb.h \
$(AUI_GTK_HDR) \
wx/propgrid/advprops.h \
wx/propgrid/editors.h \
@ -4707,6 +4710,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \
monodll_tabmdi.o \
monodll_tabart.o \
monodll_xh_auinotbk.o \
monodll_xh_auitoolb.o \
$(__AUI_GTK_SRC_OBJECTS) \
monodll_advprops.o \
monodll_editors.o \
@ -6955,6 +6959,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \
monolib_tabmdi.o \
monolib_tabart.o \
monolib_xh_auinotbk.o \
monolib_xh_auitoolb.o \
$(__AUI_GTK_SRC_OBJECTS_1) \
monolib_advprops.o \
monolib_editors.o \
@ -18756,6 +18761,9 @@ monodll_tabart.o: $(srcdir)/src/aui/tabart.cpp $(MONODLL_ODEP)
monodll_xh_auinotbk.o: $(srcdir)/src/xrc/xh_auinotbk.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_auinotbk.cpp
monodll_xh_auitoolb.o: $(srcdir)/src/xrc/xh_auitoolb.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_auitoolb.cpp
monodll_tabartgtk.o: $(srcdir)/src/aui/tabartgtk.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/tabartgtk.cpp
@ -24624,6 +24632,9 @@ monolib_tabart.o: $(srcdir)/src/aui/tabart.cpp $(MONOLIB_ODEP)
monolib_xh_auinotbk.o: $(srcdir)/src/xrc/xh_auinotbk.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_auinotbk.cpp
monolib_xh_auitoolb.o: $(srcdir)/src/xrc/xh_auitoolb.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_auitoolb.cpp
monolib_tabartgtk.o: $(srcdir)/src/aui/tabartgtk.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/tabartgtk.cpp
@ -40206,6 +40217,9 @@ auidll_tabart.o: $(srcdir)/src/aui/tabart.cpp $(AUIDLL_ODEP)
auidll_xh_auinotbk.o: $(srcdir)/src/xrc/xh_auinotbk.cpp $(AUIDLL_ODEP)
$(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_auinotbk.cpp
auidll_xh_auitoolb.o: $(srcdir)/src/xrc/xh_auitoolb.cpp $(AUIDLL_ODEP)
$(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_auitoolb.cpp
auidll_tabartgtk.o: $(srcdir)/src/aui/tabartgtk.cpp $(AUIDLL_ODEP)
$(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/tabartgtk.cpp
@ -40233,6 +40247,9 @@ auilib_tabart.o: $(srcdir)/src/aui/tabart.cpp $(AUILIB_ODEP)
auilib_xh_auinotbk.o: $(srcdir)/src/xrc/xh_auinotbk.cpp $(AUILIB_ODEP)
$(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/xrc/xh_auinotbk.cpp
auilib_xh_auitoolb.o: $(srcdir)/src/xrc/xh_auitoolb.cpp $(AUILIB_ODEP)
$(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/xrc/xh_auitoolb.cpp
auilib_tabartgtk.o: $(srcdir)/src/aui/tabartgtk.cpp $(AUILIB_ODEP)
$(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabartgtk.cpp

2
build/bakefiles/files.bkl
View File

@ -3690,6 +3690,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/aui/tabmdi.cpp
src/aui/tabart.cpp
src/xrc/xh_auinotbk.cpp
src/xrc/xh_auitoolb.cpp
$(AUI_GTK_SRC)
</set>
<set var="AUI_HDR" hints="files">
@ -3702,6 +3703,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/aui/aui.h
wx/aui/tabart.h
wx/xrc/xh_auinotbk.h
wx/xrc/xh_auitoolb.h
$(AUI_GTK_HDR)
</set>

20
build/msw/makefile.bcc
View File

@ -1355,7 +1355,8 @@ AUIDLL_OBJECTS = \
$(OBJS)\auidll_auibar.obj \
$(OBJS)\auidll_tabmdi.obj \
$(OBJS)\auidll_tabart.obj \
$(OBJS)\auidll_xh_auinotbk.obj
$(OBJS)\auidll_xh_auinotbk.obj \
$(OBJS)\auidll_xh_auitoolb.obj
AUILIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@ -1374,7 +1375,8 @@ AUILIB_OBJECTS = \
$(OBJS)\auilib_auibar.obj \
$(OBJS)\auilib_tabmdi.obj \
$(OBJS)\auilib_tabart.obj \
$(OBJS)\auilib_xh_auinotbk.obj
$(OBJS)\auilib_xh_auinotbk.obj \
$(OBJS)\auilib_xh_auitoolb.obj
RIBBONDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@ -1737,6 +1739,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tabmdi.obj \
$(OBJS)\monodll_tabart.obj \
$(OBJS)\monodll_xh_auinotbk.obj \
$(OBJS)\monodll_xh_auitoolb.obj \
$(OBJS)\monodll_advprops.obj \
$(OBJS)\monodll_editors.obj \
$(OBJS)\monodll_manager.obj \
@ -2543,6 +2546,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tabmdi.obj \
$(OBJS)\monolib_tabart.obj \
$(OBJS)\monolib_xh_auinotbk.obj \
$(OBJS)\monolib_xh_auitoolb.obj \
$(OBJS)\monolib_advprops.obj \
$(OBJS)\monolib_editors.obj \
$(OBJS)\monolib_manager.obj \
@ -7282,6 +7286,9 @@ $(OBJS)\monodll_tabart.obj: ..\..\src\aui\tabart.cpp
$(OBJS)\monodll_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp
$(OBJS)\monodll_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_auitoolb.cpp
$(OBJS)\monodll_advprops.obj: ..\..\src\propgrid\advprops.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
@ -9750,6 +9757,9 @@ $(OBJS)\monolib_tabart.obj: ..\..\src\aui\tabart.cpp
$(OBJS)\monolib_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp
$(OBJS)\monolib_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_auitoolb.cpp
$(OBJS)\monolib_advprops.obj: ..\..\src\propgrid\advprops.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
@ -15856,6 +15866,9 @@ $(OBJS)\auidll_tabart.obj: ..\..\src\aui\tabart.cpp
$(OBJS)\auidll_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp
$(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp
$(OBJS)\auidll_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\xrc\xh_auitoolb.cpp
$(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp
@ -15883,6 +15896,9 @@ $(OBJS)\auilib_tabart.obj: ..\..\src\aui\tabart.cpp
$(OBJS)\auilib_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp
$(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp
$(OBJS)\auilib_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\xrc\xh_auitoolb.cpp
$(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp

20
build/msw/makefile.gcc
View File

@ -1356,7 +1356,8 @@ AUIDLL_OBJECTS = \
$(OBJS)\auidll_auibar.o \
$(OBJS)\auidll_tabmdi.o \
$(OBJS)\auidll_tabart.o \
$(OBJS)\auidll_xh_auinotbk.o
$(OBJS)\auidll_xh_auinotbk.o \
$(OBJS)\auidll_xh_auitoolb.o
AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@ -1374,7 +1375,8 @@ AUILIB_OBJECTS = \
$(OBJS)\auilib_auibar.o \
$(OBJS)\auilib_tabmdi.o \
$(OBJS)\auilib_tabart.o \
$(OBJS)\auilib_xh_auinotbk.o
$(OBJS)\auilib_xh_auinotbk.o \
$(OBJS)\auilib_xh_auitoolb.o
RIBBONDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@ -1751,6 +1753,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tabmdi.o \
$(OBJS)\monodll_tabart.o \
$(OBJS)\monodll_xh_auinotbk.o \
$(OBJS)\monodll_xh_auitoolb.o \
$(OBJS)\monodll_advprops.o \
$(OBJS)\monodll_editors.o \
$(OBJS)\monodll_manager.o \
@ -2563,6 +2566,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tabmdi.o \
$(OBJS)\monolib_tabart.o \
$(OBJS)\monolib_xh_auinotbk.o \
$(OBJS)\monolib_xh_auitoolb.o \
$(OBJS)\monolib_advprops.o \
$(OBJS)\monolib_editors.o \
$(OBJS)\monolib_manager.o \
@ -7453,6 +7457,9 @@ $(OBJS)\monodll_tabart.o: ../../src/aui/tabart.cpp
$(OBJS)\monodll_xh_auinotbk.o: ../../src/xrc/xh_auinotbk.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xh_auitoolb.o: ../../src/xrc/xh_auitoolb.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_advprops.o: ../../src/propgrid/advprops.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@ -9921,6 +9928,9 @@ $(OBJS)\monolib_tabart.o: ../../src/aui/tabart.cpp
$(OBJS)\monolib_xh_auinotbk.o: ../../src/xrc/xh_auinotbk.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xh_auitoolb.o: ../../src/xrc/xh_auitoolb.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_advprops.o: ../../src/propgrid/advprops.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@ -16027,6 +16037,9 @@ $(OBJS)\auidll_tabart.o: ../../src/aui/tabart.cpp
$(OBJS)\auidll_xh_auinotbk.o: ../../src/xrc/xh_auinotbk.cpp
$(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\auidll_xh_auitoolb.o: ../../src/xrc/xh_auitoolb.cpp
$(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\auilib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $<
@ -16054,6 +16067,9 @@ $(OBJS)\auilib_tabart.o: ../../src/aui/tabart.cpp
$(OBJS)\auilib_xh_auinotbk.o: ../../src/xrc/xh_auinotbk.cpp
$(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\auilib_xh_auitoolb.o: ../../src/xrc/xh_auitoolb.cpp
$(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\ribbondll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $<

20
build/msw/makefile.vc
View File

@ -1494,7 +1494,8 @@ AUIDLL_OBJECTS = \
$(OBJS)\auidll_auibar.obj \
$(OBJS)\auidll_tabmdi.obj \
$(OBJS)\auidll_tabart.obj \
$(OBJS)\auidll_xh_auinotbk.obj
$(OBJS)\auidll_xh_auinotbk.obj \
$(OBJS)\auidll_xh_auitoolb.obj
AUIDLL_RESOURCES = \
$(OBJS)\auidll_version.res
AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_472)$(__DEBUGRUNTIME) /DWIN32 \
@ -1519,7 +1520,8 @@ AUILIB_OBJECTS = \
$(OBJS)\auilib_auibar.obj \
$(OBJS)\auilib_tabmdi.obj \
$(OBJS)\auilib_tabart.obj \
$(OBJS)\auilib_xh_auinotbk.obj
$(OBJS)\auilib_xh_auinotbk.obj \
$(OBJS)\auilib_xh_auitoolb.obj
RIBBONDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_488)$(__DEBUGRUNTIME) /DWIN32 \
$(__DEBUGINFO) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).pdb \
@ -2031,6 +2033,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tabmdi.obj \
$(OBJS)\monodll_tabart.obj \
$(OBJS)\monodll_xh_auinotbk.obj \
$(OBJS)\monodll_xh_auitoolb.obj \
$(OBJS)\monodll_advprops.obj \
$(OBJS)\monodll_editors.obj \
$(OBJS)\monodll_manager.obj \
@ -2843,6 +2846,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tabmdi.obj \
$(OBJS)\monolib_tabart.obj \
$(OBJS)\monolib_xh_auinotbk.obj \
$(OBJS)\monolib_xh_auitoolb.obj \
$(OBJS)\monolib_advprops.obj \
$(OBJS)\monolib_editors.obj \
$(OBJS)\monolib_manager.obj \
@ -7968,6 +7972,9 @@ $(OBJS)\monodll_tabart.obj: ..\..\src\aui\tabart.cpp
$(OBJS)\monodll_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp
$(OBJS)\monodll_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_auitoolb.cpp
$(OBJS)\monodll_advprops.obj: ..\..\src\propgrid\advprops.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
@ -10436,6 +10443,9 @@ $(OBJS)\monolib_tabart.obj: ..\..\src\aui\tabart.cpp
$(OBJS)\monolib_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp
$(OBJS)\monolib_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_auitoolb.cpp
$(OBJS)\monolib_advprops.obj: ..\..\src\propgrid\advprops.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
@ -16542,6 +16552,9 @@ $(OBJS)\auidll_tabart.obj: ..\..\src\aui\tabart.cpp
$(OBJS)\auidll_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp
$(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp
$(OBJS)\auidll_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\xrc\xh_auitoolb.cpp
$(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
@ -16569,6 +16582,9 @@ $(OBJS)\auilib_tabart.obj: ..\..\src\aui\tabart.cpp
$(OBJS)\auilib_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp
$(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp
$(OBJS)\auilib_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\xrc\xh_auitoolb.cpp
$(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

20
build/msw/makefile.wat
View File

@ -225,6 +225,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_tabmdi.obj &
$(OBJS)\monodll_tabart.obj &
$(OBJS)\monodll_xh_auinotbk.obj &
$(OBJS)\monodll_xh_auitoolb.obj &
$(OBJS)\monodll_advprops.obj &
$(OBJS)\monodll_editors.obj &
$(OBJS)\monodll_manager.obj &
@ -1042,6 +1043,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_tabmdi.obj &
$(OBJS)\monolib_tabart.obj &
$(OBJS)\monolib_xh_auinotbk.obj &
$(OBJS)\monolib_xh_auitoolb.obj &
$(OBJS)\monolib_advprops.obj &
$(OBJS)\monolib_editors.obj &
$(OBJS)\monolib_manager.obj &
@ -4969,7 +4971,8 @@ AUIDLL_OBJECTS = &
$(OBJS)\auidll_auibar.obj &
$(OBJS)\auidll_tabmdi.obj &
$(OBJS)\auidll_tabart.obj &
$(OBJS)\auidll_xh_auinotbk.obj
$(OBJS)\auidll_xh_auinotbk.obj &
$(OBJS)\auidll_xh_auitoolb.obj
AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
@ -4988,7 +4991,8 @@ AUILIB_OBJECTS = &
$(OBJS)\auilib_auibar.obj &
$(OBJS)\auilib_tabmdi.obj &
$(OBJS)\auilib_tabart.obj &
$(OBJS)\auilib_xh_auinotbk.obj
$(OBJS)\auilib_xh_auinotbk.obj &
$(OBJS)\auilib_xh_auitoolb.obj
RIBBONDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
@ -7725,6 +7729,9 @@ $(OBJS)\monodll_tabart.obj : .AUTODEPEND ..\..\src\aui\tabart.cpp
$(OBJS)\monodll_xh_auinotbk.obj : .AUTODEPEND ..\..\src\xrc\xh_auinotbk.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_xh_auitoolb.obj : .AUTODEPEND ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_advprops.obj : .AUTODEPEND ..\..\src\propgrid\advprops.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@ -10193,6 +10200,9 @@ $(OBJS)\monolib_tabart.obj : .AUTODEPEND ..\..\src\aui\tabart.cpp
$(OBJS)\monolib_xh_auinotbk.obj : .AUTODEPEND ..\..\src\xrc\xh_auinotbk.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_xh_auitoolb.obj : .AUTODEPEND ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_advprops.obj : .AUTODEPEND ..\..\src\propgrid\advprops.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@ -16299,6 +16309,9 @@ $(OBJS)\auidll_tabart.obj : .AUTODEPEND ..\..\src\aui\tabart.cpp
$(OBJS)\auidll_xh_auinotbk.obj : .AUTODEPEND ..\..\src\xrc\xh_auinotbk.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
$(OBJS)\auidll_xh_auitoolb.obj : .AUTODEPEND ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
$(OBJS)\auilib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
@ -16326,6 +16339,9 @@ $(OBJS)\auilib_tabart.obj : .AUTODEPEND ..\..\src\aui\tabart.cpp
$(OBJS)\auilib_xh_auinotbk.obj : .AUTODEPEND ..\..\src\xrc\xh_auinotbk.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
$(OBJS)\auilib_xh_auitoolb.obj : .AUTODEPEND ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
$(OBJS)\ribbondll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(RIBBONDLL_CXXFLAGS) $<

8
build/msw/wx_aui.dsp
View File

@ -342,6 +342,10 @@ SOURCE=..\..\include\wx\aui\tabmdi.h
SOURCE=..\..\include\wx\xrc\xh_auinotbk.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_auitoolb.h
# End Source File
# End Group
# Begin Group "Source Files"
@ -378,6 +382,10 @@ SOURCE=..\..\src\aui\tabmdi.cpp
SOURCE=..\..\src\xrc\xh_auinotbk.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\xrc\xh_auitoolb.cpp
# End Source File
# End Group
# End Target
# End Project

4
build/msw/wx_core.dsp
View File

@ -3340,6 +3340,10 @@ SOURCE=..\..\include\wx\xrc\xh_auinotbk.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_auitoolb.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_bannerwindow.h
# End Source File
# Begin Source File

6
build/msw/wx_vc7_aui.vcproj
View File

@ -440,6 +440,9 @@
<File
RelativePath="..\..\include\wx\xrc\xh_auinotbk.h">
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_auitoolb.h">
</File>
</Filter>
<Filter
Name="Source Files"
@ -469,6 +472,9 @@
<File
RelativePath="..\..\src\xrc\xh_auinotbk.cpp">
</File>
<File
RelativePath="..\..\src\xrc\xh_auitoolb.cpp">
</File>
</Filter>
</Files>
<Globals>

3
build/msw/wx_vc7_core.vcproj
View File

@ -2690,6 +2690,9 @@
<File
RelativePath="..\..\include\wx\xrc\xh_auinotbk.h">
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_auitoolb.h">
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h">
</File>

8
build/msw/wx_vc8_aui.vcproj
View File

@ -596,6 +596,10 @@
RelativePath="..\..\include\wx\xrc\xh_auinotbk.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_auitoolb.h"
>
</File>
</Filter>
<Filter
Name="Source Files"
@ -634,6 +638,10 @@
RelativePath="..\..\src\xrc\xh_auinotbk.cpp"
>
</File>
<File
RelativePath="..\..\src\xrc\xh_auitoolb.cpp"
>
</File>
</Filter>
</Files>
<Globals>

4
build/msw/wx_vc8_core.vcproj
View File

@ -3595,6 +3595,10 @@
RelativePath="..\..\include\wx\xrc\xh_auinotbk.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_auitoolb.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h"
>

8
build/msw/wx_vc9_aui.vcproj
View File

@ -594,6 +594,10 @@
RelativePath="..\..\include\wx\xrc\xh_auinotbk.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_auitoolb.h"
>
</File>
</Filter>
<Filter
Name="Source Files"
@ -632,6 +636,10 @@
RelativePath="..\..\src\xrc\xh_auinotbk.cpp"
>
</File>
<File
RelativePath="..\..\src\xrc\xh_auitoolb.cpp"
>
</File>
</Filter>
</Files>
<Globals>

4
build/msw/wx_vc9_core.vcproj
View File

@ -3593,6 +3593,10 @@
RelativePath="..\..\include\wx\xrc\xh_auinotbk.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_auitoolb.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h"
>

4
docs/changes.txt
View File

@ -8,3 +8,7 @@ Note: This file contains the list of changes since wxWidgets 3.x, please see
3.1.0: (released 2014-xx-xx)
----------------------------
All (GUI):
- XRC handler for wxAuiToolBar added (Kinaou Hervé).

17
docs/doxygen/overviews/xrc_format.h
View File

@ -591,6 +591,23 @@ later only and you need to explicitly register its handler using
@endcode
to use it.
@subsubsection xrc_wxauitoolbar wxAuiToolBar
Building an XRC for wxAuiToolBar is quite similar to wxToolBar.
The only significant differences are:
@li the use of the class name wxAuiToolBar
@li the styles supported are the ones described in the wxAuiToolBar class definition
Refer to the section @ref xrc_wxtoolbar for more details.
@note The XML Handler should be explicitly registered:
@code
#include <wx/xrc/xh_auitoolb.h>
AddHandler(new wxAuiToolBarXmlHandler);
@endcode
@since 3.1.0
@subsubsection xrc_wxbannerwindow wxBannerWindow

51
include/wx/xrc/xh_auitoolb.h Normal file
View File

@ -0,0 +1,51 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/xrc/xh_toolb.h
// Purpose: XML resource handler for wxAuiToolBar
// Author: Kinaou Hervé
// Created: 2013-11-23
// Copyright: (c) 2013 Kinaou Hervé
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_XH_AUITOOLB_H_
#define _WX_XH_AUITOOLB_H_
#include "wx/aui/auibar.h"
#include "wx/menu.h"
#include "wx/vector.h"
#include "wx/xrc/xmlres.h"
#if wxUSE_XRC && wxUSE_AUI
class WXDLLIMPEXP_FWD_AUI wxAuiToolBar;
class WXDLLIMPEXP_AUI wxAuiToolBarXmlHandler : public wxXmlResourceHandler
{
public:
wxAuiToolBarXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
private:
bool m_isInside;
wxAuiToolBar *m_toolbar;
wxSize m_toolSize;
class MenuHandler : public wxEvtHandler
{
public:
void OnDropDown(wxAuiToolBarEvent& event);
unsigned RegisterMenu(wxAuiToolBar *toobar, int id, wxMenu *menu);
private:
wxVector<wxMenu*> m_menus;
};
MenuHandler m_menuHandler;
wxDECLARE_DYNAMIC_CLASS(wxAuiToolBarXmlHandler);
};
#endif // wxUSE_XRC && wxUSE_AUI
#endif // _WX_XH_AUITOOLB_H_

21
misc/schema/xrc_schema.rnc
View File

@ -154,6 +154,7 @@ builtinWindowClasses =
( unknown
| wxAnimationCtrl
| wxAuiNotebook
| wxAuiToolBar
| wxBannerWindow
| wxBitmapButton
| wxBitmapComboBox
@ -242,6 +243,7 @@ builtinClassesNames =
| "wxAnimationCtrl"
| "wxAuiNotebook"
| "wxAuiToolBar"
| "wxBannerWindow"
| "wxBitmapButton"
| "wxBitmapComboBox"
@ -525,6 +527,25 @@ wxAuiNotebook_notebookpage =
}
wxAuiToolBar =
element object {
attribute class { "wxAuiToolBar" } &
stdObjectNodeAttributes &
stdWindowProperties &
[xrc:p="o"] element bitmapsize {_, t_size }* &
[xrc:p="o"] element margins {_, t_size }* &
[xrc:p="o"] element packing {_, t_integer }* &
[xrc:p="o"] element separation {_, t_integer }* &
[xrc:p="o"] element dontattachtoframe {_, t_bool }* &
(
windowNode |
wxToolBar_tool |
element object { attribute class { "separator" }, platform } |
element object { attribute class { "space" }, platform }
)*
}
wxBannerWindow =
element object {
attribute class { "wxBannerWindow" } &

7
samples/xrc/Makefile.in
View File

@ -110,6 +110,9 @@ COND_PLATFORM_OS2_1___xrcdemo___os2_emxbindcmd = $(NM) xrcdemo$(EXEEXT) | if \
@COND_TOOLKIT_OSX_IPHONE@ = $(__xrcdemo_app_Contents_PkgInfo___depname)
@COND_TOOLKIT_COCOA@____xrcdemo_BUNDLE_TGT_REF_DEP = \
@COND_TOOLKIT_COCOA@ $(__xrcdemo_app_Contents_PkgInfo___depname)
COND_MONOLITHIC_0___WXLIB_AUI_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_AUI_p = $(COND_MONOLITHIC_0___WXLIB_AUI_p)
COND_MONOLITHIC_0___WXLIB_RIBBON_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_RIBBON_p = $(COND_MONOLITHIC_0___WXLIB_RIBBON_p)
@ -174,7 +177,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
$(CXX) -o $@ $(XRCDEMO_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_RIBBON_p) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(CXX) -o $@ $(XRCDEMO_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_RIBBON_p) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(__xrcdemo___mac_setfilecmd)
$(__xrcdemo___os2_emxbindcmd)
@ -203,7 +206,7 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
data:
@mkdir -p ./rc
@for f in artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif; do \
@for f in aui.xpm aui.xrc artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif; do \
if test ! -f ./rc/$$f -a ! -d ./rc/$$f ; \
then x=yep ; \
else x=`find $(srcdir)/rc/$$f -newer ./rc/$$f -print` ; \

8
samples/xrc/makefile.bcc
View File

@ -175,6 +175,10 @@ __DLLFLAG_p = -DWXUSINGDLL
__DLLFLAG_p_1 = -dWXUSINGDLL
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_AUI_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_RIBBON_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
!endif
@ -262,12 +266,12 @@ clean:
$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(XRCDEMO_OBJECTS),$@,, $(__WXLIB_RIBBON_p) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\xrcdemo_sample.res
c0w32.obj $(XRCDEMO_OBJECTS),$@,, $(__WXLIB_AUI_p) $(__WXLIB_RIBBON_p) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\xrcdemo_sample.res
|
data:
if not exist $(OBJS)\rc mkdir $(OBJS)\rc
for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
for %f in (aui.xpm aui.xrc artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
$(OBJS)\xrcdemo_sample.res: .\..\..\samples\sample.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc

8
samples/xrc/makefile.gcc
View File

@ -160,6 +160,10 @@ ifeq ($(SHARED),1)
__DLLFLAG_p_1 = --define WXUSINGDLL
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_AUI_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_RIBBON_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon
endif
@ -252,11 +256,11 @@ clean:
-if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample_rc.o
$(CXX) -o $@ $(XRCDEMO_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_RIBBON_p) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
$(CXX) -o $@ $(XRCDEMO_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_RIBBON_p) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data:
if not exist $(OBJS)\rc mkdir $(OBJS)\rc
for %%f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc
for %%f in (aui.xpm aui.xrc artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc
$(OBJS)\xrcdemo_sample_rc.o: ./../../samples/sample.rc
$(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH

2
samples/xrc/makefile.unx
View File

@ -92,7 +92,7 @@ test_for_selected_wxbuild:
@$(WX_CONFIG) $(WX_CONFIG_FLAGS)
xrcdemo: $(XRCDEMO_OBJECTS)
$(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs ribbon,xrc,html,adv,core,xml,base`
$(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs aui,ribbon,xrc,html,adv,core,xml,base`
xrcdemo_xrcdemo.o: ./xrcdemo.cpp
$(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $<

8
samples/xrc/makefile.vc
View File

@ -312,6 +312,10 @@ __DLLFLAG_p = /DWXUSINGDLL
__DLLFLAG_p_1 = /d WXUSINGDLL
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_AUI_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_RIBBON_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
!endif
@ -384,12 +388,12 @@ clean:
$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\xrcdemo.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(XRCDEMO_OBJECTS) $(XRCDEMO_RESOURCES) $(__WXLIB_RIBBON_p) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
$(XRCDEMO_OBJECTS) $(XRCDEMO_RESOURCES) $(__WXLIB_AUI_p) $(__WXLIB_RIBBON_p) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
<<
data:
if not exist $(OBJS)\rc mkdir $(OBJS)\rc
for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
for %f in (aui.xpm aui.xrc artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
$(OBJS)\xrcdemo_sample.res: .\..\..\samples\sample.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc

9
samples/xrc/makefile.wat
View File

@ -141,6 +141,11 @@ __EXCEPTIONSFLAG_8 =
!ifeq USE_EXCEPTIONS 1
__EXCEPTIONSFLAG_8 = -xs
!endif
__WXLIB_AUI_p =
!ifeq MONOLITHIC 0
__WXLIB_AUI_p = &
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
!endif
__WXLIB_RIBBON_p =
!ifeq MONOLITHIC 0
__WXLIB_RIBBON_p = &
@ -295,14 +300,14 @@ $(OBJS)\xrcdemo.exe : $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample.res
@%append $(OBJS)\xrcdemo.lbc option caseexact
@%append $(OBJS)\xrcdemo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(XRCDEMO_OBJECTS)) do @%append $(OBJS)\xrcdemo.lbc file %i
@for %i in ( $(__WXLIB_RIBBON_p) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\xrcdemo.lbc library %i
@for %i in ( $(__WXLIB_AUI_p) $(__WXLIB_RIBBON_p) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\xrcdemo.lbc library %i
@%append $(OBJS)\xrcdemo.lbc option resource=$(OBJS)\xrcdemo_sample.res
@for %i in () do @%append $(OBJS)\xrcdemo.lbc option stack=%i
wlink @$(OBJS)\xrcdemo.lbc
data : .SYMBOLIC
if not exist $(OBJS)\rc mkdir $(OBJS)\rc
for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
for %f in (aui.xpm aui.xrc artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
$(OBJS)\xrcdemo_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<

12
samples/xrc/myframe.cpp
View File

@ -85,6 +85,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(XRCID("derived_tool_or_menuitem"), MyFrame::OnDerivedDialogToolOrMenuCommand)
EVT_MENU(XRCID("controls_tool_or_menuitem"), MyFrame::OnControlsToolOrMenuCommand)
EVT_MENU(XRCID("uncentered_tool_or_menuitem"), MyFrame::OnUncenteredToolOrMenuCommand)
EVT_MENU(XRCID("aui_demo_tool_or_menuitem"), MyFrame::OnAuiDemoToolOrMenuCommand)
EVT_MENU(XRCID("obj_ref_tool_or_menuitem"), MyFrame::OnObjRefToolOrMenuCommand)
EVT_MENU(XRCID("custom_class_tool_or_menuitem"), MyFrame::OnCustomClassToolOrMenuCommand)
EVT_MENU(XRCID("platform_property_tool_or_menuitem"), MyFrame::OnPlatformPropertyToolOrMenuCommand)
@ -270,6 +271,17 @@ void MyFrame::OnUncenteredToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
dlg.ShowModal();
}
void MyFrame::OnAuiDemoToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
{
#if wxUSE_AUI
wxDialog dlg;
wxXmlResource::Get()->LoadDialog(&dlg, this, wxS("aui_dialog"));
dlg.SetSize(-1,300);
dlg.ShowModal();
#else
wxLogWarning("wxUSE_AUI must be set to 1 in 'setup.h' to view the AUI demo.");
#endif
}
void MyFrame::OnObjRefToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
{

1
samples/xrc/myframe.h
View File

@ -43,6 +43,7 @@ private:
void OnDerivedDialogToolOrMenuCommand(wxCommandEvent& event);
void OnControlsToolOrMenuCommand(wxCommandEvent& event);
void OnUncenteredToolOrMenuCommand(wxCommandEvent& event);
void OnAuiDemoToolOrMenuCommand(wxCommandEvent& event);
void OnObjRefToolOrMenuCommand(wxCommandEvent& event);
void OnCustomClassToolOrMenuCommand(wxCommandEvent& event);
void OnPlatformPropertyToolOrMenuCommand(wxCommandEvent& event);

161
samples/xrc/rc/aui.xpm Normal file
View File

@ -0,0 +1,161 @@
/* XPM */
static const char *const wxwin16x16_xpm[] = {
"16 16 142 2",
" c None",
". c #7171C0",
"+ c #7D7DC7",
"@ c #8181CE",
"# c #7979CE",
"$ c #7171CE",
"% c #6868CD",
"& c #5050C0",
"* c #7C7CCB",
"= c #D3D3FC",
"- c #C0C0FF",
"; c #B1B1FF",
"> c #A4A4FF",
", c #9696FF",
"' c #6B6BE3",
") c #3E3EC0",
"! c #7B7BD3",
"~ c #CFCFFF",
"{ c #A7A7FF",
"] c #8989FF",
"^ c #7B7BFF",
"/ c #5E5EEB",
"( c #3333BF",
"_ c #6969D3",
": c #BEBEFF",
"< c #8E8EFF",
"[ c #5E5EFF",
"} c #4C4CFD",
"| c #6464C6",
"1 c #A4A478",
"2 c #BFBF63",
"3 c #BFBF5C",
"4 c #BFBF56",
"5 c #BFBF51",
"6 c #C17474",
"7 c #BF7070",
"8 c #BF6969",
"9 c #BF6363",
"0 c #544AC7",
"a c #A8A8FF",
"b c #7070FF",
"c c #5050FF",
"d c #3F3FFF",
"e c #8C8CBA",
"f c #F6F6C8",
"g c #FBFBBB",
"h c #FBFBAE",
"i c #FBFBA1",
"j c #F9F993",
"k c #D7D760",
"l c #D28D8D",
"m c #EEB8B8",
"n c #EFAAAA",
"o c #EF9E9E",
"p c #7C5ABC",
"q c #8D8DFF",
"r c #4747FF",
"s c #3535FF",
"t c #2B2BFF",
"u c #AAAAA7",
"v c #FFFFD2",
"w c #FFFFA9",
"x c #FFFF9A",
"y c #FFFF8D",
"z c #FFFF80",
"A c #E4E45B",
"B c #E39F9F",
"C c #FFCCCC",
"D c #FFA9A9",
"E c #FF9C9C",
"F c #B469A0",
"G c #3E3DE7",
"H c #2828EF",
"I c #1E1EEF",
"J c #1515EF",
"K c #A5A595",
"L c #FFFFC2",
"M c #FFFF8F",
"N c #F7F765",
"O c #F2F251",
"P c #DBDB3A",
"Q c #E48E8E",
"R c #FFBABA",
"S c #FF8E8E",
"T c #FF8181",
"U c #FF6868",
"V c #E54D60",
"W c #AC2E56",
"X c #0B0BBF",
"Y c #0606BF",
"Z c #C8C85D",
"` c #FEFEB1",
" . c #FEFE74",
".. c #F4F456",
"+. c #EFEF42",
"@. c #EFEF38",
"#. c #D7D725",
"$. c #E47676",
"%. c #FFA8A8",
"&. c #FF7373",
"*. c #FF5555",
"=. c #FF4343",
"-. c #FF3939",
";. c #DA2323",
">. c #CFCF3C",
",. c #F6F694",
"'. c #F0F047",
"). c #EFEF2E",
"!. c #EFEF24",
"~. c #D7D715",
"{. c #E45757",
"]. c #FF8888",
"^. c #FF4646",
"/. c #FF2F2F",
"(. c #FF2525",
"_. c #DA1414",
":. c #C3C328",
"<. c #EBEB55",
"[. c #ECEC2F",
"}. c #ECEC24",
"|. c #ECEC1A",
"1. c #EBEB10",
"2. c #CDCD06",
"3. c #DD3A3A",
"4. c #FF6060",
"5. c #FF1B1B",
"6. c #FE1111",
"7. c #D10707",
"8. c #B8B819",
"9. c #B7B715",
"0. c #B7B710",
"a. c #B7B70B",
"b. c #B7B706",
"c. c #B7B701",
"d. c #B7B700",
"e. c #BF1A1A",
"f. c #CC1919",
"g. c #CE1414",
"h. c #CE0E0E",
"i. c #CE0808",
"j. c #C90202",
"k. c #C00000",
" ",
" ",
" . + @ # $ % & ",
" * = - ; > , ' ) ",
" ! ~ { , ] ^ / ( ",
" _ : < ^ [ } | 1 2 3 4 5 ",
"6 7 8 9 0 a b c d e f g h i j k ",
"l m n o p q r s t u v w x y z A ",
"B C D E F G H I J K L M z N O P ",
"Q R S T U V W X Y Z ` ...+.@.#.",
"$.%.&.*.=.-.;. >.,.'.@.).!.~.",
"{.].^.-./.(._. :.<.[.}.|.1.2.",
"3.4./.(.5.6.7. 8.9.0.a.b.c.d.",
"e.f.g.h.i.j.k. ",
" ",
" "};

112
samples/xrc/rc/aui.xrc Normal file
View File

@ -0,0 +1,112 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<resource version="2.3.0.1" xmlns="http://www.wxwidgets.org/wxxrc">
<object class="wxDialog" name="aui_dialog">
<title>AUI XRC demo</title>
<centered>1</centered>
<style>wxCAPTION|wxRESIZE_BORDER</style>
<size>-1,300</size>
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxAuiToolBar" name="aui_toolbar">
<style>wxAUI_TB_TEXT|wxAUI_TB_GRIPPER</style>
<object class="tool" name="tool1">
<bitmap stock_id="wxART_NEW"/>
<label>Tool 1</label>
</object>
<object class="tool" name="tool2">
<bitmap stock_id="wxART_FILE_OPEN"/>
<label>Tool 2</label>
</object>
<object class="separator"/>
<object class="tool" name="dropdown">
<bitmap stock_id="wxART_FIND"/>
<label>Dropdown</label>
<dropdown>
<object class="wxMenu">
<object class="wxMenuItem">
<label>A dropdown menu</label>
</object>
<object class="wxMenuItem">
<label>in the aui toolbar</label>
</object>
</object>
</dropdown>
</object>
<object class="separator"/>
<object class="space"/>
<object class="wxComboBox">
<content>
<item>Just a</item>
<item>combobox in</item>
<item>the aui toolbar</item>
</content>
</object>
<object class="space"/>
</object>
</object>
<object class="sizeritem">
<option>1</option>
<flag>wxEXPAND</flag>
<object class="wxAuiNotebook" name="aui_notebook">
<object class="notebookpage">
<label>Page 1</label>
<bitmap stock_id="wxART_WARNING"/>
<object class="wxPanel" name="page1">
<object class="wxBoxSizer">
<object class="sizeritem">
<object class="wxTextCtrl" name="description_text">
<value>Notice the wxAuiToolBar added above this wxAuiNotebook</value>
<style>wxTE_MULTILINE|wxTE_READONLY</style>
</object>
<option>1</option>
<flag>wxEXPAND</flag>
</object>
</object>
</object>
</object>
<object class="notebookpage">
<label>Page 2</label>
<bitmap stock_id="wxART_INFORMATION"/>
<object class="wxPanel" name="page2">
<object class="wxBoxSizer">
<object class="sizeritem">
<object class="wxTextCtrl" name="description_text">
<value>The wxAuiNotebook pages are added by XRC</value>
<style>wxTE_MULTILINE|wxTE_READONLY</style>
</object>
<option>1</option>
<flag>wxEXPAND</flag>
</object>
</object>
</object>
</object>
<object class="notebookpage">
<label>Page 3</label>
<bitmap stock_id="wxART_QUESTION"/>
<object class="wxPanel" name="page3">
<object class="wxBoxSizer">
<object class="sizeritem">
<object class="wxTextCtrl" name="description_text">
<value></value>
<style>wxTE_MULTILINE|wxTE_READONLY</style>
</object>
<option>1</option>
<flag>wxEXPAND</flag>
</object>
</object>
</object>
</object>
</object>
</object>
<object class="sizeritem">
<object class="wxButton" name="wxID_OK">
<label>OK</label>
<default>1</default>
</object>
<flag>wxTOP|wxBOTTOM|wxALIGN_CENTRE</flag>
<border>10</border>
</object>
</object>
</object>
</resource>

5
samples/xrc/rc/menu.xrc
View File

@ -49,6 +49,11 @@
<object class="wxMenu" name="advanced_demos_menu">
<label>_Advanced</label>
<help>Advanced techniques with XRC</help>
<object class="wxMenuItem" name="aui_demo_tool_or_menuitem">
<label>_AUI</label>
<bitmap>aui.xpm</bitmap>
<help>Advanced User Interface classes and controls</help>
</object>
<object class="wxMenuItem" name="obj_ref_tool_or_menuitem">
<label>_Object References Example</label>
<bitmap>objrefdlg.xpm</bitmap>

5
samples/xrc/rc/toolbar.xrc
View File

@ -26,6 +26,11 @@
<longhelp>Disable autocentering of a dialog on its parent</longhelp>
</object>
<object class="separator"/>
<object class="tool" name="aui_demo_tool_or_menuitem">
<bitmap>aui.xpm</bitmap>
<tooltip>wxAUI classes and controls</tooltip>
<longhelp>XRC construction of Advanced User Interface classes and controls</longhelp>
</object>
<object class="tool" name="obj_ref_tool_or_menuitem">
<bitmap>objrefdlg.xpm</bitmap>
<tooltip>Object references and event ranges example</tooltip>

2
samples/xrc/xrcdemo.bkl
View File

@ -18,6 +18,7 @@
custclas.h
objrefdlg.h
</headers>
<wx-lib>aui</wx-lib>
<wx-lib>ribbon</wx-lib>
<wx-lib>xrc</wx-lib>
<wx-lib>html</wx-lib>
@ -31,6 +32,7 @@
<dstdir>$(BUILDDIR)/rc</dstdir>
<srcdir>$(SRCDIR)/rc</srcdir>
<files>
aui.xpm aui.xrc
artprov.xpm artprov.xrc basicdlg.xpm
basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc
derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc

10
samples/xrc/xrcdemo.cpp
View File

@ -41,6 +41,11 @@
#include "wx/xrc/xh_ribbon.h"
#endif // wxUSE_RIBBON
#if wxUSE_AUI
#include "wx/xrc/xh_auinotbk.h"
#include "wx/xrc/xh_auitoolb.h"
#endif // wxUSE_AUI
#include "wx/cshelp.h" // wxSimpleHelpProvider for helptext
#include "myframe.h"
@ -85,6 +90,11 @@ bool MyApp::OnInit()
wxXmlResource::Get()->AddHandler(new wxRibbonXmlHandler);
#endif
#if wxUSE_AUI
wxXmlResource::Get()->AddHandler(new wxAuiNotebookXmlHandler);
wxXmlResource::Get()->AddHandler(new wxAuiToolBarXmlHandler);
#endif
// Load all of the XRC files that will be used. You can put everything
// into one giant XRC file if you wanted, but then they become more
// diffcult to manage, and harder to reuse in later projects.

16
samples/xrc/xrcdemo.dsp
View File

@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\xrcdemo.exe" /debug /pdb:"vc_mswudll\xrcdemo.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
# ADD LINK32 wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\xrcdemo.exe" /debug /pdb:"vc_mswudll\xrcdemo.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
# ADD BASE LINK32 wxmsw31u_aui.lib wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\xrcdemo.exe" /debug /pdb:"vc_mswudll\xrcdemo.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
# ADD LINK32 wxmsw31u_aui.lib wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\xrcdemo.exe" /debug /pdb:"vc_mswudll\xrcdemo.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
!ELSEIF "$(CFG)" == "xrcdemo - Win32 DLL Debug"
@ -78,8 +78,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\xrcdemo.exe" /debug /pdb:"vc_mswuddll\xrcdemo.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
# ADD LINK32 wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\xrcdemo.exe" /debug /pdb:"vc_mswuddll\xrcdemo.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
# ADD BASE LINK32 wxmsw31ud_aui.lib wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\xrcdemo.exe" /debug /pdb:"vc_mswuddll\xrcdemo.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
# ADD LINK32 wxmsw31ud_aui.lib wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\xrcdemo.exe" /debug /pdb:"vc_mswuddll\xrcdemo.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
!ELSEIF "$(CFG)" == "xrcdemo - Win32 Release"
@ -103,8 +103,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\xrcdemo.exe" /debug /pdb:"vc_mswu\xrcdemo.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
# ADD LINK32 wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\xrcdemo.exe" /debug /pdb:"vc_mswu\xrcdemo.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
# ADD BASE LINK32 wxmsw31u_aui.lib wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\xrcdemo.exe" /debug /pdb:"vc_mswu\xrcdemo.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
# ADD LINK32 wxmsw31u_aui.lib wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\xrcdemo.exe" /debug /pdb:"vc_mswu\xrcdemo.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
!ELSEIF "$(CFG)" == "xrcdemo - Win32 Debug"
@ -128,8 +128,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\xrcdemo.exe" /debug /pdb:"vc_mswud\xrcdemo.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
# ADD LINK32 wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\xrcdemo.exe" /debug /pdb:"vc_mswud\xrcdemo.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
# ADD BASE LINK32 wxmsw31ud_aui.lib wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\xrcdemo.exe" /debug /pdb:"vc_mswud\xrcdemo.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
# ADD LINK32 wxmsw31ud_aui.lib wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\xrcdemo.exe" /debug /pdb:"vc_mswud\xrcdemo.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
!ENDIF

8
samples/xrc/xrcdemo_vc7.vcproj
View File

@ -46,7 +46,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\xrcdemo.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
@ -108,7 +108,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\xrcdemo.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@ -175,7 +175,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\xrcdemo.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
@ -237,7 +237,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\xrcdemo.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"

8
samples/xrc/xrcdemo_vc8.vcproj
View File

@ -80,7 +80,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\xrcdemo.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -174,7 +174,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\xrcdemo.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -273,7 +273,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\xrcdemo.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -367,7 +367,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\xrcdemo.exe"
LinkIncremental="1"
SuppressStartupBanner="true"

8
samples/xrc/xrcdemo_vc9.vcproj
View File

@ -79,7 +79,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\xrcdemo.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -170,7 +170,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\xrcdemo.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -265,7 +265,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_ribbon.lib wxmsw31ud_xrc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\xrcdemo.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -356,7 +356,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_ribbon.lib wxmsw31u_xrc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\xrcdemo.exe"
LinkIncremental="1"
SuppressStartupBanner="true"

268
src/xrc/xh_auitoolb.cpp Normal file
View File

@ -0,0 +1,268 @@
/////////////////////////////////////////////////////////////////////////////
// Name: src/xrc/xh_toolb.cpp
// Purpose: XRC resource for wxAuiToolBar
// Author: Vaclav Slavik
// Created: 2000/08/11
// Copyright: (c) 2000 Vaclav Slavik
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if wxUSE_XRC && wxUSE_AUI
#include "wx/bitmap.h"
#include "wx/xml/xml.h"
#ifndef WX_PRECOMP
#include "wx/frame.h"
#include "wx/log.h"
#include "wx/toolbar.h"
#endif
#include "wx/xrc/xh_auitoolb.h"
IMPLEMENT_DYNAMIC_CLASS(wxAuiToolBarXmlHandler, wxXmlResourceHandler)
wxAuiToolBarXmlHandler::wxAuiToolBarXmlHandler()
: wxXmlResourceHandler()
, m_isInside(false)
, m_toolbar(NULL)
{
XRC_ADD_STYLE(wxAUI_TB_TEXT);
XRC_ADD_STYLE(wxAUI_TB_NO_TOOLTIPS);
XRC_ADD_STYLE(wxAUI_TB_NO_AUTORESIZE);
XRC_ADD_STYLE(wxAUI_TB_GRIPPER);
XRC_ADD_STYLE(wxAUI_TB_OVERFLOW);
XRC_ADD_STYLE(wxAUI_TB_VERTICAL);
XRC_ADD_STYLE(wxAUI_TB_HORZ_LAYOUT);
XRC_ADD_STYLE(wxAUI_TB_HORIZONTAL);
XRC_ADD_STYLE(wxAUI_TB_PLAIN_BACKGROUND);
XRC_ADD_STYLE(wxAUI_TB_HORZ_TEXT);
AddWindowStyles();
}
wxObject *wxAuiToolBarXmlHandler::DoCreateResource()
{
if (m_class == wxS("tool"))
{
if ( !m_toolbar )
{
ReportError("tool only allowed inside a wxAuiToolBar");
return NULL;
}
wxItemKind kind = wxITEM_NORMAL;
if (GetBool(wxS("radio")))
kind = wxITEM_RADIO;
if (GetBool(wxS("toggle")))
{
if ( kind != wxITEM_NORMAL )
{
ReportParamError
(
"toggle",
"tool can't have both <radio> and <toggle> properties"
);
}
kind = wxITEM_CHECK;
}
#if wxUSE_MENUS
// check whether we have dropdown tag inside
wxMenu *menu = NULL; // menu for drop down items
wxXmlNode * const nodeDropdown = GetParamNode("dropdown");
if ( nodeDropdown )
{
// also check for the menu specified inside dropdown (it is
// optional and may be absent for e.g. dynamically-created
// menus)
wxXmlNode * const nodeMenu = nodeDropdown->GetChildren();
if ( nodeMenu )
{
wxObject *res = CreateResFromNode(nodeMenu, NULL);
menu = wxDynamicCast(res, wxMenu);
if ( !menu )
{
ReportError
(
nodeMenu,
"drop-down tool contents can only be a wxMenu"
);
}
if ( nodeMenu->GetNext() )
{
ReportError
(
nodeMenu->GetNext(),
"unexpected extra contents under drop-down tool"
);
}
}
}
#endif
wxAuiToolBarItem * const tool =
m_toolbar->AddTool
(
GetID(),
GetText(wxS("label")),
GetBitmap(wxS("bitmap"), wxART_TOOLBAR, m_toolSize),
GetBitmap(wxS("bitmap2"), wxART_TOOLBAR, m_toolSize),
kind,
GetText(wxS("tooltip")),
GetText(wxS("longhelp")),
NULL
);
if ( GetBool(wxS("disabled")) )
m_toolbar->EnableTool(GetID(), false);
#if wxUSE_MENUS
if (menu)
{
tool->SetHasDropDown(true);
tool->SetUserData(m_menuHandler.RegisterMenu(m_toolbar, GetID(), menu));
}
#endif
return m_toolbar; // must return non-NULL
}
else if (m_class == wxS("separator") || m_class == wxS("space"))
{
if ( !m_toolbar )
{
ReportError("separators only allowed inside wxAuiToolBar");
return NULL;
}
if ( m_class == wxS("separator") )
m_toolbar->AddSeparator();
else
m_toolbar->AddStretchSpacer();
return m_toolbar; // must return non-NULL
}
else /*<object class="wxAuiToolBar">*/
{
int style = GetStyle(wxS("style"), wxNO_BORDER | wxTB_HORIZONTAL);
#ifdef __WXMSW__
if (!(style & wxNO_BORDER)) style |= wxNO_BORDER;
#endif
XRC_MAKE_INSTANCE(toolbar, wxAuiToolBar)
toolbar->Create(m_parentAsWindow,
GetID(),
GetPosition(),
GetSize(),
style);
toolbar->SetName(GetName());
SetupWindow(toolbar);
m_toolSize = GetSize(wxS("bitmapsize"));
if (!(m_toolSize == wxDefaultSize))
toolbar->SetToolBitmapSize(m_toolSize);
wxSize margins = GetSize(wxS("margins"));
if (!(margins == wxDefaultSize))
toolbar->SetMargins(margins.x, margins.y);
long packing = GetLong(wxS("packing"), -1);
if (packing != -1)
toolbar->SetToolPacking(packing);
long separation = GetLong(wxS("separation"), -1);
if (separation != -1)
toolbar->SetToolSeparation(separation);
wxXmlNode *children_node = GetParamNode(wxS("object"));
if (!children_node)
children_node = GetParamNode(wxS("object_ref"));
if (children_node == NULL) return toolbar;
m_isInside = true;
m_toolbar = toolbar;
wxXmlNode *n = children_node;
while (n)
{
if ((n->GetType() == wxXML_ELEMENT_NODE) &&
(n->GetName() == wxS("object") || n->GetName() == wxS("object_ref")))
{
wxObject *created = CreateResFromNode(n, toolbar, NULL);
wxControl *control = wxDynamicCast(created, wxControl);
if (!IsOfClass(n, wxS("tool")) &&
!IsOfClass(n, wxS("separator")) &&
!IsOfClass(n, wxS("space")) &&
control != NULL)
toolbar->AddControl(control);
}
n = n->GetNext();
}
m_isInside = false;
m_toolbar = NULL;
toolbar->Realize();
return toolbar;
}
}
bool wxAuiToolBarXmlHandler::CanHandle(wxXmlNode *node)
{
return ((!m_isInside && IsOfClass(node, wxS("wxAuiToolBar"))) ||
(m_isInside && IsOfClass(node, wxS("tool"))) ||
(m_isInside && IsOfClass(node, wxS("space"))) ||
(m_isInside && IsOfClass(node, wxS("separator"))));
}
void wxAuiToolBarXmlHandler::MenuHandler::OnDropDown(wxAuiToolBarEvent& event)
{
if (event.IsDropDownClicked())
{
wxAuiToolBar *toobar = wxDynamicCast(event.GetEventObject(), wxAuiToolBar);
if (toobar != NULL)
{
wxAuiToolBarItem *item = toobar->FindTool(event.GetId());
if (item != NULL)
{
wxMenu * const menu = m_menus[item->GetUserData()];
if (menu != NULL)
{
wxRect rect = item->GetSizerItem()->GetRect();
toobar->PopupMenu(menu, rect.GetRight() - 10, rect.GetBottom());
}
}
}
}
else
{
event.Skip();
}
}
unsigned
wxAuiToolBarXmlHandler::MenuHandler::RegisterMenu(wxAuiToolBar *toolbar,
int id,
wxMenu *menu)
{
m_menus.push_back(menu);
toolbar->Bind(wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN,
&wxAuiToolBarXmlHandler::MenuHandler::OnDropDown,
this,
id);
return m_menus.size() - 1;
}
#endif // wxUSE_XRC && wxUSE_AUI