use wxToggleButtonXmlHandler::DoCreateBitmapToggleButton on supoorted platforms only

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

diff --git a/include/wx/xrc/xh_tglbtn.h b/include/wx/xrc/xh_tglbtn.h
index 63e185865c4e05bdf5751a8cb3aeb09b7f47512a..7ab58cfab31d074851f80489cc68fb7a3dac41e4 100644 (file)
--- a/include/wx/xrc/xh_tglbtn.h
+++ b/include/wx/xrc/xh_tglbtn.h
@@ -26,7 +26,9 @@ public:
 
 protected:
     virtual void DoCreateToggleButton(wxObject *control);
+#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !defined(__WXPALMOS__) && !defined(__WXPM__) && !(defined(__WXGTK__) && !defined(__WXGTK20__))
     virtual void DoCreateBitmapToggleButton(wxObject *control);
+#endif
 };
 
 #endif // wxUSE_XRC && wxUSE_TOGGLEBTN

diff --git a/src/xrc/xh_tglbtn.cpp b/src/xrc/xh_tglbtn.cpp
index 30def16e253e7426f3fcbe70713ac3d2e4a869f0..1607b0f4efacfb7326fe97b89549c8a9434f60ed 100644 (file)
--- a/src/xrc/xh_tglbtn.cpp
+++ b/src/xrc/xh_tglbtn.cpp
@@ -36,7 +36,7 @@ wxObject *wxToggleButtonXmlHandler::DoCreateResource()
 
    wxObject *control = m_instance;
 
-#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !defined(__WXPALMOS__) && !defined(__WXPM__)
+#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !defined(__WXPALMOS__) && !defined(__WXPM__) && !(defined(__WXGTK__) && !defined(__WXGTK20__))
 
     if (m_class == wxT("wxBitmapToggleButton"))
     {
@@ -88,6 +88,7 @@ void wxToggleButtonXmlHandler::DoCreateToggleButton(wxObject *control)
     button->SetValue(GetBool( wxT("checked")));
 }
 
+#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !defined(__WXPALMOS__) && !defined(__WXPM__) && !(defined(__WXGTK__) && !defined(__WXGTK20__))
 void wxToggleButtonXmlHandler::DoCreateBitmapToggleButton(wxObject *control)
 {
     wxBitmapToggleButton *button = wxDynamicCast(control, wxBitmapToggleButton);
@@ -102,5 +103,5 @@ void wxToggleButtonXmlHandler::DoCreateBitmapToggleButton(wxObject *control)
 
     button->SetValue(GetBool( wxT("checked")));
 }
-
+#endif
 #endif // wxUSE_XRC && wxUSE_TOGGLEBTN