ribbondll_gallery.o \
ribbondll_page.o \
ribbondll_panel.o \
- ribbondll_toolbar.o
+ ribbondll_toolbar.o \
+ ribbondll_xh_ribbon.o
RIBBONDLL_ODEP = $(_____pch_wxprec_ribbondll_wx_wxprec_h_gch___depname)
RIBBONLIB_CXXFLAGS = $(__ribbonlib_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
ribbonlib_gallery.o \
ribbonlib_page.o \
ribbonlib_panel.o \
- ribbonlib_toolbar.o
+ ribbonlib_toolbar.o \
+ ribbonlib_xh_ribbon.o
RIBBONLIB_ODEP = $(_____pch_wxprec_ribbonlib_wx_wxprec_h_gch___depname)
PROPGRIDDLL_CXXFLAGS = $(__propgriddll_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
wx/ribbon/page.h \
wx/ribbon/panel.h \
wx/ribbon/toolbar.h \
+ wx/xrc/xh_ribbon.h \
wx/richtext/richtextbackgroundpage.h \
wx/richtext/richtextborderspage.h \
wx/richtext/richtextbuffer.h \
monodll_page.o \
monodll_ribbon_panel.o \
monodll_ribbon_toolbar.o \
+ monodll_xh_ribbon.o \
monodll_richtextbuffer.o \
monodll_richtextctrl.o \
monodll_richtextformatdlg.o \
monolib_page.o \
monolib_ribbon_panel.o \
monolib_ribbon_toolbar.o \
+ monolib_xh_ribbon.o \
monolib_richtextbuffer.o \
monolib_richtextctrl.o \
monolib_richtextformatdlg.o \
monodll_ribbon_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp
+monodll_xh_ribbon.o: $(srcdir)/src/xrc/xh_ribbon.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_ribbon.cpp
+
monodll_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp
monolib_ribbon_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp
+monolib_xh_ribbon.o: $(srcdir)/src/xrc/xh_ribbon.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_ribbon.cpp
+
monolib_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp
ribbondll_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(RIBBONDLL_ODEP)
$(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp
+ribbondll_xh_ribbon.o: $(srcdir)/src/xrc/xh_ribbon.cpp $(RIBBONDLL_ODEP)
+ $(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_ribbon.cpp
+
ribbonlib_art_internal.o: $(srcdir)/src/ribbon/art_internal.cpp $(RIBBONLIB_ODEP)
$(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/ribbon/art_internal.cpp
ribbonlib_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(RIBBONLIB_ODEP)
$(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp
+ribbonlib_xh_ribbon.o: $(srcdir)/src/xrc/xh_ribbon.cpp $(RIBBONLIB_ODEP)
+ $(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_ribbon.cpp
+
propgriddll_version_rc.o: $(srcdir)/src/msw/version.rc $(PROPGRIDDLL_ODEP)
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_PROPGRID
src/ribbon/page.cpp
src/ribbon/panel.cpp
src/ribbon/toolbar.cpp
+ src/xrc/xh_ribbon.cpp
</set>
<set var="RIBBON_HDR" hints="files">
wx/ribbon/art.h
wx/ribbon/page.h
wx/ribbon/panel.h
wx/ribbon/toolbar.h
+ wx/xrc/xh_ribbon.h
</set>
<!-- ====================================================================== -->
$(OBJS)\ribbondll_gallery.obj \\r
$(OBJS)\ribbondll_page.obj \\r
$(OBJS)\ribbondll_panel.obj \\r
- $(OBJS)\ribbondll_toolbar.obj\r
+ $(OBJS)\ribbondll_toolbar.obj \\r
+ $(OBJS)\ribbondll_xh_ribbon.obj\r
RIBBONLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
$(OBJS)\ribbonlib_gallery.obj \\r
$(OBJS)\ribbonlib_page.obj \\r
$(OBJS)\ribbonlib_panel.obj \\r
- $(OBJS)\ribbonlib_toolbar.obj\r
+ $(OBJS)\ribbonlib_toolbar.obj \\r
+ $(OBJS)\ribbonlib_xh_ribbon.obj\r
PROPGRIDDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
$(OBJS)\monodll_page.obj \\r
$(OBJS)\monodll_ribbon_panel.obj \\r
$(OBJS)\monodll_ribbon_toolbar.obj \\r
+ $(OBJS)\monodll_xh_ribbon.obj \\r
$(OBJS)\monodll_richtextbuffer.obj \\r
$(OBJS)\monodll_richtextctrl.obj \\r
$(OBJS)\monodll_richtextformatdlg.obj \\r
$(OBJS)\monolib_page.obj \\r
$(OBJS)\monolib_ribbon_panel.obj \\r
$(OBJS)\monolib_ribbon_toolbar.obj \\r
+ $(OBJS)\monolib_xh_ribbon.obj \\r
$(OBJS)\monolib_richtextbuffer.obj \\r
$(OBJS)\monolib_richtextctrl.obj \\r
$(OBJS)\monolib_richtextformatdlg.obj \\r
$(OBJS)\monodll_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
\r
+$(OBJS)\monodll_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp\r
+ $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp\r
+\r
$(OBJS)\monodll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp\r
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp\r
\r
$(OBJS)\monolib_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
\r
+$(OBJS)\monolib_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp\r
+ $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp\r
+\r
$(OBJS)\monolib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp\r
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp\r
\r
$(OBJS)\ribbondll_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
$(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
\r
+$(OBJS)\ribbondll_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp\r
+ $(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp\r
+\r
$(OBJS)\ribbonlib_dummy.obj: ..\..\src\common\dummy.cpp\r
$(CXX) -q -c -P -o$@ $(RIBBONLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp\r
\r
$(OBJS)\ribbonlib_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
$(CXX) -q -c -P -o$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
\r
+$(OBJS)\ribbonlib_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp\r
+ $(CXX) -q -c -P -o$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp\r
+\r
$(OBJS)\propgriddll_dummy.obj: ..\..\src\common\dummy.cpp\r
$(CXX) -q -c -P -o$@ $(PROPGRIDDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp\r
\r
$(OBJS)\ribbondll_gallery.o \\r
$(OBJS)\ribbondll_page.o \\r
$(OBJS)\ribbondll_panel.o \\r
- $(OBJS)\ribbondll_toolbar.o\r
+ $(OBJS)\ribbondll_toolbar.o \\r
+ $(OBJS)\ribbondll_xh_ribbon.o\r
RIBBONLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \\r
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
$(OBJS)\ribbonlib_gallery.o \\r
$(OBJS)\ribbonlib_page.o \\r
$(OBJS)\ribbonlib_panel.o \\r
- $(OBJS)\ribbonlib_toolbar.o\r
+ $(OBJS)\ribbonlib_toolbar.o \\r
+ $(OBJS)\ribbonlib_xh_ribbon.o\r
PROPGRIDDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \\r
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
$(OBJS)\monodll_page.o \\r
$(OBJS)\monodll_ribbon_panel.o \\r
$(OBJS)\monodll_ribbon_toolbar.o \\r
+ $(OBJS)\monodll_xh_ribbon.o \\r
$(OBJS)\monodll_richtextbuffer.o \\r
$(OBJS)\monodll_richtextctrl.o \\r
$(OBJS)\monodll_richtextformatdlg.o \\r
$(OBJS)\monolib_page.o \\r
$(OBJS)\monolib_ribbon_panel.o \\r
$(OBJS)\monolib_ribbon_toolbar.o \\r
+ $(OBJS)\monolib_xh_ribbon.o \\r
$(OBJS)\monolib_richtextbuffer.o \\r
$(OBJS)\monolib_richtextctrl.o \\r
$(OBJS)\monolib_richtextformatdlg.o \\r
$(OBJS)\monodll_ribbon_toolbar.o: ../../src/ribbon/toolbar.cpp\r
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
\r
+$(OBJS)\monodll_xh_ribbon.o: ../../src/xrc/xh_ribbon.cpp\r
+ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
$(OBJS)\monodll_richtextbuffer.o: ../../src/richtext/richtextbuffer.cpp\r
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
\r
$(OBJS)\monolib_ribbon_toolbar.o: ../../src/ribbon/toolbar.cpp\r
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
\r
+$(OBJS)\monolib_xh_ribbon.o: ../../src/xrc/xh_ribbon.cpp\r
+ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
$(OBJS)\monolib_richtextbuffer.o: ../../src/richtext/richtextbuffer.cpp\r
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
\r
$(OBJS)\ribbondll_toolbar.o: ../../src/ribbon/toolbar.cpp\r
$(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $<\r
\r
+$(OBJS)\ribbondll_xh_ribbon.o: ../../src/xrc/xh_ribbon.cpp\r
+ $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
$(OBJS)\ribbonlib_dummy.o: ../../src/common/dummy.cpp\r
$(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $<\r
\r
$(OBJS)\ribbonlib_toolbar.o: ../../src/ribbon/toolbar.cpp\r
$(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $<\r
\r
+$(OBJS)\ribbonlib_xh_ribbon.o: ../../src/xrc/xh_ribbon.cpp\r
+ $(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
$(OBJS)\propgriddll_dummy.o: ../../src/common/dummy.cpp\r
$(CXX) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(CPPDEPS) $<\r
\r
$(OBJS)\ribbondll_gallery.obj \\r
$(OBJS)\ribbondll_page.obj \\r
$(OBJS)\ribbondll_panel.obj \\r
- $(OBJS)\ribbondll_toolbar.obj\r
+ $(OBJS)\ribbondll_toolbar.obj \\r
+ $(OBJS)\ribbondll_xh_ribbon.obj\r
RIBBONDLL_RESOURCES = \\r
$(OBJS)\ribbondll_version.res\r
RIBBONLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_503)$(__DEBUGRUNTIME) /DWIN32 \\r
$(OBJS)\ribbonlib_gallery.obj \\r
$(OBJS)\ribbonlib_page.obj \\r
$(OBJS)\ribbonlib_panel.obj \\r
- $(OBJS)\ribbonlib_toolbar.obj\r
+ $(OBJS)\ribbonlib_toolbar.obj \\r
+ $(OBJS)\ribbonlib_xh_ribbon.obj\r
PROPGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_519)$(__DEBUGRUNTIME) /DWIN32 \\r
$(__DEBUGINFO) \\r
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).pdb \\r
$(OBJS)\monodll_page.obj \\r
$(OBJS)\monodll_ribbon_panel.obj \\r
$(OBJS)\monodll_ribbon_toolbar.obj \\r
+ $(OBJS)\monodll_xh_ribbon.obj \\r
$(OBJS)\monodll_richtextbuffer.obj \\r
$(OBJS)\monodll_richtextctrl.obj \\r
$(OBJS)\monodll_richtextformatdlg.obj \\r
$(OBJS)\monolib_page.obj \\r
$(OBJS)\monolib_ribbon_panel.obj \\r
$(OBJS)\monolib_ribbon_toolbar.obj \\r
+ $(OBJS)\monolib_xh_ribbon.obj \\r
$(OBJS)\monolib_richtextbuffer.obj \\r
$(OBJS)\monolib_richtextctrl.obj \\r
$(OBJS)\monolib_richtextformatdlg.obj \\r
$(OBJS)\monodll_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
\r
+$(OBJS)\monodll_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp\r
+\r
$(OBJS)\monodll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp\r
\r
$(OBJS)\monolib_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
\r
+$(OBJS)\monolib_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp\r
+\r
$(OBJS)\monolib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp\r
\r
$(OBJS)\ribbondll_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
\r
+$(OBJS)\ribbondll_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp\r
+\r
$(OBJS)\ribbonlib_dummy.obj: ..\..\src\common\dummy.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
\r
$(OBJS)\ribbonlib_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
\r
+$(OBJS)\ribbonlib_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp\r
+\r
$(OBJS)\propgriddll_dummy.obj: ..\..\src\common\dummy.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
\r
$(OBJS)\monodll_page.obj &\r
$(OBJS)\monodll_ribbon_panel.obj &\r
$(OBJS)\monodll_ribbon_toolbar.obj &\r
+ $(OBJS)\monodll_xh_ribbon.obj &\r
$(OBJS)\monodll_richtextbuffer.obj &\r
$(OBJS)\monodll_richtextctrl.obj &\r
$(OBJS)\monodll_richtextformatdlg.obj &\r
$(OBJS)\monolib_page.obj &\r
$(OBJS)\monolib_ribbon_panel.obj &\r
$(OBJS)\monolib_ribbon_toolbar.obj &\r
+ $(OBJS)\monolib_xh_ribbon.obj &\r
$(OBJS)\monolib_richtextbuffer.obj &\r
$(OBJS)\monolib_richtextctrl.obj &\r
$(OBJS)\monolib_richtextformatdlg.obj &\r
$(OBJS)\ribbondll_gallery.obj &\r
$(OBJS)\ribbondll_page.obj &\r
$(OBJS)\ribbondll_panel.obj &\r
- $(OBJS)\ribbondll_toolbar.obj\r
+ $(OBJS)\ribbondll_toolbar.obj &\r
+ $(OBJS)\ribbondll_xh_ribbon.obj\r
RIBBONLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
$(OBJS)\ribbonlib_gallery.obj &\r
$(OBJS)\ribbonlib_page.obj &\r
$(OBJS)\ribbonlib_panel.obj &\r
- $(OBJS)\ribbonlib_toolbar.obj\r
+ $(OBJS)\ribbonlib_toolbar.obj &\r
+ $(OBJS)\ribbonlib_xh_ribbon.obj\r
PROPGRIDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
$(OBJS)\monodll_ribbon_toolbar.obj : .AUTODEPEND ..\..\src\ribbon\toolbar.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
\r
+$(OBJS)\monodll_xh_ribbon.obj : .AUTODEPEND ..\..\src\xrc\xh_ribbon.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
$(OBJS)\monodll_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
\r
$(OBJS)\monolib_ribbon_toolbar.obj : .AUTODEPEND ..\..\src\ribbon\toolbar.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
\r
+$(OBJS)\monolib_xh_ribbon.obj : .AUTODEPEND ..\..\src\xrc\xh_ribbon.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
$(OBJS)\monolib_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
\r
$(OBJS)\ribbondll_toolbar.obj : .AUTODEPEND ..\..\src\ribbon\toolbar.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(RIBBONDLL_CXXFLAGS) $<\r
\r
+$(OBJS)\ribbondll_xh_ribbon.obj : .AUTODEPEND ..\..\src\xrc\xh_ribbon.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONDLL_CXXFLAGS) $<\r
+\r
$(OBJS)\ribbonlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(RIBBONLIB_CXXFLAGS) $<\r
\r
$(OBJS)\ribbonlib_toolbar.obj : .AUTODEPEND ..\..\src\ribbon\toolbar.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(RIBBONLIB_CXXFLAGS) $<\r
\r
+$(OBJS)\ribbonlib_xh_ribbon.obj : .AUTODEPEND ..\..\src\xrc\xh_ribbon.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONLIB_CXXFLAGS) $<\r
+\r
$(OBJS)\propgriddll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $<\r
\r
# End Source File\r
# Begin Source File\r
\r
+SOURCE=..\..\include\wx\xrc\xh_ribbon.h\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\..\include\wx\xrc\xh_richtext.h\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\include\wx\ribbon\toolbar.h\r
# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\xrc\xh_ribbon.h\r
+# End Source File\r
# End Group\r
# Begin Group "Source Files"\r
\r
\r
SOURCE=..\..\src\ribbon\toolbar.cpp\r
# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\xrc\xh_ribbon.cpp\r
+# End Source File\r
# End Group\r
# End Target\r
# End Project\r
<File\r
RelativePath="..\..\include\wx\xrc\xh_radbx.h">\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\xrc\xh_ribbon.h">\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\xrc\xh_richtext.h">\r
</File>\r
<File\r
RelativePath="..\..\include\wx\ribbon\toolbar.h">\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\xrc\xh_ribbon.h">\r
+ </File>\r
</Filter>\r
<Filter\r
Name="Source Files"\r
<File\r
RelativePath="..\..\src\ribbon\toolbar.cpp">\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\xrc\xh_ribbon.cpp">\r
+ </File>\r
</Filter>\r
</Files>\r
<Globals>\r
RelativePath="..\..\include\wx\xrc\xh_radbx.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\xrc\xh_ribbon.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\xrc\xh_richtext.h"\r
>\r
RelativePath="..\..\include\wx\ribbon\toolbar.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\xrc\xh_ribbon.h"\r
+ >\r
+ </File>\r
</Filter>\r
<Filter\r
Name="Source Files"\r
RelativePath="..\..\src\ribbon\toolbar.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\xrc\xh_ribbon.cpp"\r
+ >\r
+ </File>\r
</Filter>\r
</Files>\r
<Globals>\r
RelativePath="..\..\include\wx\xrc\xh_radbx.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\xrc\xh_ribbon.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\xrc\xh_richtext.h"\r
>\r
RelativePath="..\..\include\wx\ribbon\toolbar.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\xrc\xh_ribbon.h"\r
+ >\r
+ </File>\r
</Filter>\r
<Filter\r
Name="Source Files"\r
RelativePath="..\..\src\ribbon\toolbar.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\xrc\xh_ribbon.cpp"\r
+ >\r
+ </File>\r
</Filter>\r
</Files>\r
<Globals>\r
All (GUI):
- Add support for wxAuiNotebook to XRC (Steven Lamerton).
+- Add support for wxRibbonBar and related controls to XRC (Armel Asselin).
- Add wxBITMAP_PNG() macro similar to wxBITMAP() but for PNG files.
- Add new wxSimplebook class.
- Support hexadecimal numbers in wxSpinCtrl.
@endcode
+@subsubsection xrc_wxribbon wxRibbon
+
+A wxRibbonBar is a container of ribbon pages which, in turn, contain elements
+that can be wxRibbonControl or wxRibbonGallery.
+
+Example:
+@code
+<object class="wxRibbonBar" name="ribbonbar">
+ <object class="page" name="FilePage">
+ <label>First</label>
+ <object class="panel">
+ <label>File</label>
+ <object class="wxRibbonButtonBar">
+ <object class="button" name="Open">
+ <bitmap>open.xpm</bitmap>
+ <label>Open</label>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="page" name="ViewPage">
+ <label>View</label>
+ <object class="panel">
+ <label>Zoom</label>
+ <object class="wxRibbonGallery">
+ <object class="item">
+ <bitmap>zoomin.xpm</bitmap>
+ </object>
+ <object class="item">
+ <bitmap>zoomout.xpm</bitmap>
+ </object>
+ </object>
+ </object>
+ </object>
+</object>
+@endcode
+
+Notice that wxRibbon support in XRC is available in wxWidgets 2.9.5 and
+later only and you need to explicitly register its handler using
+@code
+ #include <wx/xrc/xh_ribbon.h>
+
+ AddHandler(new wxRibbonXmlHandler);
+@endcode
+to use it.
+
+
@subsubsection xrc_wxrichtextctrl wxRichTextCtrl
@beginTable
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: wx/xrc/xh_ribbon.h
+// Purpose: XML resource handler for wxRibbon related classes
+// Author: Armel Asselin
+// Created: 2010-04-23
+// RCS-ID: $Id$
+// Copyright: (c) 2010 Armel Asselin
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_XRC_XH_RIBBON_H_
+#define _WX_XRC_XH_RIBBON_H_
+
+#include "wx/xrc/xmlres.h"
+
+#if wxUSE_XRC && wxUSE_RIBBON
+
+class WXDLLIMPEXP_FWD_RIBBON wxRibbonControl;
+
+class WXDLLIMPEXP_RIBBON wxRibbonXmlHandler : public wxXmlResourceHandler
+{
+public:
+ wxRibbonXmlHandler();
+ virtual wxObject *DoCreateResource();
+ virtual bool CanHandle(wxXmlNode *node);
+
+private:
+ const wxClassInfo *m_isInside;
+
+ bool IsRibbonControl (wxXmlNode *node);
+
+ wxObject* Handle_buttonbar();
+ wxObject* Handle_button();
+ wxObject* Handle_control();
+ wxObject* Handle_page();
+ wxObject* Handle_gallery();
+ wxObject* Handle_galleryitem();
+ wxObject* Handle_panel();
+ wxObject* Handle_bar();
+
+ void Handle_RibbonArtProvider(wxRibbonControl *control);
+
+ wxDECLARE_DYNAMIC_CLASS(wxRibbonXmlHandler);
+};
+
+#endif // wxUSE_XRC && wxUSE_RIBBON
+
+#endif // _WX_XRC_XH_RIBBON_H_
@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_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)
COND_MONOLITHIC_0___WXLIB_XRC_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_XRC_p = $(COND_MONOLITHIC_0___WXLIB_XRC_p)
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_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_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_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_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)
WX_RELEASE_NODOT = 29\r
COMPILER_PREFIX = bcc\r
OBJS = \\r
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
+LIBDIRNAME = \\r
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)\r
SETUPHDIR = \\r
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
XRCDEMO_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
!if "$(USE_GUI)" == "1"\r
PORTNAME = msw\r
!endif\r
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
+!if "$(OFFICIAL_BUILD)" == "1"\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r
+!endif\r
!if "$(BUILD)" == "debug"\r
WXDEBUGFLAG = d\r
!endif\r
__DLLFLAG_p_1 = -dWXUSINGDLL\r
!endif\r
!if "$(MONOLITHIC)" == "0"\r
+__WXLIB_RIBBON_p = \\r
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib\r
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r
__WXLIB_XRC_p = \\r
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib\r
!endif\r
\r
$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample.res\r
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r
- c0w32.obj $(XRCDEMO_OBJECTS),$@,, $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_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\r
+ 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_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\r
|\r
\r
data: \r
WX_RELEASE_NODOT = 29\r
COMPILER_PREFIX = gcc\r
OBJS = \\r
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
+LIBDIRNAME = \\r
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)\r
SETUPHDIR = \\r
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
XRCDEMO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
ifeq ($(USE_GUI),1)\r
PORTNAME = msw\r
endif\r
-ifeq ($(OFFICIAL_BUILD),1)
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-endif
+ifeq ($(OFFICIAL_BUILD),1)\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r
+endif\r
ifeq ($(BUILD),debug)\r
WXDEBUGFLAG = d\r
endif\r
__DLLFLAG_p_1 = --define WXUSINGDLL\r
endif\r
ifeq ($(MONOLITHIC),0)\r
+__WXLIB_RIBBON_p = \\r
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon\r
+endif\r
+ifeq ($(MONOLITHIC),0)\r
__WXLIB_XRC_p = \\r
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc\r
endif\r
-if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe\r
\r
$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample_rc.o\r
- $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_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\r
+ $(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_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\r
\r
data: \r
if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r
@$(WX_CONFIG) $(WX_CONFIG_FLAGS)
xrcdemo: $(XRCDEMO_OBJECTS)
- $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs xrc,html,adv,core,xml,base`
+ $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs ribbon,xrc,html,adv,core,xml,base`
xrcdemo_xrcdemo.o: ./xrcdemo.cpp
$(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $<
WX_RELEASE_NODOT = 29\r
COMPILER_PREFIX = vc\r
OBJS = \\r
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)\r
LIBDIRNAME = \\r
- .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
SETUPHDIR = \\r
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
XRCDEMO_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \\r
\r
### Conditionally set variables: ###\r
\r
-!if "$(TARGET_CPU)" == "AMD64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "X64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "x64"
-ARCH_SUFFIX = _x64
-!endif
+!if "$(TARGET_CPU)" == "AMD64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r
+!if "$(TARGET_CPU)" == "IA64"\r
+ARCH_SUFFIX = _ia64\r
+!endif\r
+!if "$(TARGET_CPU)" == "X64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r
+!if "$(TARGET_CPU)" == "amd64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r
+!if "$(TARGET_CPU)" == "ia64"\r
+ARCH_SUFFIX = _ia64\r
+!endif\r
+!if "$(TARGET_CPU)" == "x64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r
!if "$(USE_GUI)" == "0"\r
PORTNAME = base\r
!endif\r
!if "$(USE_GUI)" == "1"\r
PORTNAME = msw\r
!endif\r
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
+!if "$(OFFICIAL_BUILD)" == "1"\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r
+!endif\r
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
WXDEBUGFLAG = d\r
!endif\r
!if "$(TARGET_CPU)" == "IA64"\r
LINK_TARGET_CPU = /MACHINE:IA64\r
!endif\r
-!if "$(TARGET_CPU)" == "X64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
+!if "$(TARGET_CPU)" == "X64"\r
+LINK_TARGET_CPU = /MACHINE:X64\r
+!endif\r
!if "$(TARGET_CPU)" == "amd64"\r
LINK_TARGET_CPU = /MACHINE:X64\r
!endif\r
!if "$(TARGET_CPU)" == "ia64"\r
LINK_TARGET_CPU = /MACHINE:IA64\r
!endif\r
-!if "$(TARGET_CPU)" == "x64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
+!if "$(TARGET_CPU)" == "x64"\r
+LINK_TARGET_CPU = /MACHINE:X64\r
+!endif\r
!if "$(MONOLITHIC)" == "0"\r
EXTRALIBS_FOR_BASE = \r
!endif\r
__DLLFLAG_p_1 = /d WXUSINGDLL\r
!endif\r
!if "$(MONOLITHIC)" == "0"\r
+__WXLIB_RIBBON_p = \\r
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib\r
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r
__WXLIB_XRC_p = \\r
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib\r
!endif\r
\r
$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample.res\r
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\xrcdemo.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
- $(XRCDEMO_OBJECTS) $(XRCDEMO_RESOURCES) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_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\r
+ $(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_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\r
<<\r
\r
data: \r
!ifeq USE_GUI 1\r
PORTNAME = msw\r
!endif\r
-COMPILER_VERSION =
-!ifeq OFFICIAL_BUILD 1
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
+COMPILER_VERSION =\r
+!ifeq OFFICIAL_BUILD 1\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r
+!endif\r
WXDEBUGFLAG =\r
!ifeq BUILD debug\r
WXDEBUGFLAG = d\r
!ifeq USE_EXCEPTIONS 1\r
__EXCEPTIONSFLAG_8 = -xs\r
!endif\r
+__WXLIB_RIBBON_p =\r
+!ifeq MONOLITHIC 0\r
+__WXLIB_RIBBON_p = &\r
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib\r
+!endif\r
__WXLIB_XRC_p =\r
!ifeq MONOLITHIC 0\r
__WXLIB_XRC_p = &\r
WX_RELEASE_NODOT = 29\r
COMPILER_PREFIX = wat\r
OBJS = &\r
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = &
- .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
+LIBDIRNAME = &\r
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)\r
SETUPHDIR = &\r
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
XRCDEMO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
@%append $(OBJS)\xrcdemo.lbc option caseexact\r
@%append $(OBJS)\xrcdemo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
@for %i in ($(XRCDEMO_OBJECTS)) do @%append $(OBJS)\xrcdemo.lbc file %i\r
- @for %i in ( $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_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\r
+ @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_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\r
@%append $(OBJS)\xrcdemo.lbc option resource=$(OBJS)\xrcdemo_sample.res\r
@for %i in () do @%append $(OBJS)\xrcdemo.lbc option stack=%i\r
wlink @$(OBJS)\xrcdemo.lbc\r
</object>
</object>
</object>
+ <object class="choicebookpage">
+ <label>wxRibbonBar</label>
+ <object class="wxRibbonBar" name="ribbonbar">
+ <object class="page" name="RibbonPage1">
+ <label>First</label>
+ <object class="panel">
+ <label>Applicative stuff</label>
+ <object class="wxRibbonButtonBar">
+ <object class="button" name="App">
+ <bitmap>derivdlg.xpm</bitmap>
+ <label>Derived</label>
+ </object>
+ <object class="button" name="App2">
+ <bitmap>basicdlg.xpm</bitmap>
+ <label>Basic</label>
+ </object>
+ <object class="button" name="App3">
+ <bitmap>custclas.xpm</bitmap>
+ <label>Custom</label>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="page" name="RibbonPage2">
+ <label>Second page</label>
+ <object class="panel">
+ <label>Gallery test</label>
+ <object class="wxRibbonGallery">
+ <object class="item">
+ <bitmap>derivdlg.xpm</bitmap>
+ </object>
+ <object class="item">
+ <bitmap>basicdlg.xpm</bitmap>
+ </object>
+ <object class="item">
+ <bitmap>custclas.xpm</bitmap>
+ </object>
+ <object class="item">
+ <bitmap>artprov.xpm</bitmap>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
<object class="choicebookpage">
<label>wxScrollBar</label>
<object class="wxPanel" name="scrollbar">
custclas.h
objrefdlg.h
</headers>
+ <wx-lib>ribbon</wx-lib>
<wx-lib>xrc</wx-lib>
<wx-lib>html</wx-lib>
<wx-lib>adv</wx-lib>
#include "wx/xrc/xmlres.h" // XRC XML resources
+#if wxUSE_RIBBON
+ #include "wx/xrc/xh_ribbon.h"
+#endif // wxUSE_RIBBON
+
#include "wx/cshelp.h" // wxSimpleHelpProvider for helptext
#include "myframe.h"
// wxXRC docs for details.
wxXmlResource::Get()->InitAllHandlers();
+#if wxUSE_RIBBON
+ wxXmlResource::Get()->AddHandler(new wxRibbonXmlHandler);
+#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.
# ADD BASE BSC32 /nologo\r
# ADD BSC32 /nologo\r
LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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_mswunivudll\xrcdemo.exe" /debug /pdb:"vc_mswunivudll\xrcdemo.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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_mswunivudll\xrcdemo.exe" /debug /pdb:"vc_mswunivudll\xrcdemo.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
+# ADD BASE LINK32 wxmswuniv29u_ribbon.lib wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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_mswunivudll\xrcdemo.exe" /debug /pdb:"vc_mswunivudll\xrcdemo.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
+# ADD LINK32 wxmswuniv29u_ribbon.lib wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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_mswunivudll\xrcdemo.exe" /debug /pdb:"vc_mswunivudll\xrcdemo.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
\r
!ELSEIF "$(CFG)" == "xrcdemo - Win32 DLL Universal Debug"\r
\r
# ADD BASE BSC32 /nologo\r
# ADD BSC32 /nologo\r
LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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_mswunivuddll\xrcdemo.exe" /debug /pdb:"vc_mswunivuddll\xrcdemo.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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_mswunivuddll\xrcdemo.exe" /debug /pdb:"vc_mswunivuddll\xrcdemo.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
+# ADD BASE LINK32 wxmswuniv29ud_ribbon.lib wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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_mswunivuddll\xrcdemo.exe" /debug /pdb:"vc_mswunivuddll\xrcdemo.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
+# ADD LINK32 wxmswuniv29ud_ribbon.lib wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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_mswunivuddll\xrcdemo.exe" /debug /pdb:"vc_mswunivuddll\xrcdemo.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
\r
!ELSEIF "$(CFG)" == "xrcdemo - Win32 DLL Release"\r
\r
# ADD BASE BSC32 /nologo\r
# ADD BSC32 /nologo\r
LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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\r
-# ADD LINK32 wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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\r
+# ADD BASE LINK32 wxmsw29u_ribbon.lib wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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\r
+# ADD LINK32 wxmsw29u_ribbon.lib wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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\r
\r
!ELSEIF "$(CFG)" == "xrcdemo - Win32 DLL Debug"\r
\r
# ADD BASE BSC32 /nologo\r
# ADD BSC32 /nologo\r
LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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\r
-# ADD LINK32 wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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\r
+# ADD BASE LINK32 wxmsw29ud_ribbon.lib wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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\r
+# ADD LINK32 wxmsw29ud_ribbon.lib wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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\r
\r
!ELSEIF "$(CFG)" == "xrcdemo - Win32 Universal Release"\r
\r
# ADD BASE BSC32 /nologo\r
# ADD BSC32 /nologo\r
LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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_mswunivu\xrcdemo.exe" /debug /pdb:"vc_mswunivu\xrcdemo.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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_mswunivu\xrcdemo.exe" /debug /pdb:"vc_mswunivu\xrcdemo.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
+# ADD BASE LINK32 wxmswuniv29u_ribbon.lib wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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_mswunivu\xrcdemo.exe" /debug /pdb:"vc_mswunivu\xrcdemo.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
+# ADD LINK32 wxmswuniv29u_ribbon.lib wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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_mswunivu\xrcdemo.exe" /debug /pdb:"vc_mswunivu\xrcdemo.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
\r
!ELSEIF "$(CFG)" == "xrcdemo - Win32 Universal Debug"\r
\r
# ADD BASE BSC32 /nologo\r
# ADD BSC32 /nologo\r
LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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_mswunivud\xrcdemo.exe" /debug /pdb:"vc_mswunivud\xrcdemo.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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_mswunivud\xrcdemo.exe" /debug /pdb:"vc_mswunivud\xrcdemo.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
+# ADD BASE LINK32 wxmswuniv29ud_ribbon.lib wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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_mswunivud\xrcdemo.exe" /debug /pdb:"vc_mswunivud\xrcdemo.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
+# ADD LINK32 wxmswuniv29ud_ribbon.lib wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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_mswunivud\xrcdemo.exe" /debug /pdb:"vc_mswunivud\xrcdemo.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
\r
!ELSEIF "$(CFG)" == "xrcdemo - Win32 Release"\r
\r
# ADD BASE BSC32 /nologo\r
# ADD BSC32 /nologo\r
LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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\r
-# ADD LINK32 wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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\r
+# ADD BASE LINK32 wxmsw29u_ribbon.lib wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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\r
+# ADD LINK32 wxmsw29u_ribbon.lib wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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\r
\r
!ELSEIF "$(CFG)" == "xrcdemo - Win32 Debug"\r
\r
# ADD BASE BSC32 /nologo\r
# ADD BSC32 /nologo\r
LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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\r
-# ADD LINK32 wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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\r
+# ADD BASE LINK32 wxmsw29ud_ribbon.lib wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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\r
+# ADD LINK32 wxmsw29ud_ribbon.lib wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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\r
\r
!ENDIF\r
\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
+ AdditionalDependencies="wxmsw29ud_ribbon.lib wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
OutputFile="vc_mswud\xrcdemo.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="TRUE"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
+ AdditionalDependencies="wxmsw29u_ribbon.lib wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
OutputFile="vc_mswu\xrcdemo.exe"\r
LinkIncremental="1"\r
SuppressStartupBanner="TRUE"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
+ AdditionalDependencies="wxmswuniv29ud_ribbon.lib wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
OutputFile="vc_mswunivud\xrcdemo.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="TRUE"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
+ AdditionalDependencies="wxmswuniv29u_ribbon.lib wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
OutputFile="vc_mswunivu\xrcdemo.exe"\r
LinkIncremental="1"\r
SuppressStartupBanner="TRUE"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
+ AdditionalDependencies="wxmsw29ud_ribbon.lib wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
OutputFile="vc_mswuddll\xrcdemo.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="TRUE"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
+ AdditionalDependencies="wxmsw29u_ribbon.lib wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
OutputFile="vc_mswudll\xrcdemo.exe"\r
LinkIncremental="1"\r
SuppressStartupBanner="TRUE"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
+ AdditionalDependencies="wxmswuniv29ud_ribbon.lib wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
OutputFile="vc_mswunivuddll\xrcdemo.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="TRUE"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
+ AdditionalDependencies="wxmswuniv29u_ribbon.lib wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
OutputFile="vc_mswunivudll\xrcdemo.exe"\r
LinkIncremental="1"\r
SuppressStartupBanner="TRUE"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
+ AdditionalDependencies="wxmsw29ud_ribbon.lib wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
OutputFile="vc_mswud\xrcdemo.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
+ AdditionalDependencies="wxmsw29u_ribbon.lib wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
OutputFile="vc_mswu\xrcdemo.exe"\r
LinkIncremental="1"\r
SuppressStartupBanner="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
+ AdditionalDependencies="wxmswuniv29ud_ribbon.lib wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
OutputFile="vc_mswunivud\xrcdemo.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
+ AdditionalDependencies="wxmswuniv29u_ribbon.lib wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
OutputFile="vc_mswunivu\xrcdemo.exe"\r
LinkIncremental="1"\r
SuppressStartupBanner="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
+ AdditionalDependencies="wxmsw29ud_ribbon.lib wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
OutputFile="vc_mswuddll\xrcdemo.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
+ AdditionalDependencies="wxmsw29u_ribbon.lib wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
OutputFile="vc_mswudll\xrcdemo.exe"\r
LinkIncremental="1"\r
SuppressStartupBanner="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
+ AdditionalDependencies="wxmswuniv29ud_ribbon.lib wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
OutputFile="vc_mswunivuddll\xrcdemo.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
+ AdditionalDependencies="wxmswuniv29u_ribbon.lib wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
OutputFile="vc_mswunivudll\xrcdemo.exe"\r
LinkIncremental="1"\r
SuppressStartupBanner="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
+ AdditionalDependencies="wxmsw29ud_ribbon.lib wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
OutputFile="vc_mswud\xrcdemo.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
+ AdditionalDependencies="wxmsw29u_ribbon.lib wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
OutputFile="vc_mswu\xrcdemo.exe"\r
LinkIncremental="1"\r
SuppressStartupBanner="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
+ AdditionalDependencies="wxmswuniv29ud_ribbon.lib wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
OutputFile="vc_mswunivud\xrcdemo.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
+ AdditionalDependencies="wxmswuniv29u_ribbon.lib wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
OutputFile="vc_mswunivu\xrcdemo.exe"\r
LinkIncremental="1"\r
SuppressStartupBanner="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
+ AdditionalDependencies="wxmsw29ud_ribbon.lib wxmsw29ud_xrc.lib wxmsw29ud_html.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
OutputFile="vc_mswuddll\xrcdemo.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
+ AdditionalDependencies="wxmsw29u_ribbon.lib wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
OutputFile="vc_mswudll\xrcdemo.exe"\r
LinkIncremental="1"\r
SuppressStartupBanner="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
+ AdditionalDependencies="wxmswuniv29ud_ribbon.lib wxmswuniv29ud_xrc.lib wxmswuniv29ud_html.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.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"\r
OutputFile="vc_mswunivuddll\xrcdemo.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
+ AdditionalDependencies="wxmswuniv29u_ribbon.lib wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.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"\r
OutputFile="vc_mswunivudll\xrcdemo.exe"\r
LinkIncremental="1"\r
SuppressStartupBanner="true"\r
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: src/xrc/xh_ribbon.cpp
+// Purpose: XML resource handler for wxRibbon related classes
+// Author: Armel Asselin
+// Created: 2010-04-23
+// RCS-ID: $Id$
+// Copyright: (c) 2010 Armel Asselin
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
+#if wxUSE_XRC && wxUSE_RIBBON
+
+#include "wx/xrc/xh_ribbon.h"
+
+#include "wx/ribbon/bar.h"
+#include "wx/ribbon/buttonbar.h"
+#include "wx/ribbon/gallery.h"
+
+#include "wx/scopeguard.h"
+
+// Ribbon bars can contain only pages which are usually panels but may contain
+// any wxWindow.
+//
+// Panels are usually for wxRibbonControls but may as well contain any
+// wxWindow.
+//
+// Galleries are wxRibbonControl and simply contain bitmaps with IDs.
+//
+// Button bars are wxRibbonControl and contain buttons (normal/dropdown/mixed),
+// with id/bitmap/label/short help.
+
+wxIMPLEMENT_DYNAMIC_CLASS(wxRibbonXmlHandler, wxXmlResourceHandler);
+
+wxRibbonXmlHandler::wxRibbonXmlHandler()
+ : wxXmlResourceHandler(),
+ m_isInside(NULL)
+{
+ XRC_ADD_STYLE(wxRIBBON_BAR_SHOW_PAGE_LABELS);
+ XRC_ADD_STYLE(wxRIBBON_BAR_SHOW_PAGE_ICONS);
+ XRC_ADD_STYLE(wxRIBBON_BAR_FLOW_HORIZONTAL);
+ XRC_ADD_STYLE(wxRIBBON_BAR_FLOW_VERTICAL);
+ XRC_ADD_STYLE(wxRIBBON_BAR_SHOW_PANEL_EXT_BUTTONS);
+ XRC_ADD_STYLE(wxRIBBON_BAR_SHOW_PANEL_MINIMISE_BUTTONS);
+ XRC_ADD_STYLE(wxRIBBON_BAR_ALWAYS_SHOW_TABS);
+ XRC_ADD_STYLE(wxRIBBON_BAR_DEFAULT_STYLE);
+ XRC_ADD_STYLE(wxRIBBON_BAR_FOLDBAR_STYLE);
+}
+
+wxObject *wxRibbonXmlHandler::DoCreateResource()
+{
+ if (m_class == wxT("button"))
+ return Handle_button();
+ if (m_class == wxT("wxRibbonButtonBar"))
+ return Handle_buttonbar();
+ else if (m_class == wxT("item"))
+ return Handle_galleryitem();
+ else if (m_class == wxT("wxRibbonGallery"))
+ return Handle_gallery();
+ else if (m_class == wxT("wxRibbonPanel") || m_class == wxT("panel"))
+ return Handle_panel();
+ else if (m_class == wxT("wxRibbonPage") || m_class == wxT("page"))
+ return Handle_page();
+ else if (m_class == wxT("wxRibbonBar"))
+ return Handle_bar();
+ else
+ return Handle_control ();
+}
+
+bool wxRibbonXmlHandler::CanHandle(wxXmlNode *node)
+{
+ return IsRibbonControl(node) ||
+ (m_isInside == &wxRibbonButtonBar::ms_classInfo &&
+ IsOfClass(node, wxT("button"))) ||
+ (m_isInside == &wxRibbonBar::ms_classInfo &&
+ IsOfClass(node, wxT("page"))) ||
+ (m_isInside == &wxRibbonPage::ms_classInfo &&
+ IsOfClass(node, wxT("panel"))) ||
+ (m_isInside == &wxRibbonGallery::ms_classInfo &&
+ IsOfClass(node, wxT("item")));
+}
+
+bool wxRibbonXmlHandler::IsRibbonControl (wxXmlNode *node)
+{
+ return IsOfClass(node, wxT("wxRibbonBar")) ||
+ IsOfClass(node, wxT("wxRibbonButtonBar")) ||
+ IsOfClass(node, wxT("wxRibbonPage")) ||
+ IsOfClass(node, wxT("wxRibbonPanel")) ||
+ IsOfClass(node, wxT("wxRibbonGallery")) ||
+ IsOfClass(node, wxT("wxRibbonControl"));
+}
+
+void wxRibbonXmlHandler::Handle_RibbonArtProvider(wxRibbonControl *control)
+{
+ wxString provider = GetText("art-provider", false);
+
+ if (provider == "default" || provider.IsEmpty())
+ control->SetArtProvider(new wxRibbonDefaultArtProvider);
+ else if (provider.CmpNoCase("aui") == 0)
+ control->SetArtProvider(new wxRibbonAUIArtProvider);
+ else if (provider.CmpNoCase("msw") == 0)
+ control->SetArtProvider(new wxRibbonMSWArtProvider);
+ else
+ ReportError("invalid ribbon art provider");
+}
+
+wxObject* wxRibbonXmlHandler::Handle_buttonbar()
+{
+ XRC_MAKE_INSTANCE (buttonBar, wxRibbonButtonBar);
+
+ if (!buttonBar->Create (wxDynamicCast(m_parent, wxWindow), GetID(),
+ GetPosition(), GetSize(), GetStyle()))
+ {
+ ReportError("could not create ribbon panel");
+ }
+ else
+ {
+ const wxClassInfo* const wasInside = m_isInside;
+ wxON_BLOCK_EXIT_SET(m_isInside, wasInside);
+ m_isInside = &wxRibbonButtonBar::ms_classInfo;
+
+ CreateChildren (buttonBar, true);
+
+ buttonBar->Realize();
+ }
+
+ return buttonBar;
+}
+
+wxObject* wxRibbonXmlHandler::Handle_button()
+{
+ wxRibbonButtonBar *buttonBar = wxStaticCast(m_parent, wxRibbonButtonBar);
+
+ wxRibbonButtonKind kind = wxRIBBON_BUTTON_NORMAL;
+
+ if (GetBool(wxT("hybrid")))
+ kind = wxRIBBON_BUTTON_HYBRID;
+
+#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 )
+ {
+ if (kind == wxRIBBON_BUTTON_NORMAL)
+ kind = wxRIBBON_BUTTON_DROPDOWN;
+
+ // 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 // wxUSE_MENUS
+
+ if (!buttonBar->AddButton(GetID(),
+ GetText("label"),
+ GetBitmap ("bitmap"),
+ GetBitmap ("small-bitmap"),
+ GetBitmap ("disabled-bitmap"),
+ GetBitmap ("small-disabled-bitmap"),
+ kind,
+ GetText("help")))
+ {
+ ReportError ("could not create button");
+ }
+
+ if ( GetBool(wxT("disabled")) )
+ buttonBar->EnableButton(GetID(), false);
+
+ return NULL; // nothing to return
+}
+
+wxObject* wxRibbonXmlHandler::Handle_control()
+{
+ wxRibbonControl *control = wxDynamicCast (m_instance, wxRibbonControl);
+
+ if (!m_instance)
+ ReportError("wxRibbonControl must be subclassed");
+ else if (!control)
+ ReportError("controls must derive from wxRibbonControl");
+
+ control->Create(wxDynamicCast(m_parent, wxWindow), GetID(),
+ GetPosition(), GetSize(), GetStyle());
+
+ return m_instance;
+}
+
+wxObject* wxRibbonXmlHandler::Handle_page()
+{
+ XRC_MAKE_INSTANCE (ribbonPage, wxRibbonPage);
+
+ if (!ribbonPage->Create (wxDynamicCast(m_parent, wxRibbonBar), GetID(),
+ GetText ("label"), GetBitmap ("icon"), GetStyle()))
+ {
+ ReportError("could not create ribbon page");
+ }
+ else
+ {
+ const wxClassInfo* const wasInside = m_isInside;
+ wxON_BLOCK_EXIT_SET(m_isInside, wasInside);
+ m_isInside = &wxRibbonPage::ms_classInfo;
+
+ CreateChildren (ribbonPage);
+
+ ribbonPage->Realize();
+ }
+
+ return ribbonPage;
+}
+
+wxObject* wxRibbonXmlHandler::Handle_gallery()
+{
+ XRC_MAKE_INSTANCE (ribbonGallery, wxRibbonGallery);
+
+ if (!ribbonGallery->Create (wxDynamicCast(m_parent, wxWindow), GetID(),
+ GetPosition(), GetSize(), GetStyle()))
+ {
+ ReportError("could not create ribbon gallery");
+ }
+ else
+ {
+ const wxClassInfo* const wasInside = m_isInside;
+ wxON_BLOCK_EXIT_SET(m_isInside, wasInside);
+ m_isInside = &wxRibbonGallery::ms_classInfo;
+
+ CreateChildren (ribbonGallery);
+
+ ribbonGallery->Realize();
+ }
+
+ return ribbonGallery;
+}
+
+wxObject* wxRibbonXmlHandler::Handle_galleryitem()
+{
+ wxRibbonGallery *gallery = wxStaticCast(m_parent, wxRibbonGallery);
+ wxCHECK (gallery, NULL);
+
+ gallery->Append (GetBitmap(), GetID());
+
+ return NULL; // nothing to return
+}
+
+wxObject* wxRibbonXmlHandler::Handle_panel()
+{
+ XRC_MAKE_INSTANCE (ribbonPanel, wxRibbonPanel);
+
+ if (!ribbonPanel->Create (wxDynamicCast(m_parent, wxWindow), GetID(),
+ GetText ("label"), GetBitmap ("icon"), GetPosition(), GetSize(),
+ GetStyle("style", wxRIBBON_PANEL_DEFAULT_STYLE)))
+ {
+ ReportError("could not create ribbon panel");
+ }
+ else
+ {
+ CreateChildren (ribbonPanel);
+
+ ribbonPanel->Realize();
+ }
+
+ return ribbonPanel;
+}
+
+wxObject* wxRibbonXmlHandler::Handle_bar()
+{
+ XRC_MAKE_INSTANCE (ribbonBar, wxRibbonBar);
+
+ Handle_RibbonArtProvider (ribbonBar);
+
+ if ( !ribbonBar->Create(wxDynamicCast(m_parent, wxWindow),
+ GetID(),
+ GetPosition(),
+ GetSize(),
+ GetStyle("style", wxRIBBON_BAR_DEFAULT_STYLE)) )
+ {
+ ReportError ("could not create ribbonbar");
+ }
+ else
+ {
+ // Currently the art provider style must be explicitly set to the
+ // ribbon style too.
+ ribbonBar->GetArtProvider()
+ ->SetFlags(GetStyle("style", wxRIBBON_BAR_DEFAULT_STYLE));
+
+ const wxClassInfo* const wasInside = m_isInside;
+ wxON_BLOCK_EXIT_SET(m_isInside, wasInside);
+ m_isInside = &wxRibbonBar::ms_classInfo;
+
+ CreateChildren (ribbonBar, true);
+
+ ribbonBar->Realize();
+ }
+
+ return ribbonBar;
+}
+
+#endif // wxUSE_XRC && wxUSE_RIBBON
projects / wxWidgets.git / commitdiff
