From 85f138db83939ce7c59a942aaecca7fa98168db3 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 31 Aug 2004 07:53:21 +0000 Subject: [PATCH] Added wxToggleButton handler git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/build/xrc/makefile.vc | 8 ++++++++ contrib/build/xrc/xrc.bkl | 2 ++ contrib/build/xrc/xrc.dsp | 4 ++++ contrib/include/wx/xrc/xh_all.h | 1 + contrib/src/xrc/xmlrsall.cpp | 3 +++ include/wx/xrc/xh_all.h | 1 + src/xrc/xmlrsall.cpp | 3 +++ 7 files changed, 22 insertions(+) diff --git a/contrib/build/xrc/makefile.vc b/contrib/build/xrc/makefile.vc index 382ab9d480..c6ef9e98b2 100644 --- a/contrib/build/xrc/makefile.vc +++ b/contrib/build/xrc/makefile.vc @@ -33,6 +33,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 \ @@ -82,6 +83,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 \ @@ -373,6 +375,9 @@ $(OBJS)\xrcdll_xh_cald.obj: ../../src/xrc\xh_cald.cpp $(OBJS)\xrcdll_xh_chckb.obj: ../../src/xrc\xh_chckb.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** +$(OBJS)\xrcdll_xh_tglbtn.obj: ../../src/xrc\xh_tglbtn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + $(OBJS)\xrcdll_xh_chckl.obj: ../../src/xrc\xh_chckl.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** @@ -490,6 +495,9 @@ $(OBJS)\xrclib_xh_cald.obj: ../../src/xrc\xh_cald.cpp $(OBJS)\xrclib_xh_chckb.obj: ../../src/xrc\xh_chckb.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** +$(OBJS)\xrclib_xh_tglbtn.obj: ../../src/xrc\xh_tglbtn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + $(OBJS)\xrclib_xh_chckl.obj: ../../src/xrc\xh_chckl.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** diff --git a/contrib/build/xrc/xrc.bkl b/contrib/build/xrc/xrc.bkl index 6a2022558f..c89fe0ec77 100644 --- a/contrib/build/xrc/xrc.bkl +++ b/contrib/build/xrc/xrc.bkl @@ -14,6 +14,7 @@ xh_bttn.cpp xh_cald.cpp xh_chckb.cpp + xh_tglbtn.cpp xh_chckl.cpp xh_choic.cpp xh_combo.cpp @@ -57,6 +58,7 @@ 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 diff --git a/contrib/build/xrc/xrc.dsp b/contrib/build/xrc/xrc.dsp index 8e43ad29d5..b4e23330fd 100644 --- a/contrib/build/xrc/xrc.dsp +++ b/contrib/build/xrc/xrc.dsp @@ -478,6 +478,10 @@ 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 diff --git a/contrib/include/wx/xrc/xh_all.h b/contrib/include/wx/xrc/xh_all.h index fc1d82c439..b807675abc 100644 --- a/contrib/include/wx/xrc/xh_all.h +++ b/contrib/include/wx/xrc/xh_all.h @@ -19,6 +19,7 @@ #include "wx/xrc/xh_dlg.h" #include "wx/xrc/xh_bttn.h" #include "wx/xrc/xh_chckb.h" +#include "wx/xrc/xh_tglbtn.h" #include "wx/xrc/xh_gauge.h" #include "wx/xrc/xh_html.h" #include "wx/xrc/xh_spin.h" diff --git a/contrib/src/xrc/xmlrsall.cpp b/contrib/src/xrc/xmlrsall.cpp index 5c26749d93..44c417dc51 100644 --- a/contrib/src/xrc/xmlrsall.cpp +++ b/contrib/src/xrc/xmlrsall.cpp @@ -57,6 +57,9 @@ void wxXmlResource::InitAllHandlers() #if wxUSE_CHECKBOX AddHandler(new wxCheckBoxXmlHandler); #endif +#if wxUSE_TOGGLEBTN + AddHandler(new wxToggleButtonXmlHandler); +#endif #if wxUSE_HTML AddHandler(new wxHtmlWindowXmlHandler); #endif diff --git a/include/wx/xrc/xh_all.h b/include/wx/xrc/xh_all.h index fc1d82c439..b807675abc 100644 --- a/include/wx/xrc/xh_all.h +++ b/include/wx/xrc/xh_all.h @@ -19,6 +19,7 @@ #include "wx/xrc/xh_dlg.h" #include "wx/xrc/xh_bttn.h" #include "wx/xrc/xh_chckb.h" +#include "wx/xrc/xh_tglbtn.h" #include "wx/xrc/xh_gauge.h" #include "wx/xrc/xh_html.h" #include "wx/xrc/xh_spin.h" diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp index 5c26749d93..44c417dc51 100644 --- a/src/xrc/xmlrsall.cpp +++ b/src/xrc/xmlrsall.cpp @@ -57,6 +57,9 @@ void wxXmlResource::InitAllHandlers() #if wxUSE_CHECKBOX AddHandler(new wxCheckBoxXmlHandler); #endif +#if wxUSE_TOGGLEBTN + AddHandler(new wxToggleButtonXmlHandler); +#endif #if wxUSE_HTML AddHandler(new wxHtmlWindowXmlHandler); #endif -- 2.45.2