From 547703373ce7d3a2c69fa0468407b03a34c4ea10 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Oct 2005 22:24:57 +0000 Subject: [PATCH] regenerated with treebook files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 66 +++++++++++++++++++++++++----------------- build/msw/makefile.bcc | 44 ++++++++++++++++++++++++++++ build/msw/makefile.gcc | 44 ++++++++++++++++++++++++++++ build/msw/makefile.vc | 44 ++++++++++++++++++++++++++++ build/msw/makefile.wat | 44 ++++++++++++++++++++++++++++ build/msw/wx_core.dsp | 8 +++++ build/msw/wx_xrc.dsp | 4 +++ configure.in | 7 ++--- src/wxWindows.dsp | 12 ++++++++ 9 files changed, 243 insertions(+), 30 deletions(-) diff --git a/Makefile.in b/Makefile.in index 154e85b4c8..83fddfa3c7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1256,6 +1256,7 @@ XRCDLL_OBJECTS = \ xrcdll_xh_tglbtn.o \ xrcdll_xh_toolb.o \ xrcdll_xh_tree.o \ + xrcdll_xh_treebk.o \ xrcdll_xh_unkwn.o \ xrcdll_xh_wizrd.o \ xrcdll_xmlres.o \ @@ -1305,6 +1306,7 @@ XRCLIB_OBJECTS = \ xrclib_xh_tglbtn.o \ xrclib_xh_toolb.o \ xrclib_xh_tree.o \ + xrclib_xh_treebk.o \ xrclib_xh_unkwn.o \ xrclib_xh_wizrd.o \ xrclib_xmlres.o \ @@ -2640,6 +2642,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/tooltip.h \ wx/toplevel.h \ wx/treebase.h \ + wx/treebook.h \ wx/treectrl.h \ wx/valgen.h \ wx/vidmode.h \ @@ -2986,6 +2989,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_xh_tglbtn.o \ monodll_xh_toolb.o \ monodll_xh_tree.o \ + monodll_xh_treebk.o \ monodll_xh_unkwn.o \ monodll_xh_wizrd.o \ monodll_xmlres.o \ @@ -3088,6 +3092,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_textdlgg.o \ monodll_tipwin.o \ monodll_treectlg.o \ + monodll_treebkg.o \ monodll_vlbox.o \ monodll_vscroll.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS) @@ -3236,6 +3241,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_textdlgg.o \ monodll_tipwin.o \ monodll_treectlg.o \ + monodll_treebkg.o \ monodll_vlbox.o \ monodll_vscroll.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS) @@ -4453,6 +4459,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_xh_tglbtn.o \ monolib_xh_toolb.o \ monolib_xh_tree.o \ + monolib_xh_treebk.o \ monolib_xh_unkwn.o \ monolib_xh_wizrd.o \ monolib_xmlres.o \ @@ -4555,6 +4562,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_textdlgg.o \ monolib_tipwin.o \ monolib_treectlg.o \ + monolib_treebkg.o \ monolib_vlbox.o \ monolib_vscroll.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1) @@ -4703,6 +4711,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_textdlgg.o \ monolib_tipwin.o \ monolib_treectlg.o \ + monolib_treebkg.o \ monolib_vlbox.o \ monolib_vscroll.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1) @@ -6252,6 +6261,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_textdlgg.o \ coredll_tipwin.o \ coredll_treectlg.o \ + coredll_treebkg.o \ coredll_vlbox.o \ coredll_vscroll.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2) @@ -6400,6 +6410,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_textdlgg.o \ coredll_tipwin.o \ coredll_treectlg.o \ + coredll_treebkg.o \ coredll_vlbox.o \ coredll_vscroll.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2) @@ -7447,6 +7458,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_textdlgg.o \ corelib_tipwin.o \ corelib_treectlg.o \ + corelib_treebkg.o \ corelib_vlbox.o \ corelib_vscroll.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3) @@ -7595,6 +7607,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_textdlgg.o \ corelib_tipwin.o \ corelib_treectlg.o \ + corelib_treebkg.o \ corelib_vlbox.o \ corelib_vscroll.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3) @@ -10959,6 +10972,9 @@ monodll_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(MONODLL_ODEP) monodll_xh_tree.o: $(srcdir)/src/xrc/xh_tree.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_tree.cpp +monodll_xh_treebk.o: $(srcdir)/src/xrc/xh_treebk.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_treebk.cpp + monodll_xh_unkwn.o: $(srcdir)/src/xrc/xh_unkwn.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_unkwn.cpp @@ -13629,6 +13645,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_treectlg.o: $(srcdir)/src/generic/treectlg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/treectlg.cpp +@COND_USE_GUI_1@monodll_treebkg.o: $(srcdir)/src/generic/treebkg.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/treebkg.cpp + @COND_USE_GUI_1@monodll_vlbox.o: $(srcdir)/src/generic/vlbox.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/vlbox.cpp @@ -14427,6 +14446,9 @@ monolib_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(MONOLIB_ODEP) monolib_xh_tree.o: $(srcdir)/src/xrc/xh_tree.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_tree.cpp +monolib_xh_treebk.o: $(srcdir)/src/xrc/xh_treebk.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_treebk.cpp + monolib_xh_unkwn.o: $(srcdir)/src/xrc/xh_unkwn.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_unkwn.cpp @@ -17097,6 +17119,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_treectlg.o: $(srcdir)/src/generic/treectlg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/treectlg.cpp +@COND_USE_GUI_1@monolib_treebkg.o: $(srcdir)/src/generic/treebkg.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/treebkg.cpp + @COND_USE_GUI_1@monolib_vlbox.o: $(srcdir)/src/generic/vlbox.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/vlbox.cpp @@ -20964,6 +20989,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_treectlg.o: $(srcdir)/src/generic/treectlg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/treectlg.cpp +@COND_USE_GUI_1@coredll_treebkg.o: $(srcdir)/src/generic/treebkg.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/treebkg.cpp + @COND_USE_GUI_1@coredll_vlbox.o: $(srcdir)/src/generic/vlbox.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/vlbox.cpp @@ -23472,6 +23500,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_treectlg.o: $(srcdir)/src/generic/treectlg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/treectlg.cpp +@COND_USE_GUI_1@corelib_treebkg.o: $(srcdir)/src/generic/treebkg.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/treebkg.cpp + @COND_USE_GUI_1@corelib_vlbox.o: $(srcdir)/src/generic/vlbox.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/vlbox.cpp @@ -24141,6 +24172,9 @@ xrcdll_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(XRCDLL_ODEP) xrcdll_xh_tree.o: $(srcdir)/src/xrc/xh_tree.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_tree.cpp +xrcdll_xh_treebk.o: $(srcdir)/src/xrc/xh_treebk.cpp $(XRCDLL_ODEP) + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_treebk.cpp + xrcdll_xh_unkwn.o: $(srcdir)/src/xrc/xh_unkwn.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_unkwn.cpp @@ -24270,6 +24304,9 @@ xrclib_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(XRCLIB_ODEP) xrclib_xh_tree.o: $(srcdir)/src/xrc/xh_tree.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_tree.cpp +xrclib_xh_treebk.o: $(srcdir)/src/xrc/xh_treebk.cpp $(XRCLIB_ODEP) + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_treebk.cpp + xrclib_xh_unkwn.o: $(srcdir)/src/xrc/xh_unkwn.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_unkwn.cpp @@ -24442,7 +24479,7 @@ ALL_DIST: distrib_clean cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib -# cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib + #cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib mkdir $(DISTDIR)/src/regex cp $(REGEXDIR)/*.h $(DISTDIR)/src/regex cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex @@ -24472,7 +24509,6 @@ ALL_DIST: distrib_clean cp $(WXDIR)/build/bakefiles/wxpresets/sample/minimal* $(DISTDIR)/build/bakefiles/wxpresets/sample cp $(WXDIR)/build/bakefiles/wxpresets/sample/config* $(DISTDIR)/build/bakefiles/wxpresets/sample cp $(WXDIR)/build/bakefiles/wxpresets/*.txt $(DISTDIR)/build/bakefiles/wxpresets - # copy aclocal files mkdir $(DISTDIR)/build/aclocal cp $(WXDIR)/build/aclocal/*.m4 $(DISTDIR)/build/aclocal @@ -24661,9 +24697,6 @@ MACX_DIST: ALL_GUI_DIST cp $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex cp $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex cp $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex -# obsolete -# mkdir $(DISTDIR)/src/mac/macsock -# cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock mkdir $(DISTDIR)/contrib cp -R $(WXDIR)/contrib $(DISTDIR) @@ -25110,7 +25143,7 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/mobile/styles/*.cpp $(DISTDIR)/samples/mobile/styles cp $(SAMPDIR)/mobile/styles/*.h $(DISTDIR)/samples/mobile/styles cp $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles - + mkdir $(DISTDIR)/samples/multimon cp $(SAMPDIR)/multimon/Makefile.in $(DISTDIR)/samples/multimon cp $(SAMPDIR)/multimon/makefile.unx $(DISTDIR)/samples/multimon @@ -25162,13 +25195,6 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing -# mkdir $(DISTDIR)/samples/resource -# cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource -# cp $(SAMPDIR)/resource/makefile.unx $(DISTDIR)/samples/resource -# cp $(SAMPDIR)/resource/*.cpp $(DISTDIR)/samples/resource -# cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource -# cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource - mkdir $(DISTDIR)/samples/render cp $(SAMPDIR)/render/Makefile.in $(DISTDIR)/samples/render cp $(SAMPDIR)/render/makefile.unx $(DISTDIR)/samples/render @@ -25189,12 +25215,6 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit -# mkdir $(DISTDIR)/samples/proplist -# cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist -# cp $(SAMPDIR)/proplist/makefile.unx $(DISTDIR)/samples/proplist -# cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist -# cp $(SAMPDIR)/proplist/*.h $(DISTDIR)/samples/proplist - mkdir $(DISTDIR)/samples/propsize cp $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize cp $(SAMPDIR)/propsize/makefile.unx $(DISTDIR)/samples/propsize @@ -25277,12 +25297,6 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl -# mkdir $(DISTDIR)/samples/treelay -# cp $(SAMPDIR)/treelay/Makefile.in $(DISTDIR)/samples/treelay -# cp $(SAMPDIR)/treelay/makefile.unx $(DISTDIR)/samples/treelay -# cp $(SAMPDIR)/treelay/*.cpp $(DISTDIR)/samples/treelay -# cp $(SAMPDIR)/treelay/*.h $(DISTDIR)/samples/treelay - mkdir $(DISTDIR)/samples/typetest cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest cp $(SAMPDIR)/typetest/makefile.unx $(DISTDIR)/samples/typetest @@ -25402,7 +25416,7 @@ MANUAL_DIST: cp $(DOCDIR)/latex/wx/*.sty $(DISTDIR)/docs/latex/wx -# Copy all the files from wxPython needed for the Debian source package, +# Copy all the files from wxPython needed for the Debian source package, # and then remove some that are not needed. PYTHON_DIST: for dir in `grep -v '#' $(WXDIR)/wxPython/distrib/DIRLIST`; do \ diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 5be86c0e3a..4dbec85382 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -914,6 +914,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_tglbtn.obj \ $(OBJS)\xrcdll_xh_toolb.obj \ $(OBJS)\xrcdll_xh_tree.obj \ + $(OBJS)\xrcdll_xh_treebk.obj \ $(OBJS)\xrcdll_xh_unkwn.obj \ $(OBJS)\xrcdll_xh_wizrd.obj \ $(OBJS)\xrcdll_xmlres.obj \ @@ -966,6 +967,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_tglbtn.obj \ $(OBJS)\xrclib_xh_toolb.obj \ $(OBJS)\xrclib_xh_tree.obj \ + $(OBJS)\xrclib_xh_treebk.obj \ $(OBJS)\xrclib_xh_unkwn.obj \ $(OBJS)\xrclib_xh_wizrd.obj \ $(OBJS)\xrclib_xmlres.obj \ @@ -1120,6 +1122,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_tglbtn.obj \ $(OBJS)\monodll_xh_toolb.obj \ $(OBJS)\monodll_xh_tree.obj \ + $(OBJS)\monodll_xh_treebk.obj \ $(OBJS)\monodll_xh_unkwn.obj \ $(OBJS)\monodll_xh_wizrd.obj \ $(OBJS)\monodll_xmlres.obj \ @@ -1317,6 +1320,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_textdlgg.obj \ $(OBJS)\monodll_tipwin.obj \ $(OBJS)\monodll_treectlg.obj \ + $(OBJS)\monodll_treebkg.obj \ $(OBJS)\monodll_vlbox.obj \ $(OBJS)\monodll_vscroll.obj !endif @@ -1513,6 +1517,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_textdlgg.obj \ $(OBJS)\monodll_tipwin.obj \ $(OBJS)\monodll_treectlg.obj \ + $(OBJS)\monodll_treebkg.obj \ $(OBJS)\monodll_vlbox.obj \ $(OBJS)\monodll_vscroll.obj !endif @@ -1632,6 +1637,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_tglbtn.obj \ $(OBJS)\monolib_xh_toolb.obj \ $(OBJS)\monolib_xh_tree.obj \ + $(OBJS)\monolib_xh_treebk.obj \ $(OBJS)\monolib_xh_unkwn.obj \ $(OBJS)\monolib_xh_wizrd.obj \ $(OBJS)\monolib_xmlres.obj \ @@ -1829,6 +1835,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_textdlgg.obj \ $(OBJS)\monolib_tipwin.obj \ $(OBJS)\monolib_treectlg.obj \ + $(OBJS)\monolib_treebkg.obj \ $(OBJS)\monolib_vlbox.obj \ $(OBJS)\monolib_vscroll.obj !endif @@ -2025,6 +2032,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_textdlgg.obj \ $(OBJS)\monolib_tipwin.obj \ $(OBJS)\monolib_treectlg.obj \ + $(OBJS)\monolib_treebkg.obj \ $(OBJS)\monolib_vlbox.obj \ $(OBJS)\monolib_vscroll.obj !endif @@ -2279,6 +2287,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_textdlgg.obj \ $(OBJS)\coredll_tipwin.obj \ $(OBJS)\coredll_treectlg.obj \ + $(OBJS)\coredll_treebkg.obj \ $(OBJS)\coredll_vlbox.obj \ $(OBJS)\coredll_vscroll.obj !endif @@ -2475,6 +2484,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_textdlgg.obj \ $(OBJS)\coredll_tipwin.obj \ $(OBJS)\coredll_treectlg.obj \ + $(OBJS)\coredll_treebkg.obj \ $(OBJS)\coredll_vlbox.obj \ $(OBJS)\coredll_vscroll.obj !endif @@ -2674,6 +2684,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_textdlgg.obj \ $(OBJS)\corelib_tipwin.obj \ $(OBJS)\corelib_treectlg.obj \ + $(OBJS)\corelib_treebkg.obj \ $(OBJS)\corelib_vlbox.obj \ $(OBJS)\corelib_vscroll.obj !endif @@ -2870,6 +2881,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_textdlgg.obj \ $(OBJS)\corelib_tipwin.obj \ $(OBJS)\corelib_treectlg.obj \ + $(OBJS)\corelib_treebkg.obj \ $(OBJS)\corelib_vlbox.obj \ $(OBJS)\corelib_vscroll.obj !endif @@ -4545,6 +4557,9 @@ $(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5528,6 +5543,11 @@ $(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_treebkg.obj: ..\..\src\generic\treebkg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_vlbox.obj: ..\..\src\generic\vlbox.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6233,6 +6253,9 @@ $(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7216,6 +7239,11 @@ $(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_treebkg.obj: ..\..\src\generic\treebkg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_vlbox.obj: ..\..\src\generic\vlbox.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8985,6 +9013,11 @@ $(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_treebkg.obj: ..\..\src\generic\treebkg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_vlbox.obj: ..\..\src\generic\vlbox.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -10119,6 +10152,11 @@ $(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_treebkg.obj: ..\..\src\generic\treebkg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_vlbox.obj: ..\..\src\generic\vlbox.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -10609,6 +10647,9 @@ $(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** +$(OBJS)\xrcdll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + $(OBJS)\xrcdll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** @@ -10741,6 +10782,9 @@ $(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** +$(OBJS)\xrclib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + $(OBJS)\xrclib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 0146595427..395701935a 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -916,6 +916,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_tglbtn.o \ $(OBJS)\xrcdll_xh_toolb.o \ $(OBJS)\xrcdll_xh_tree.o \ + $(OBJS)\xrcdll_xh_treebk.o \ $(OBJS)\xrcdll_xh_unkwn.o \ $(OBJS)\xrcdll_xh_wizrd.o \ $(OBJS)\xrcdll_xmlres.o \ @@ -968,6 +969,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_tglbtn.o \ $(OBJS)\xrclib_xh_toolb.o \ $(OBJS)\xrclib_xh_tree.o \ + $(OBJS)\xrclib_xh_treebk.o \ $(OBJS)\xrclib_xh_unkwn.o \ $(OBJS)\xrclib_xh_wizrd.o \ $(OBJS)\xrclib_xmlres.o \ @@ -1130,6 +1132,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_tglbtn.o \ $(OBJS)\monodll_xh_toolb.o \ $(OBJS)\monodll_xh_tree.o \ + $(OBJS)\monodll_xh_treebk.o \ $(OBJS)\monodll_xh_unkwn.o \ $(OBJS)\monodll_xh_wizrd.o \ $(OBJS)\monodll_xmlres.o \ @@ -1328,6 +1331,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_textdlgg.o \ $(OBJS)\monodll_tipwin.o \ $(OBJS)\monodll_treectlg.o \ + $(OBJS)\monodll_treebkg.o \ $(OBJS)\monodll_vlbox.o \ $(OBJS)\monodll_vscroll.o endif @@ -1526,6 +1530,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_textdlgg.o \ $(OBJS)\monodll_tipwin.o \ $(OBJS)\monodll_treectlg.o \ + $(OBJS)\monodll_treebkg.o \ $(OBJS)\monodll_vlbox.o \ $(OBJS)\monodll_vscroll.o endif @@ -1648,6 +1653,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_tglbtn.o \ $(OBJS)\monolib_xh_toolb.o \ $(OBJS)\monolib_xh_tree.o \ + $(OBJS)\monolib_xh_treebk.o \ $(OBJS)\monolib_xh_unkwn.o \ $(OBJS)\monolib_xh_wizrd.o \ $(OBJS)\monolib_xmlres.o \ @@ -1846,6 +1852,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_textdlgg.o \ $(OBJS)\monolib_tipwin.o \ $(OBJS)\monolib_treectlg.o \ + $(OBJS)\monolib_treebkg.o \ $(OBJS)\monolib_vlbox.o \ $(OBJS)\monolib_vscroll.o endif @@ -2044,6 +2051,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_textdlgg.o \ $(OBJS)\monolib_tipwin.o \ $(OBJS)\monolib_treectlg.o \ + $(OBJS)\monolib_treebkg.o \ $(OBJS)\monolib_vlbox.o \ $(OBJS)\monolib_vscroll.o endif @@ -2312,6 +2320,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_textdlgg.o \ $(OBJS)\coredll_tipwin.o \ $(OBJS)\coredll_treectlg.o \ + $(OBJS)\coredll_treebkg.o \ $(OBJS)\coredll_vlbox.o \ $(OBJS)\coredll_vscroll.o endif @@ -2510,6 +2519,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_textdlgg.o \ $(OBJS)\coredll_tipwin.o \ $(OBJS)\coredll_treectlg.o \ + $(OBJS)\coredll_treebkg.o \ $(OBJS)\coredll_vlbox.o \ $(OBJS)\coredll_vscroll.o endif @@ -2715,6 +2725,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_textdlgg.o \ $(OBJS)\corelib_tipwin.o \ $(OBJS)\corelib_treectlg.o \ + $(OBJS)\corelib_treebkg.o \ $(OBJS)\corelib_vlbox.o \ $(OBJS)\corelib_vscroll.o endif @@ -2913,6 +2924,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_textdlgg.o \ $(OBJS)\corelib_tipwin.o \ $(OBJS)\corelib_treectlg.o \ + $(OBJS)\corelib_treebkg.o \ $(OBJS)\corelib_vlbox.o \ $(OBJS)\corelib_vscroll.o endif @@ -4641,6 +4653,9 @@ $(OBJS)\monodll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp $(OBJS)\monodll_xh_tree.o: ../../src/xrc/xh_tree.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_xh_treebk.o: ../../src/xrc/xh_treebk.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_xh_unkwn.o: ../../src/xrc/xh_unkwn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -5724,6 +5739,11 @@ $(OBJS)\monodll_treectlg.o: ../../src/generic/treectlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_treebkg.o: ../../src/generic/treebkg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_vlbox.o: ../../src/generic/vlbox.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -6429,6 +6449,9 @@ $(OBJS)\monolib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp $(OBJS)\monolib_xh_tree.o: ../../src/xrc/xh_tree.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_xh_treebk.o: ../../src/xrc/xh_treebk.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_xh_unkwn.o: ../../src/xrc/xh_unkwn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -7512,6 +7535,11 @@ $(OBJS)\monolib_treectlg.o: ../../src/generic/treectlg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_treebkg.o: ../../src/generic/treebkg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_vlbox.o: ../../src/generic/vlbox.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9381,6 +9409,11 @@ $(OBJS)\coredll_treectlg.o: ../../src/generic/treectlg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_treebkg.o: ../../src/generic/treebkg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_vlbox.o: ../../src/generic/vlbox.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -10615,6 +10648,11 @@ $(OBJS)\corelib_treectlg.o: ../../src/generic/treectlg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_treebkg.o: ../../src/generic/treebkg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_vlbox.o: ../../src/generic/vlbox.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -11105,6 +11143,9 @@ $(OBJS)\xrcdll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp $(OBJS)\xrcdll_xh_tree.o: ../../src/xrc/xh_tree.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\xrcdll_xh_treebk.o: ../../src/xrc/xh_treebk.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrcdll_xh_unkwn.o: ../../src/xrc/xh_unkwn.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11237,6 +11278,9 @@ $(OBJS)\xrclib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp $(OBJS)\xrclib_xh_tree.o: ../../src/xrc/xh_tree.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\xrclib_xh_treebk.o: ../../src/xrc/xh_treebk.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrclib_xh_unkwn.o: ../../src/xrc/xh_unkwn.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 7dd81bc6af..0ee44f17ed 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -997,6 +997,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_tglbtn.obj \ $(OBJS)\xrcdll_xh_toolb.obj \ $(OBJS)\xrcdll_xh_tree.obj \ + $(OBJS)\xrcdll_xh_treebk.obj \ $(OBJS)\xrcdll_xh_unkwn.obj \ $(OBJS)\xrcdll_xh_wizrd.obj \ $(OBJS)\xrcdll_xmlres.obj \ @@ -1052,6 +1053,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_tglbtn.obj \ $(OBJS)\xrclib_xh_toolb.obj \ $(OBJS)\xrclib_xh_tree.obj \ + $(OBJS)\xrclib_xh_treebk.obj \ $(OBJS)\xrclib_xh_unkwn.obj \ $(OBJS)\xrclib_xh_wizrd.obj \ $(OBJS)\xrclib_xmlres.obj \ @@ -1255,6 +1257,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_tglbtn.obj \ $(OBJS)\monodll_xh_toolb.obj \ $(OBJS)\monodll_xh_tree.obj \ + $(OBJS)\monodll_xh_treebk.obj \ $(OBJS)\monodll_xh_unkwn.obj \ $(OBJS)\monodll_xh_wizrd.obj \ $(OBJS)\monodll_xmlres.obj \ @@ -1452,6 +1455,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_textdlgg.obj \ $(OBJS)\monodll_tipwin.obj \ $(OBJS)\monodll_treectlg.obj \ + $(OBJS)\monodll_treebkg.obj \ $(OBJS)\monodll_vlbox.obj \ $(OBJS)\monodll_vscroll.obj !endif @@ -1648,6 +1652,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_textdlgg.obj \ $(OBJS)\monodll_tipwin.obj \ $(OBJS)\monodll_treectlg.obj \ + $(OBJS)\monodll_treebkg.obj \ $(OBJS)\monodll_vlbox.obj \ $(OBJS)\monodll_vscroll.obj !endif @@ -1773,6 +1778,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_tglbtn.obj \ $(OBJS)\monolib_xh_toolb.obj \ $(OBJS)\monolib_xh_tree.obj \ + $(OBJS)\monolib_xh_treebk.obj \ $(OBJS)\monolib_xh_unkwn.obj \ $(OBJS)\monolib_xh_wizrd.obj \ $(OBJS)\monolib_xmlres.obj \ @@ -1970,6 +1976,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_textdlgg.obj \ $(OBJS)\monolib_tipwin.obj \ $(OBJS)\monolib_treectlg.obj \ + $(OBJS)\monolib_treebkg.obj \ $(OBJS)\monolib_vlbox.obj \ $(OBJS)\monolib_vscroll.obj !endif @@ -2166,6 +2173,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_textdlgg.obj \ $(OBJS)\monolib_tipwin.obj \ $(OBJS)\monolib_treectlg.obj \ + $(OBJS)\monolib_treebkg.obj \ $(OBJS)\monolib_vlbox.obj \ $(OBJS)\monolib_vscroll.obj !endif @@ -2450,6 +2458,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_textdlgg.obj \ $(OBJS)\coredll_tipwin.obj \ $(OBJS)\coredll_treectlg.obj \ + $(OBJS)\coredll_treebkg.obj \ $(OBJS)\coredll_vlbox.obj \ $(OBJS)\coredll_vscroll.obj !endif @@ -2646,6 +2655,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_textdlgg.obj \ $(OBJS)\coredll_tipwin.obj \ $(OBJS)\coredll_treectlg.obj \ + $(OBJS)\coredll_treebkg.obj \ $(OBJS)\coredll_vlbox.obj \ $(OBJS)\coredll_vscroll.obj !endif @@ -2851,6 +2861,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_textdlgg.obj \ $(OBJS)\corelib_tipwin.obj \ $(OBJS)\corelib_treectlg.obj \ + $(OBJS)\corelib_treebkg.obj \ $(OBJS)\corelib_vlbox.obj \ $(OBJS)\corelib_vscroll.obj !endif @@ -3047,6 +3058,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_textdlgg.obj \ $(OBJS)\corelib_tipwin.obj \ $(OBJS)\corelib_treectlg.obj \ + $(OBJS)\corelib_treebkg.obj \ $(OBJS)\corelib_vlbox.obj \ $(OBJS)\corelib_vscroll.obj !endif @@ -4830,6 +4842,9 @@ $(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -5813,6 +5828,11 @@ $(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_treebkg.obj: ..\..\src\generic\treebkg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_vlbox.obj: ..\..\src\generic\vlbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -6518,6 +6538,9 @@ $(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -7501,6 +7524,11 @@ $(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_treebkg.obj: ..\..\src\generic\treebkg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_vlbox.obj: ..\..\src\generic\vlbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -9270,6 +9298,11 @@ $(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_treebkg.obj: ..\..\src\generic\treebkg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_vlbox.obj: ..\..\src\generic\vlbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -10404,6 +10437,11 @@ $(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_treebkg.obj: ..\..\src\generic\treebkg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_vlbox.obj: ..\..\src\generic\vlbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -10894,6 +10932,9 @@ $(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** +$(OBJS)\xrcdll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + $(OBJS)\xrcdll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** @@ -11026,6 +11067,9 @@ $(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** +$(OBJS)\xrclib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + $(OBJS)\xrclib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index a7850c8219..281a7fc755 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -169,6 +169,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_xh_tglbtn.obj & $(OBJS)\monodll_xh_toolb.obj & $(OBJS)\monodll_xh_tree.obj & + $(OBJS)\monodll_xh_treebk.obj & $(OBJS)\monodll_xh_unkwn.obj & $(OBJS)\monodll_xh_wizrd.obj & $(OBJS)\monodll_xmlres.obj & @@ -368,6 +369,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_textdlgg.obj & $(OBJS)\monodll_tipwin.obj & $(OBJS)\monodll_treectlg.obj & + $(OBJS)\monodll_treebkg.obj & $(OBJS)\monodll_vlbox.obj & $(OBJS)\monodll_vscroll.obj !endif @@ -566,6 +568,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_textdlgg.obj & $(OBJS)\monodll_tipwin.obj & $(OBJS)\monodll_treectlg.obj & + $(OBJS)\monodll_treebkg.obj & $(OBJS)\monodll_vlbox.obj & $(OBJS)\monodll_vscroll.obj !endif @@ -691,6 +694,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_xh_tglbtn.obj & $(OBJS)\monolib_xh_toolb.obj & $(OBJS)\monolib_xh_tree.obj & + $(OBJS)\monolib_xh_treebk.obj & $(OBJS)\monolib_xh_unkwn.obj & $(OBJS)\monolib_xh_wizrd.obj & $(OBJS)\monolib_xmlres.obj & @@ -890,6 +894,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_textdlgg.obj & $(OBJS)\monolib_tipwin.obj & $(OBJS)\monolib_treectlg.obj & + $(OBJS)\monolib_treebkg.obj & $(OBJS)\monolib_vlbox.obj & $(OBJS)\monolib_vscroll.obj !endif @@ -1088,6 +1093,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_textdlgg.obj & $(OBJS)\monolib_tipwin.obj & $(OBJS)\monolib_treectlg.obj & + $(OBJS)\monolib_treebkg.obj & $(OBJS)\monolib_vlbox.obj & $(OBJS)\monolib_vscroll.obj !endif @@ -1363,6 +1369,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_textdlgg.obj & $(OBJS)\coredll_tipwin.obj & $(OBJS)\coredll_treectlg.obj & + $(OBJS)\coredll_treebkg.obj & $(OBJS)\coredll_vlbox.obj & $(OBJS)\coredll_vscroll.obj !endif @@ -1561,6 +1568,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_textdlgg.obj & $(OBJS)\coredll_tipwin.obj & $(OBJS)\coredll_treectlg.obj & + $(OBJS)\coredll_treebkg.obj & $(OBJS)\coredll_vlbox.obj & $(OBJS)\coredll_vscroll.obj !endif @@ -1768,6 +1776,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_textdlgg.obj & $(OBJS)\corelib_tipwin.obj & $(OBJS)\corelib_treectlg.obj & + $(OBJS)\corelib_treebkg.obj & $(OBJS)\corelib_vlbox.obj & $(OBJS)\corelib_vscroll.obj !endif @@ -1966,6 +1975,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_textdlgg.obj & $(OBJS)\corelib_tipwin.obj & $(OBJS)\corelib_treectlg.obj & + $(OBJS)\corelib_treebkg.obj & $(OBJS)\corelib_vlbox.obj & $(OBJS)\corelib_vscroll.obj !endif @@ -3251,6 +3261,7 @@ XRCDLL_OBJECTS = & $(OBJS)\xrcdll_xh_tglbtn.obj & $(OBJS)\xrcdll_xh_toolb.obj & $(OBJS)\xrcdll_xh_tree.obj & + $(OBJS)\xrcdll_xh_treebk.obj & $(OBJS)\xrcdll_xh_unkwn.obj & $(OBJS)\xrcdll_xh_wizrd.obj & $(OBJS)\xrcdll_xmlres.obj & @@ -3304,6 +3315,7 @@ XRCLIB_OBJECTS = & $(OBJS)\xrclib_xh_tglbtn.obj & $(OBJS)\xrclib_xh_toolb.obj & $(OBJS)\xrclib_xh_tree.obj & + $(OBJS)\xrclib_xh_treebk.obj & $(OBJS)\xrclib_xh_unkwn.obj & $(OBJS)\xrclib_xh_wizrd.obj & $(OBJS)\xrclib_xmlres.obj & @@ -4840,6 +4852,9 @@ $(OBJS)\monodll_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp $(OBJS)\monodll_xh_tree.obj : .AUTODEPEND ..\..\src\xrc\xh_tree.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_xh_treebk.obj : .AUTODEPEND ..\..\src\xrc\xh_treebk.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xh_unkwn.obj : .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5923,6 +5938,11 @@ $(OBJS)\monodll_treectlg.obj : .AUTODEPEND ..\..\src\generic\treectlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_treebkg.obj : .AUTODEPEND ..\..\src\generic\treebkg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_vlbox.obj : .AUTODEPEND ..\..\src\generic\vlbox.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6628,6 +6648,9 @@ $(OBJS)\monolib_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp $(OBJS)\monolib_xh_tree.obj : .AUTODEPEND ..\..\src\xrc\xh_tree.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_xh_treebk.obj : .AUTODEPEND ..\..\src\xrc\xh_treebk.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xh_unkwn.obj : .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7711,6 +7734,11 @@ $(OBJS)\monolib_treectlg.obj : .AUTODEPEND ..\..\src\generic\treectlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_treebkg.obj : .AUTODEPEND ..\..\src\generic\treebkg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_vlbox.obj : .AUTODEPEND ..\..\src\generic\vlbox.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -9580,6 +9608,11 @@ $(OBJS)\coredll_treectlg.obj : .AUTODEPEND ..\..\src\generic\treectlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_treebkg.obj : .AUTODEPEND ..\..\src\generic\treebkg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_vlbox.obj : .AUTODEPEND ..\..\src\generic\vlbox.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -10814,6 +10847,11 @@ $(OBJS)\corelib_treectlg.obj : .AUTODEPEND ..\..\src\generic\treectlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_treebkg.obj : .AUTODEPEND ..\..\src\generic\treebkg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_vlbox.obj : .AUTODEPEND ..\..\src\generic\vlbox.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -11304,6 +11342,9 @@ $(OBJS)\xrcdll_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp $(OBJS)\xrcdll_xh_tree.obj : .AUTODEPEND ..\..\src\xrc\xh_tree.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< +$(OBJS)\xrcdll_xh_treebk.obj : .AUTODEPEND ..\..\src\xrc\xh_treebk.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + $(OBJS)\xrcdll_xh_unkwn.obj : .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< @@ -11436,6 +11477,9 @@ $(OBJS)\xrclib_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp $(OBJS)\xrclib_xh_tree.obj : .AUTODEPEND ..\..\src\xrc\xh_tree.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< +$(OBJS)\xrclib_xh_treebk.obj : .AUTODEPEND ..\..\src\xrc\xh_treebk.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\xrclib_xh_unkwn.obj : .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 760164a8d7..f65a2fe1b2 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -4779,6 +4779,10 @@ SOURCE=..\..\src\generic\tipwin.cpp # End Source File # Begin Source File +SOURCE=..\..\src\generic\treebkg.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\generic\treectlg.cpp # End Source File # Begin Source File @@ -8792,6 +8796,10 @@ SOURCE=..\..\include\wx\treebase.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\treebook.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\treectrl.h # End Source File # Begin Source File diff --git a/build/msw/wx_xrc.dsp b/build/msw/wx_xrc.dsp index c8bf3584ca..f62c8d0caf 100644 --- a/build/msw/wx_xrc.dsp +++ b/build/msw/wx_xrc.dsp @@ -1131,6 +1131,10 @@ SOURCE=..\..\src\xrc\xh_tree.cpp # End Source File # Begin Source File +SOURCE=..\..\src\xrc\xh_treebk.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\xrc\xh_unkwn.cpp # End Source File # Begin Source File diff --git a/configure.in b/configure.in index 2b85a555a1..6b302f2c87 100644 --- a/configure.in +++ b/configure.in @@ -4671,10 +4671,9 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then $CXX -dumpspecs | grep 'pthread:' >/dev/null || THREAD_OPTS="" else - dnl HP-UX aCC only gives a warning, not an error about - dnl -pthread but it doesn't work and we have to use - dnl -lpthread there - THREAD_OPTS="" + dnl HP-UX aCC (tested with version B3910B A.06.05 [Jul 25 + dnl 2005]) supports -mt + THREAD_OPTS="-mt" fi ;; diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 3460ef7a1c..d2d4e8ac57 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -1038,6 +1038,10 @@ SOURCE=.\generic\tipwin.cpp # End Source File # Begin Source File +SOURCE=.\generic\treebkg.cpp +# End Source File +# Begin Source File + SOURCE=.\generic\treectlg.cpp # End Source File # Begin Source File @@ -1799,6 +1803,10 @@ SOURCE=.\xrc\xh_tree.cpp # End Source File # Begin Source File +SOURCE=.\xrc\xh_treebk.cpp +# End Source File +# Begin Source File + SOURCE=.\xrc\xh_unkwn.cpp # End Source File # Begin Source File @@ -2923,6 +2931,10 @@ SOURCE=..\include\wx\treebase.h # End Source File # Begin Source File +SOURCE=..\include\wx\treebook.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\treectrl.h # End Source File # Begin Source File -- 2.45.2