diff --git a/Makefile.in b/Makefile.in index 4b6c322e44..bca9393d3a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1904,7 +1904,8 @@ RIBBONDLL_OBJECTS = \ 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) \ @@ -1921,7 +1922,8 @@ RIBBONLIB_OBJECTS = \ 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) \ @@ -4369,6 +4371,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ 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 \ @@ -4692,6 +4695,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_page.o \ monodll_ribbon_panel.o \ monodll_ribbon_toolbar.o \ + monodll_xh_ribbon.o \ monodll_richtextbuffer.o \ monodll_richtextctrl.o \ monodll_richtextformatdlg.o \ @@ -6926,6 +6930,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_page.o \ monolib_ribbon_panel.o \ monolib_ribbon_toolbar.o \ + monolib_xh_ribbon.o \ monolib_richtextbuffer.o \ monolib_richtextctrl.o \ monolib_richtextformatdlg.o \ @@ -18642,6 +18647,9 @@ monodll_ribbon_panel.o: $(srcdir)/src/ribbon/panel.cpp $(MONODLL_ODEP) 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 @@ -24396,6 +24404,9 @@ monolib_ribbon_panel.o: $(srcdir)/src/ribbon/panel.cpp $(MONOLIB_ODEP) 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 @@ -39651,6 +39662,9 @@ ribbondll_panel.o: $(srcdir)/src/ribbon/panel.cpp $(RIBBONDLL_ODEP) 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 @@ -39681,6 +39695,9 @@ ribbonlib_panel.o: $(srcdir)/src/ribbon/panel.cpp $(RIBBONLIB_ODEP) 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 diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 2d05bb647a..b81e1903c7 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -3662,6 +3662,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/ribbon/page.cpp src/ribbon/panel.cpp src/ribbon/toolbar.cpp + src/xrc/xh_ribbon.cpp wx/ribbon/art.h @@ -3673,6 +3674,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/ribbon/page.h wx/ribbon/panel.h wx/ribbon/toolbar.h + wx/xrc/xh_ribbon.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 66db2e49e6..955db8f543 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1385,7 +1385,8 @@ RIBBONDLL_OBJECTS = \ $(OBJS)\ribbondll_gallery.obj \ $(OBJS)\ribbondll_page.obj \ $(OBJS)\ribbondll_panel.obj \ - $(OBJS)\ribbondll_toolbar.obj + $(OBJS)\ribbondll_toolbar.obj \ + $(OBJS)\ribbondll_xh_ribbon.obj RIBBONLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1406,7 +1407,8 @@ RIBBONLIB_OBJECTS = \ $(OBJS)\ribbonlib_gallery.obj \ $(OBJS)\ribbonlib_page.obj \ $(OBJS)\ribbonlib_panel.obj \ - $(OBJS)\ribbonlib_toolbar.obj + $(OBJS)\ribbonlib_toolbar.obj \ + $(OBJS)\ribbonlib_xh_ribbon.obj PROPGRIDDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1743,6 +1745,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_page.obj \ $(OBJS)\monodll_ribbon_panel.obj \ $(OBJS)\monodll_ribbon_toolbar.obj \ + $(OBJS)\monodll_xh_ribbon.obj \ $(OBJS)\monodll_richtextbuffer.obj \ $(OBJS)\monodll_richtextctrl.obj \ $(OBJS)\monodll_richtextformatdlg.obj \ @@ -2542,6 +2545,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_page.obj \ $(OBJS)\monolib_ribbon_panel.obj \ $(OBJS)\monolib_ribbon_toolbar.obj \ + $(OBJS)\monolib_xh_ribbon.obj \ $(OBJS)\monolib_richtextbuffer.obj \ $(OBJS)\monolib_richtextctrl.obj \ $(OBJS)\monolib_richtextformatdlg.obj \ @@ -7275,6 +7279,9 @@ $(OBJS)\monodll_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp $(OBJS)\monodll_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp +$(OBJS)\monodll_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp + $(OBJS)\monodll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp @@ -9722,6 +9729,9 @@ $(OBJS)\monolib_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp $(OBJS)\monolib_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp +$(OBJS)\monolib_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp + $(OBJS)\monolib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp @@ -15783,6 +15793,9 @@ $(OBJS)\ribbondll_panel.obj: ..\..\src\ribbon\panel.cpp $(OBJS)\ribbondll_toolbar.obj: ..\..\src\ribbon\toolbar.cpp $(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp +$(OBJS)\ribbondll_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp + $(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp + $(OBJS)\ribbonlib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(RIBBONLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp @@ -15816,6 +15829,9 @@ $(OBJS)\ribbonlib_panel.obj: ..\..\src\ribbon\panel.cpp $(OBJS)\ribbonlib_toolbar.obj: ..\..\src\ribbon\toolbar.cpp $(CXX) -q -c -P -o$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp +$(OBJS)\ribbonlib_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp + $(CXX) -q -c -P -o$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp + $(OBJS)\propgriddll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(PROPGRIDDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index f401e0b6a6..dc39c1f4d6 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1385,7 +1385,8 @@ RIBBONDLL_OBJECTS = \ $(OBJS)\ribbondll_gallery.o \ $(OBJS)\ribbondll_page.o \ $(OBJS)\ribbondll_panel.o \ - $(OBJS)\ribbondll_toolbar.o + $(OBJS)\ribbondll_toolbar.o \ + $(OBJS)\ribbondll_xh_ribbon.o RIBBONLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1406,7 +1407,8 @@ RIBBONLIB_OBJECTS = \ $(OBJS)\ribbonlib_gallery.o \ $(OBJS)\ribbonlib_page.o \ $(OBJS)\ribbonlib_panel.o \ - $(OBJS)\ribbonlib_toolbar.o + $(OBJS)\ribbonlib_toolbar.o \ + $(OBJS)\ribbonlib_xh_ribbon.o PROPGRIDDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1755,6 +1757,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_page.o \ $(OBJS)\monodll_ribbon_panel.o \ $(OBJS)\monodll_ribbon_toolbar.o \ + $(OBJS)\monodll_xh_ribbon.o \ $(OBJS)\monodll_richtextbuffer.o \ $(OBJS)\monodll_richtextctrl.o \ $(OBJS)\monodll_richtextformatdlg.o \ @@ -2560,6 +2563,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_page.o \ $(OBJS)\monolib_ribbon_panel.o \ $(OBJS)\monolib_ribbon_toolbar.o \ + $(OBJS)\monolib_xh_ribbon.o \ $(OBJS)\monolib_richtextbuffer.o \ $(OBJS)\monolib_richtextctrl.o \ $(OBJS)\monolib_richtextformatdlg.o \ @@ -7444,6 +7448,9 @@ $(OBJS)\monodll_ribbon_panel.o: ../../src/ribbon/panel.cpp $(OBJS)\monodll_ribbon_toolbar.o: ../../src/ribbon/toolbar.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_xh_ribbon.o: ../../src/xrc/xh_ribbon.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_richtextbuffer.o: ../../src/richtext/richtextbuffer.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -9891,6 +9898,9 @@ $(OBJS)\monolib_ribbon_panel.o: ../../src/ribbon/panel.cpp $(OBJS)\monolib_ribbon_toolbar.o: ../../src/ribbon/toolbar.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_xh_ribbon.o: ../../src/xrc/xh_ribbon.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_richtextbuffer.o: ../../src/richtext/richtextbuffer.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -15952,6 +15962,9 @@ $(OBJS)\ribbondll_panel.o: ../../src/ribbon/panel.cpp $(OBJS)\ribbondll_toolbar.o: ../../src/ribbon/toolbar.cpp $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\ribbondll_xh_ribbon.o: ../../src/xrc/xh_ribbon.cpp + $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\ribbonlib_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $< @@ -15985,6 +15998,9 @@ $(OBJS)\ribbonlib_panel.o: ../../src/ribbon/panel.cpp $(OBJS)\ribbonlib_toolbar.o: ../../src/ribbon/toolbar.cpp $(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\ribbonlib_xh_ribbon.o: ../../src/xrc/xh_ribbon.cpp + $(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\propgriddll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index c8e12357e7..6aa31ce7a6 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1532,7 +1532,8 @@ RIBBONDLL_OBJECTS = \ $(OBJS)\ribbondll_gallery.obj \ $(OBJS)\ribbondll_page.obj \ $(OBJS)\ribbondll_panel.obj \ - $(OBJS)\ribbondll_toolbar.obj + $(OBJS)\ribbondll_toolbar.obj \ + $(OBJS)\ribbondll_xh_ribbon.obj RIBBONDLL_RESOURCES = \ $(OBJS)\ribbondll_version.res RIBBONLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_503)$(__DEBUGRUNTIME) /DWIN32 \ @@ -1559,7 +1560,8 @@ RIBBONLIB_OBJECTS = \ $(OBJS)\ribbonlib_gallery.obj \ $(OBJS)\ribbonlib_page.obj \ $(OBJS)\ribbonlib_panel.obj \ - $(OBJS)\ribbonlib_toolbar.obj + $(OBJS)\ribbonlib_toolbar.obj \ + $(OBJS)\ribbonlib_xh_ribbon.obj PROPGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_519)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).pdb \ @@ -2035,6 +2037,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_page.obj \ $(OBJS)\monodll_ribbon_panel.obj \ $(OBJS)\monodll_ribbon_toolbar.obj \ + $(OBJS)\monodll_xh_ribbon.obj \ $(OBJS)\monodll_richtextbuffer.obj \ $(OBJS)\monodll_richtextctrl.obj \ $(OBJS)\monodll_richtextformatdlg.obj \ @@ -2840,6 +2843,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_page.obj \ $(OBJS)\monolib_ribbon_panel.obj \ $(OBJS)\monolib_ribbon_toolbar.obj \ + $(OBJS)\monolib_xh_ribbon.obj \ $(OBJS)\monolib_richtextbuffer.obj \ $(OBJS)\monolib_richtextctrl.obj \ $(OBJS)\monolib_richtextformatdlg.obj \ @@ -7959,6 +7963,9 @@ $(OBJS)\monodll_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp $(OBJS)\monodll_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp +$(OBJS)\monodll_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp + $(OBJS)\monodll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp @@ -10406,6 +10413,9 @@ $(OBJS)\monolib_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp $(OBJS)\monolib_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp +$(OBJS)\monolib_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp + $(OBJS)\monolib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp @@ -16467,6 +16477,9 @@ $(OBJS)\ribbondll_panel.obj: ..\..\src\ribbon\panel.cpp $(OBJS)\ribbondll_toolbar.obj: ..\..\src\ribbon\toolbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp +$(OBJS)\ribbondll_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp + $(OBJS)\ribbonlib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp @@ -16500,6 +16513,9 @@ $(OBJS)\ribbonlib_panel.obj: ..\..\src\ribbon\panel.cpp $(OBJS)\ribbonlib_toolbar.obj: ..\..\src\ribbon\toolbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp +$(OBJS)\ribbonlib_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp + $(OBJS)\propgriddll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 9fbbb5556e..1563ffff10 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -243,6 +243,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_page.obj & $(OBJS)\monodll_ribbon_panel.obj & $(OBJS)\monodll_ribbon_toolbar.obj & + $(OBJS)\monodll_xh_ribbon.obj & $(OBJS)\monodll_richtextbuffer.obj & $(OBJS)\monodll_richtextctrl.obj & $(OBJS)\monodll_richtextformatdlg.obj & @@ -1053,6 +1054,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_page.obj & $(OBJS)\monolib_ribbon_panel.obj & $(OBJS)\monolib_ribbon_toolbar.obj & + $(OBJS)\monolib_xh_ribbon.obj & $(OBJS)\monolib_richtextbuffer.obj & $(OBJS)\monolib_richtextctrl.obj & $(OBJS)\monolib_richtextformatdlg.obj & @@ -4972,7 +4974,8 @@ RIBBONDLL_OBJECTS = & $(OBJS)\ribbondll_gallery.obj & $(OBJS)\ribbondll_page.obj & $(OBJS)\ribbondll_panel.obj & - $(OBJS)\ribbondll_toolbar.obj + $(OBJS)\ribbondll_toolbar.obj & + $(OBJS)\ribbondll_xh_ribbon.obj RIBBONLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & @@ -4993,7 +4996,8 @@ RIBBONLIB_OBJECTS = & $(OBJS)\ribbonlib_gallery.obj & $(OBJS)\ribbonlib_page.obj & $(OBJS)\ribbonlib_panel.obj & - $(OBJS)\ribbonlib_toolbar.obj + $(OBJS)\ribbonlib_toolbar.obj & + $(OBJS)\ribbonlib_xh_ribbon.obj PROPGRIDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & @@ -7717,6 +7721,9 @@ $(OBJS)\monodll_ribbon_panel.obj : .AUTODEPEND ..\..\src\ribbon\panel.cpp $(OBJS)\monodll_ribbon_toolbar.obj : .AUTODEPEND ..\..\src\ribbon\toolbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_xh_ribbon.obj : .AUTODEPEND ..\..\src\xrc\xh_ribbon.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -10164,6 +10171,9 @@ $(OBJS)\monolib_ribbon_panel.obj : .AUTODEPEND ..\..\src\ribbon\panel.cpp $(OBJS)\monolib_ribbon_toolbar.obj : .AUTODEPEND ..\..\src\ribbon\toolbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_xh_ribbon.obj : .AUTODEPEND ..\..\src\xrc\xh_ribbon.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -16225,6 +16235,9 @@ $(OBJS)\ribbondll_panel.obj : .AUTODEPEND ..\..\src\ribbon\panel.cpp $(OBJS)\ribbondll_toolbar.obj : .AUTODEPEND ..\..\src\ribbon\toolbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONDLL_CXXFLAGS) $< +$(OBJS)\ribbondll_xh_ribbon.obj : .AUTODEPEND ..\..\src\xrc\xh_ribbon.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONDLL_CXXFLAGS) $< + $(OBJS)\ribbonlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONLIB_CXXFLAGS) $< @@ -16258,6 +16271,9 @@ $(OBJS)\ribbonlib_panel.obj : .AUTODEPEND ..\..\src\ribbon\panel.cpp $(OBJS)\ribbonlib_toolbar.obj : .AUTODEPEND ..\..\src\ribbon\toolbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONLIB_CXXFLAGS) $< +$(OBJS)\ribbonlib_xh_ribbon.obj : .AUTODEPEND ..\..\src\xrc\xh_ribbon.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONLIB_CXXFLAGS) $< + $(OBJS)\propgriddll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $< diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 1b39171a00..726eaccf4e 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -7272,6 +7272,10 @@ SOURCE=..\..\include\wx\xrc\xh_radbx.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xrc\xh_ribbon.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xrc\xh_richtext.h # End Source File # Begin Source File diff --git a/build/msw/wx_ribbon.dsp b/build/msw/wx_ribbon.dsp index 862e2c035a..9f5cf48e98 100644 --- a/build/msw/wx_ribbon.dsp +++ b/build/msw/wx_ribbon.dsp @@ -564,6 +564,10 @@ SOURCE=..\..\include\wx\ribbon\panel.h SOURCE=..\..\include\wx\ribbon\toolbar.h # End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_ribbon.h +# End Source File # End Group # Begin Group "Source Files" @@ -608,6 +612,10 @@ SOURCE=..\..\src\ribbon\panel.cpp SOURCE=..\..\src\ribbon\toolbar.cpp # End Source File +# Begin Source File + +SOURCE=..\..\src\xrc\xh_ribbon.cpp +# End Source File # End Group # End Target # End Project diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index c1c298128d..72822b633d 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -6029,6 +6029,9 @@ + + diff --git a/build/msw/wx_vc7_ribbon.vcproj b/build/msw/wx_vc7_ribbon.vcproj index 866d2fdefc..1b1d8ecc7b 100644 --- a/build/msw/wx_vc7_ribbon.vcproj +++ b/build/msw/wx_vc7_ribbon.vcproj @@ -798,6 +798,9 @@ + + + + diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index 675ded9eb4..8541a49a6c 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -8059,6 +8059,10 @@ RelativePath="..\..\include\wx\xrc\xh_radbx.h" > + + diff --git a/build/msw/wx_vc8_ribbon.vcproj b/build/msw/wx_vc8_ribbon.vcproj index 33d5c1690e..cd2e6d6ec7 100644 --- a/build/msw/wx_vc8_ribbon.vcproj +++ b/build/msw/wx_vc8_ribbon.vcproj @@ -1086,6 +1086,10 @@ RelativePath="..\..\include\wx\ribbon\toolbar.h" > + + + + diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index b8f8506173..3e070ac22e 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -8055,6 +8055,10 @@ RelativePath="..\..\include\wx\xrc\xh_radbx.h" > + + diff --git a/build/msw/wx_vc9_ribbon.vcproj b/build/msw/wx_vc9_ribbon.vcproj index 12dcfbb5de..0d2f73ec7c 100644 --- a/build/msw/wx_vc9_ribbon.vcproj +++ b/build/msw/wx_vc9_ribbon.vcproj @@ -1082,6 +1082,10 @@ RelativePath="..\..\include\wx\ribbon\toolbar.h" > + + + + diff --git a/docs/changes.txt b/docs/changes.txt index 1d7fa1d4f7..7e772e11cb 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -545,6 +545,7 @@ All: 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. diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h index 693792e42b..5ff844aa2a 100644 --- a/docs/doxygen/overviews/xrc_format.h +++ b/docs/doxygen/overviews/xrc_format.h @@ -1434,6 +1434,53 @@ Example: @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 + + + + + + + + open.xpm + + + + + + + + + + + + zoomin.xpm + + + zoomout.xpm + + + + + +@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 + + AddHandler(new wxRibbonXmlHandler); +@endcode +to use it. + + @subsubsection xrc_wxrichtextctrl wxRichTextCtrl @beginTable diff --git a/include/wx/xrc/xh_ribbon.h b/include/wx/xrc/xh_ribbon.h new file mode 100644 index 0000000000..7445e20fee --- /dev/null +++ b/include/wx/xrc/xh_ribbon.h @@ -0,0 +1,48 @@ +///////////////////////////////////////////////////////////////////////////// +// 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_ diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in index b364bc162b..b45c3f2d76 100644 --- a/samples/xrc/Makefile.in +++ b/samples/xrc/Makefile.in @@ -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_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) @@ -168,7 +171,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_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) diff --git a/samples/xrc/makefile.bcc b/samples/xrc/makefile.bcc index 0fbafc2a19..cd0b558b48 100644 --- a/samples/xrc/makefile.bcc +++ b/samples/xrc/makefile.bcc @@ -24,9 +24,9 @@ BCCDIR = $(MAKEDIR)\.. WX_RELEASE_NODOT = 29 COMPILER_PREFIX = bcc OBJS = \ - $(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) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) XRCDEMO_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ @@ -51,9 +51,9 @@ PORTNAME = base !if "$(USE_GUI)" == "1" PORTNAME = msw !endif -!if "$(OFFICIAL_BUILD)" == "1" -COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD -!endif +!if "$(OFFICIAL_BUILD)" == "1" +COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD +!endif !if "$(BUILD)" == "debug" WXDEBUGFLAG = d !endif @@ -175,6 +175,10 @@ __DLLFLAG_p = -DWXUSINGDLL __DLLFLAG_p_1 = -dWXUSINGDLL !endif !if "$(MONOLITHIC)" == "0" +__WXLIB_RIBBON_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib +!endif +!if "$(MONOLITHIC)" == "0" __WXLIB_XRC_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib !endif @@ -255,7 +259,7 @@ 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_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 + 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 | data: diff --git a/samples/xrc/makefile.gcc b/samples/xrc/makefile.gcc index 2bf91bf442..7d16fc22dd 100644 --- a/samples/xrc/makefile.gcc +++ b/samples/xrc/makefile.gcc @@ -16,9 +16,9 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ - $(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) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) XRCDEMO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ @@ -48,9 +48,9 @@ endif ifeq ($(USE_GUI),1) PORTNAME = msw endif -ifeq ($(OFFICIAL_BUILD),1) -COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD -endif +ifeq ($(OFFICIAL_BUILD),1) +COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD +endif ifeq ($(BUILD),debug) WXDEBUGFLAG = d endif @@ -160,6 +160,10 @@ ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif ifeq ($(MONOLITHIC),0) +__WXLIB_RIBBON_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon +endif +ifeq ($(MONOLITHIC),0) __WXLIB_XRC_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc endif @@ -243,7 +247,7 @@ 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_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 + $(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 data: if not exist $(OBJS)\rc mkdir $(OBJS)\rc diff --git a/samples/xrc/makefile.unx b/samples/xrc/makefile.unx index 67378da923..49aada1fb8 100644 --- a/samples/xrc/makefile.unx +++ b/samples/xrc/makefile.unx @@ -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 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) $< diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc index c7a621ea03..87e1e0f22a 100644 --- a/samples/xrc/makefile.vc +++ b/samples/xrc/makefile.vc @@ -15,9 +15,9 @@ WX_RELEASE_NODOT = 29 COMPILER_PREFIX = vc OBJS = \ - $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) + $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) + .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) XRCDEMO_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ @@ -41,33 +41,33 @@ XRCDEMO_RESOURCES = \ ### Conditionally set variables: ### -!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" +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 "$(USE_GUI)" == "0" PORTNAME = base !endif !if "$(USE_GUI)" == "1" PORTNAME = msw !endif -!if "$(OFFICIAL_BUILD)" == "1" -COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD -!endif +!if "$(OFFICIAL_BUILD)" == "1" +COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD +!endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" WXDEBUGFLAG = d !endif @@ -95,18 +95,18 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "IA64" LINK_TARGET_CPU = /MACHINE:IA64 !endif -!if "$(TARGET_CPU)" == "X64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif +!if "$(TARGET_CPU)" == "X64" +LINK_TARGET_CPU = /MACHINE:X64 +!endif !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif !if "$(TARGET_CPU)" == "ia64" LINK_TARGET_CPU = /MACHINE:IA64 !endif -!if "$(TARGET_CPU)" == "x64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif +!if "$(TARGET_CPU)" == "x64" +LINK_TARGET_CPU = /MACHINE:X64 +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif @@ -312,6 +312,10 @@ __DLLFLAG_p = /DWXUSINGDLL __DLLFLAG_p_1 = /d WXUSINGDLL !endif !if "$(MONOLITHIC)" == "0" +__WXLIB_RIBBON_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib +!endif +!if "$(MONOLITHIC)" == "0" __WXLIB_XRC_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib !endif @@ -377,7 +381,7 @@ 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_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 + $(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 << data: diff --git a/samples/xrc/makefile.wat b/samples/xrc/makefile.wat index 6275653bc6..da140e56a6 100644 --- a/samples/xrc/makefile.wat +++ b/samples/xrc/makefile.wat @@ -38,10 +38,10 @@ PORTNAME = base !ifeq USE_GUI 1 PORTNAME = msw !endif -COMPILER_VERSION = -!ifeq OFFICIAL_BUILD 1 -COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD -!endif +COMPILER_VERSION = +!ifeq OFFICIAL_BUILD 1 +COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD +!endif WXDEBUGFLAG = !ifeq BUILD debug WXDEBUGFLAG = d @@ -141,6 +141,11 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif +__WXLIB_RIBBON_p = +!ifeq MONOLITHIC 0 +__WXLIB_RIBBON_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib +!endif __WXLIB_XRC_p = !ifeq MONOLITHIC 0 __WXLIB_XRC_p = & @@ -241,9 +246,9 @@ __DLLFLAG_p = -dWXUSINGDLL WX_RELEASE_NODOT = 29 COMPILER_PREFIX = wat OBJS = & - $(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) +LIBDIRNAME = & + .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) XRCDEMO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & @@ -284,7 +289,7 @@ $(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_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 + @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 @%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 diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc index b14bade14e..c0a2edf37a 100644 --- a/samples/xrc/rc/controls.xrc +++ b/samples/xrc/rc/controls.xrc @@ -745,6 +745,51 @@ lay them out using wxSizers, absolute positioning, everything you like! + + + + + + + + + + derivdlg.xpm + + + + basicdlg.xpm + + + + custclas.xpm + + + + + + + + + + + + derivdlg.xpm + + + basicdlg.xpm + + + custclas.xpm + + + artprov.xpm + + + + + + diff --git a/samples/xrc/xrcdemo.bkl b/samples/xrc/xrcdemo.bkl index 747f8dba7a..7523f2cb80 100644 --- a/samples/xrc/xrcdemo.bkl +++ b/samples/xrc/xrcdemo.bkl @@ -18,6 +18,7 @@ custclas.h objrefdlg.h + ribbon xrc html adv diff --git a/samples/xrc/xrcdemo.cpp b/samples/xrc/xrcdemo.cpp index 9a770d9804..bc3fcd1793 100644 --- a/samples/xrc/xrcdemo.cpp +++ b/samples/xrc/xrcdemo.cpp @@ -38,6 +38,10 @@ #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" @@ -78,6 +82,10 @@ bool MyApp::OnInit() // 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. diff --git a/samples/xrc/xrcdemo.dsp b/samples/xrc/xrcdemo.dsp index f17082df37..6b099970c8 100644 --- a/samples/xrc/xrcdemo.dsp +++ b/samples/xrc/xrcdemo.dsp @@ -57,8 +57,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# 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 -# 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 +# 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 +# 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 !ELSEIF "$(CFG)" == "xrcdemo - Win32 DLL Universal Debug" @@ -82,8 +82,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# 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 -# 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 +# 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 +# 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 !ELSEIF "$(CFG)" == "xrcdemo - Win32 DLL Release" @@ -107,8 +107,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# 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 -# 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 +# 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 +# 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 !ELSEIF "$(CFG)" == "xrcdemo - Win32 DLL Debug" @@ -132,8 +132,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# 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 -# 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 +# 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 +# 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 !ELSEIF "$(CFG)" == "xrcdemo - Win32 Universal Release" @@ -157,8 +157,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# 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 -# 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 +# 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 +# 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 !ELSEIF "$(CFG)" == "xrcdemo - Win32 Universal Debug" @@ -182,8 +182,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# 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 -# 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 +# 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 +# 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 !ELSEIF "$(CFG)" == "xrcdemo - Win32 Release" @@ -207,8 +207,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# 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 -# 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 +# 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 +# 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 !ELSEIF "$(CFG)" == "xrcdemo - Win32 Debug" @@ -232,8 +232,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# 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 -# 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 +# 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 +# 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 !ENDIF diff --git a/samples/xrc/xrcdemo_vc7.vcproj b/samples/xrc/xrcdemo_vc7.vcproj index 61236e89c4..cdf81e3ac3 100644 --- a/samples/xrc/xrcdemo_vc7.vcproj +++ b/samples/xrc/xrcdemo_vc7.vcproj @@ -46,7 +46,7 @@ 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