fixing osx_carbon

[wxWidgets.git] / src / xrc / xh_tglbtn.cpp

diff --git a/src/xrc/xh_tglbtn.cpp b/src/xrc/xh_tglbtn.cpp
index 205f9e0d7a8d07bc5179894e73ea39301a387a06..62cb16edb1dcaac980d6c9efb4b1772e7af5aacb 100644 (file)
--- a/src/xrc/xh_tglbtn.cpp
+++ b/src/xrc/xh_tglbtn.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_tglbtn.cpp
-// Purpose:     XRC resource for wxCheckBox
+// Name:        src/xrc/xh_tglbtn.cpp
+// Purpose:     XRC resource for wxToggleButton

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$


@@ -19,36 +19,83 @@
 
 #include "wx/xrc/xh_tglbtn.h"
 #include "wx/tglbtn.h"
 
 #include "wx/xrc/xh_tglbtn.h"
 #include "wx/tglbtn.h"

+#include "wx/button.h" // solely for wxBU_EXACTFIT

 
 IMPLEMENT_DYNAMIC_CLASS(wxToggleButtonXmlHandler, wxXmlResourceHandler)
 
 wxToggleButtonXmlHandler::wxToggleButtonXmlHandler()
 
 IMPLEMENT_DYNAMIC_CLASS(wxToggleButtonXmlHandler, wxXmlResourceHandler)
 
 wxToggleButtonXmlHandler::wxToggleButtonXmlHandler()

-: wxXmlResourceHandler()
+    : wxXmlResourceHandler()

 {
 {

+    XRC_ADD_STYLE(wxBU_EXACTFIT);
+

     AddWindowStyles();
 }
 
 wxObject *wxToggleButtonXmlHandler::DoCreateResource()
 {
     AddWindowStyles();
 }
 
 wxObject *wxToggleButtonXmlHandler::DoCreateResource()
 {

-    XRC_MAKE_INSTANCE(control, wxToggleButton)

 
 

-    control->Create(m_parentAsWindow,
-                    GetID(),
-                    GetText(wxT("label")),
-                    GetPosition(), GetSize(),
-                    GetStyle(),
-                    wxDefaultValidator,
-                    GetName());
+   wxObject *control = m_instance;
+
+#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !defined(__WXPALMOS__) && !defined(__WXPM__) && !(defined(__WXGTK__) && !defined(__WXGTK20__))
+
+    if (m_class == wxT("wxBitmapToggleButton"))
+    {
+       if (!control)
+           control = new wxBitmapToggleButton;
+
+        DoCreateBitmapToggleButton(control);
+    }
+    else
+#endif
+    {
+       if (!control)
+           control = new wxToggleButton;
+
+        DoCreateToggleButton(control);
+    }

 
 

-    control->SetValue(GetBool( wxT("checked")));
-    SetupWindow(control);
+    SetupWindow(wxDynamicCast(control, wxWindow));

 
     return control;
 }
 
 bool wxToggleButtonXmlHandler::CanHandle(wxXmlNode *node)
 {
 
     return control;
 }
 
 bool wxToggleButtonXmlHandler::CanHandle(wxXmlNode *node)
 {

-    return IsOfClass(node, wxT("wxToggleButton"));
+    return (
+               IsOfClass(node, wxT("wxToggleButton")) ||
+               IsOfClass(node, wxT("wxBitmapToggleButton"))
+           );
+}
+
+void wxToggleButtonXmlHandler::DoCreateToggleButton(wxObject *control)
+{
+    wxToggleButton *button = wxDynamicCast(control, wxToggleButton);
+
+    button->Create(m_parentAsWindow,
+                   GetID(),
+                   GetText(wxT("label")),
+                   GetPosition(), GetSize(),
+                   GetStyle(),
+                   wxDefaultValidator,
+                   GetName());
+
+    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);
+
+    button->Create(m_parentAsWindow,
+                   GetID(),
+                   GetBitmap(wxT("bitmap"), wxART_BUTTON),
+                   GetPosition(), GetSize(),
+                   GetStyle(),
+                   wxDefaultValidator,
+                   GetName());
+
+    button->SetValue(GetBool( wxT("checked")));
+}
+#endif

 #endif // wxUSE_XRC && wxUSE_TOGGLEBTN
 #endif // wxUSE_XRC && wxUSE_TOGGLEBTN