Added wxToggleButton handler

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/build/xrc/makefile.vc b/contrib/build/xrc/makefile.vc
index 382ab9d4801df08a7911674e23c22b67ffda1ac4..c6ef9e98b2199939537c3265a82a441a50155ba7 100644 (file)
--- 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_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 \
        $(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_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 \
        $(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_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) $**
 
 $(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_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) $**
 
 $(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 6a2022558f96a5e57e31f235eb9761b32c44a651..c89fe0ec776e9d36bbfbe4d260cc4ef660ff3786 100644 (file)
--- 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_bttn.cpp
         xh_cald.cpp
         xh_chckb.cpp

+        xh_tglbtn.cpp

         xh_chckl.cpp
         xh_choic.cpp
         xh_combo.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_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_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 8e43ad29d5e23763eae40edfcfdd474f3c3f28a9..b4e23330fdee6c215480a69c25550afb1bf8476c 100644 (file)
--- 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
 
 # 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
 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 fc1d82c439e74122f67d3adebd12f2f81411deb2..b807675abc3eefc8de5d94135d4e943212349fd9 100644 (file)
--- 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_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"
 #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 5c26749d931e8eb32ec8335d21e97c06f44ac3bd..44c417dc513e9c0217108b56317a217b841a710f 100644 (file)
--- 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_CHECKBOX
     AddHandler(new wxCheckBoxXmlHandler);
 #endif

+#if wxUSE_TOGGLEBTN
+    AddHandler(new wxToggleButtonXmlHandler);
+#endif

 #if wxUSE_HTML
     AddHandler(new wxHtmlWindowXmlHandler);
 #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 fc1d82c439e74122f67d3adebd12f2f81411deb2..b807675abc3eefc8de5d94135d4e943212349fd9 100644 (file)
--- 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_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"
 #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 5c26749d931e8eb32ec8335d21e97c06f44ac3bd..44c417dc513e9c0217108b56317a217b841a710f 100644 (file)
--- 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_CHECKBOX
     AddHandler(new wxCheckBoxXmlHandler);
 #endif

+#if wxUSE_TOGGLEBTN
+    AddHandler(new wxToggleButtonXmlHandler);
+#endif

 #if wxUSE_HTML
     AddHandler(new wxHtmlWindowXmlHandler);
 #endif
 #if wxUSE_HTML
     AddHandler(new wxHtmlWindowXmlHandler);
 #endif