From: Robin Dunn Date: Wed, 1 Sep 2004 19:04:25 +0000 (+0000) Subject: rebaked, for addition of xh_tglbtn X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/36215a70714f9a67430bd8180ea95377b67b7b86 rebaked, for addition of xh_tglbtn git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/contrib/build/xrc/makefile.bcc b/contrib/build/xrc/makefile.bcc index 7b661a17a7..b8fae2c978 100644 --- a/contrib/build/xrc/makefile.bcc +++ b/contrib/build/xrc/makefile.bcc @@ -38,6 +38,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_bttn.obj \ $(OBJS)\xrcdll_xh_cald.obj \ $(OBJS)\xrcdll_xh_chckb.obj \ + $(OBJS)\xrcdll_xh_tglbtn.obj \ $(OBJS)\xrcdll_xh_chckl.obj \ $(OBJS)\xrcdll_xh_choic.obj \ $(OBJS)\xrcdll_xh_combo.obj \ @@ -84,6 +85,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_bttn.obj \ $(OBJS)\xrclib_xh_cald.obj \ $(OBJS)\xrclib_xh_chckb.obj \ + $(OBJS)\xrclib_xh_tglbtn.obj \ $(OBJS)\xrclib_xh_chckl.obj \ $(OBJS)\xrclib_xh_choic.obj \ $(OBJS)\xrclib_xh_combo.obj \ @@ -295,6 +297,9 @@ $(OBJS)\xrcdll_xh_cald.obj: ../../src/xrc\xh_cald.cpp $(OBJS)\xrcdll_xh_chckb.obj: ../../src/xrc\xh_chckb.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** +$(OBJS)\xrcdll_xh_tglbtn.obj: ../../src/xrc\xh_tglbtn.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + $(OBJS)\xrcdll_xh_chckl.obj: ../../src/xrc\xh_chckl.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** @@ -412,6 +417,9 @@ $(OBJS)\xrclib_xh_cald.obj: ../../src/xrc\xh_cald.cpp $(OBJS)\xrclib_xh_chckb.obj: ../../src/xrc\xh_chckb.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** +$(OBJS)\xrclib_xh_tglbtn.obj: ../../src/xrc\xh_tglbtn.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + $(OBJS)\xrclib_xh_chckl.obj: ../../src/xrc\xh_chckl.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** diff --git a/contrib/build/xrc/makefile.gcc b/contrib/build/xrc/makefile.gcc index eb53c912ff..8327d144be 100644 --- a/contrib/build/xrc/makefile.gcc +++ b/contrib/build/xrc/makefile.gcc @@ -29,6 +29,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_bttn.o \ $(OBJS)\xrcdll_xh_cald.o \ $(OBJS)\xrcdll_xh_chckb.o \ + $(OBJS)\xrcdll_xh_tglbtn.o \ $(OBJS)\xrcdll_xh_chckl.o \ $(OBJS)\xrcdll_xh_choic.o \ $(OBJS)\xrcdll_xh_combo.o \ @@ -75,6 +76,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_bttn.o \ $(OBJS)\xrclib_xh_cald.o \ $(OBJS)\xrclib_xh_chckb.o \ + $(OBJS)\xrclib_xh_tglbtn.o \ $(OBJS)\xrclib_xh_chckl.o \ $(OBJS)\xrclib_xh_choic.o \ $(OBJS)\xrclib_xh_combo.o \ @@ -287,6 +289,9 @@ $(OBJS)\xrcdll_xh_cald.o: ../../src/xrc/xh_cald.cpp $(OBJS)\xrcdll_xh_chckb.o: ../../src/xrc/xh_chckb.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< +$(OBJS)\xrcdll_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(OBJS)\xrcdll_xh_chckl.o: ../../src/xrc/xh_chckl.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< @@ -404,6 +409,9 @@ $(OBJS)\xrclib_xh_cald.o: ../../src/xrc/xh_cald.cpp $(OBJS)\xrclib_xh_chckb.o: ../../src/xrc/xh_chckb.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< +$(OBJS)\xrclib_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\xrclib_xh_chckl.o: ../../src/xrc/xh_chckl.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< diff --git a/contrib/build/xrc/makefile.wat b/contrib/build/xrc/makefile.wat index 1ead6deb4c..5f3a7f4019 100644 --- a/contrib/build/xrc/makefile.wat +++ b/contrib/build/xrc/makefile.wat @@ -211,6 +211,7 @@ XRCDLL_OBJECTS = & $(OBJS)\xrcdll_xh_bttn.obj & $(OBJS)\xrcdll_xh_cald.obj & $(OBJS)\xrcdll_xh_chckb.obj & + $(OBJS)\xrcdll_xh_tglbtn.obj & $(OBJS)\xrcdll_xh_chckl.obj & $(OBJS)\xrcdll_xh_choic.obj & $(OBJS)\xrcdll_xh_combo.obj & @@ -257,6 +258,7 @@ XRCLIB_OBJECTS = & $(OBJS)\xrclib_xh_bttn.obj & $(OBJS)\xrclib_xh_cald.obj & $(OBJS)\xrclib_xh_chckb.obj & + $(OBJS)\xrclib_xh_tglbtn.obj & $(OBJS)\xrclib_xh_chckl.obj & $(OBJS)\xrclib_xh_choic.obj & $(OBJS)\xrclib_xh_combo.obj & @@ -351,6 +353,9 @@ $(OBJS)\xrcdll_xh_cald.obj : .AUTODEPEND ../../src/xrc\xh_cald.cpp $(OBJS)\xrcdll_xh_chckb.obj : .AUTODEPEND ../../src/xrc\xh_chckb.cpp $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< +$(OBJS)\xrcdll_xh_tglbtn.obj : .AUTODEPEND ../../src/xrc\xh_tglbtn.cpp + $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + $(OBJS)\xrcdll_xh_chckl.obj : .AUTODEPEND ../../src/xrc\xh_chckl.cpp $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< @@ -468,6 +473,9 @@ $(OBJS)\xrclib_xh_cald.obj : .AUTODEPEND ../../src/xrc\xh_cald.cpp $(OBJS)\xrclib_xh_chckb.obj : .AUTODEPEND ../../src/xrc\xh_chckb.cpp $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< +$(OBJS)\xrclib_xh_tglbtn.obj : .AUTODEPEND ../../src/xrc\xh_tglbtn.cpp + $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\xrclib_xh_chckl.obj : .AUTODEPEND ../../src/xrc\xh_chckl.cpp $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< diff --git a/contrib/build/xrc/xrc.dsp b/contrib/build/xrc/xrc.dsp index b4e23330fd..11d210f579 100644 --- a/contrib/build/xrc/xrc.dsp +++ b/contrib/build/xrc/xrc.dsp @@ -478,10 +478,6 @@ SOURCE=../../src/xrc\xh_chckb.cpp # End Source File # Begin Source File -SOURCE=../../src/xrc\xh_tglbtn.cpp -# End Source File -# Begin Source File - SOURCE=../../src/xrc\xh_chckl.cpp # End Source File # Begin Source File @@ -590,6 +586,10 @@ SOURCE=../../src/xrc\xh_text.cpp # End Source File # Begin Source File +SOURCE=../../src/xrc\xh_tglbtn.cpp +# End Source File +# Begin Source File + SOURCE=../../src/xrc\xh_toolb.cpp # End Source File # Begin Source File diff --git a/contrib/src/xrc/Makefile.in b/contrib/src/xrc/Makefile.in index d8a24020d8..c45636c2a4 100644 --- a/contrib/src/xrc/Makefile.in +++ b/contrib/src/xrc/Makefile.in @@ -60,6 +60,7 @@ XRCDLL_OBJECTS = \ xrcdll_xh_bttn.o \ xrcdll_xh_cald.o \ xrcdll_xh_chckb.o \ + xrcdll_xh_tglbtn.o \ xrcdll_xh_chckl.o \ xrcdll_xh_choic.o \ xrcdll_xh_combo.o \ @@ -103,6 +104,7 @@ XRCLIB_OBJECTS = \ xrclib_xh_bttn.o \ xrclib_xh_cald.o \ xrclib_xh_chckb.o \ + xrclib_xh_tglbtn.o \ xrclib_xh_chckl.o \ xrclib_xh_choic.o \ xrclib_xh_combo.o \ @@ -259,7 +261,7 @@ all: $(__xrcdll___depname) $(__xrclib___depname) install: all $(__install_xrcdll___depname) $(__install_xrclib___depname) $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5 - for f in wx/xrc/xmlres.h wx/xrc/xh_all.h wx/xrc/xh_bmp.h wx/xrc/xh_bmpbt.h wx/xrc/xh_bttn.h wx/xrc/xh_cald.h wx/xrc/xh_chckb.h wx/xrc/xh_chckl.h wx/xrc/xh_choic.h wx/xrc/xh_combo.h wx/xrc/xh_dlg.h wx/xrc/xh_frame.h wx/xrc/xh_gauge.h wx/xrc/xh_gdctl.h wx/xrc/xh_html.h wx/xrc/xh_listb.h wx/xrc/xh_listc.h wx/xrc/xh_menu.h wx/xrc/xh_notbk.h wx/xrc/xh_panel.h wx/xrc/xh_radbt.h wx/xrc/xh_radbx.h wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_sizer.h wx/xrc/xh_slidr.h wx/xrc/xh_spin.h wx/xrc/xh_split.h wx/xrc/xh_statbar.h wx/xrc/xh_stbmp.h wx/xrc/xh_stbox.h wx/xrc/xh_stlin.h wx/xrc/xh_sttxt.h wx/xrc/xh_text.h wx/xrc/xh_toolb.h wx/xrc/xh_tree.h wx/xrc/xh_unkwn.h wx/xrc/xh_wizrd.h; do \ + for f in wx/xrc/xmlres.h wx/xrc/xh_all.h wx/xrc/xh_bmp.h wx/xrc/xh_bmpbt.h wx/xrc/xh_bttn.h wx/xrc/xh_cald.h wx/xrc/xh_chckb.h wx/xrc/xh_tglbtn.h wx/xrc/xh_chckl.h wx/xrc/xh_choic.h wx/xrc/xh_combo.h wx/xrc/xh_dlg.h wx/xrc/xh_frame.h wx/xrc/xh_gauge.h wx/xrc/xh_gdctl.h wx/xrc/xh_html.h wx/xrc/xh_listb.h wx/xrc/xh_listc.h wx/xrc/xh_menu.h wx/xrc/xh_notbk.h wx/xrc/xh_panel.h wx/xrc/xh_radbt.h wx/xrc/xh_radbx.h wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_sizer.h wx/xrc/xh_slidr.h wx/xrc/xh_spin.h wx/xrc/xh_split.h wx/xrc/xh_statbar.h wx/xrc/xh_stbmp.h wx/xrc/xh_stbox.h wx/xrc/xh_stlin.h wx/xrc/xh_sttxt.h wx/xrc/xh_text.h wx/xrc/xh_toolb.h wx/xrc/xh_tree.h wx/xrc/xh_unkwn.h wx/xrc/xh_wizrd.h; do \ if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \ fi; \ @@ -326,6 +328,9 @@ xrcdll_xh_cald.o: $(srcdir)/xh_cald.cpp $(XRCDLL_ODEP) xrcdll_xh_chckb.o: $(srcdir)/xh_chckb.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< +xrcdll_xh_tglbtn.o: $(srcdir)/xh_tglbtn.cpp $(XRCDLL_ODEP) + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + xrcdll_xh_chckl.o: $(srcdir)/xh_chckl.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< @@ -440,6 +445,9 @@ xrclib_xh_cald.o: $(srcdir)/xh_cald.cpp $(XRCLIB_ODEP) xrclib_xh_chckb.o: $(srcdir)/xh_chckb.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< +xrclib_xh_tglbtn.o: $(srcdir)/xh_tglbtn.cpp $(XRCLIB_ODEP) + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + xrclib_xh_chckl.o: $(srcdir)/xh_chckl.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< diff --git a/src/xrc/Makefile.in b/src/xrc/Makefile.in index d8a24020d8..c45636c2a4 100644 --- a/src/xrc/Makefile.in +++ b/src/xrc/Makefile.in @@ -60,6 +60,7 @@ XRCDLL_OBJECTS = \ xrcdll_xh_bttn.o \ xrcdll_xh_cald.o \ xrcdll_xh_chckb.o \ + xrcdll_xh_tglbtn.o \ xrcdll_xh_chckl.o \ xrcdll_xh_choic.o \ xrcdll_xh_combo.o \ @@ -103,6 +104,7 @@ XRCLIB_OBJECTS = \ xrclib_xh_bttn.o \ xrclib_xh_cald.o \ xrclib_xh_chckb.o \ + xrclib_xh_tglbtn.o \ xrclib_xh_chckl.o \ xrclib_xh_choic.o \ xrclib_xh_combo.o \ @@ -259,7 +261,7 @@ all: $(__xrcdll___depname) $(__xrclib___depname) install: all $(__install_xrcdll___depname) $(__install_xrclib___depname) $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5 - for f in wx/xrc/xmlres.h wx/xrc/xh_all.h wx/xrc/xh_bmp.h wx/xrc/xh_bmpbt.h wx/xrc/xh_bttn.h wx/xrc/xh_cald.h wx/xrc/xh_chckb.h wx/xrc/xh_chckl.h wx/xrc/xh_choic.h wx/xrc/xh_combo.h wx/xrc/xh_dlg.h wx/xrc/xh_frame.h wx/xrc/xh_gauge.h wx/xrc/xh_gdctl.h wx/xrc/xh_html.h wx/xrc/xh_listb.h wx/xrc/xh_listc.h wx/xrc/xh_menu.h wx/xrc/xh_notbk.h wx/xrc/xh_panel.h wx/xrc/xh_radbt.h wx/xrc/xh_radbx.h wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_sizer.h wx/xrc/xh_slidr.h wx/xrc/xh_spin.h wx/xrc/xh_split.h wx/xrc/xh_statbar.h wx/xrc/xh_stbmp.h wx/xrc/xh_stbox.h wx/xrc/xh_stlin.h wx/xrc/xh_sttxt.h wx/xrc/xh_text.h wx/xrc/xh_toolb.h wx/xrc/xh_tree.h wx/xrc/xh_unkwn.h wx/xrc/xh_wizrd.h; do \ + for f in wx/xrc/xmlres.h wx/xrc/xh_all.h wx/xrc/xh_bmp.h wx/xrc/xh_bmpbt.h wx/xrc/xh_bttn.h wx/xrc/xh_cald.h wx/xrc/xh_chckb.h wx/xrc/xh_tglbtn.h wx/xrc/xh_chckl.h wx/xrc/xh_choic.h wx/xrc/xh_combo.h wx/xrc/xh_dlg.h wx/xrc/xh_frame.h wx/xrc/xh_gauge.h wx/xrc/xh_gdctl.h wx/xrc/xh_html.h wx/xrc/xh_listb.h wx/xrc/xh_listc.h wx/xrc/xh_menu.h wx/xrc/xh_notbk.h wx/xrc/xh_panel.h wx/xrc/xh_radbt.h wx/xrc/xh_radbx.h wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_sizer.h wx/xrc/xh_slidr.h wx/xrc/xh_spin.h wx/xrc/xh_split.h wx/xrc/xh_statbar.h wx/xrc/xh_stbmp.h wx/xrc/xh_stbox.h wx/xrc/xh_stlin.h wx/xrc/xh_sttxt.h wx/xrc/xh_text.h wx/xrc/xh_toolb.h wx/xrc/xh_tree.h wx/xrc/xh_unkwn.h wx/xrc/xh_wizrd.h; do \ if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \ fi; \ @@ -326,6 +328,9 @@ xrcdll_xh_cald.o: $(srcdir)/xh_cald.cpp $(XRCDLL_ODEP) xrcdll_xh_chckb.o: $(srcdir)/xh_chckb.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< +xrcdll_xh_tglbtn.o: $(srcdir)/xh_tglbtn.cpp $(XRCDLL_ODEP) + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + xrcdll_xh_chckl.o: $(srcdir)/xh_chckl.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< @@ -440,6 +445,9 @@ xrclib_xh_cald.o: $(srcdir)/xh_cald.cpp $(XRCLIB_ODEP) xrclib_xh_chckb.o: $(srcdir)/xh_chckb.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< +xrclib_xh_tglbtn.o: $(srcdir)/xh_tglbtn.cpp $(XRCLIB_ODEP) + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + xrclib_xh_chckl.o: $(srcdir)/xh_chckl.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<