Reset previous sort column in generic wxDataViewColumn::SetSortOrder().

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

diff --git a/src/xrc/xh_tglbtn.cpp b/src/xrc/xh_tglbtn.cpp
index 30def16e253e7426f3fcbe70713ac3d2e4a869f0..62cb16edb1dcaac980d6c9efb4b1772e7af5aacb 100644 (file)
--- a/src/xrc/xh_tglbtn.cpp
+++ b/src/xrc/xh_tglbtn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_tglbtn.cpp
+// Name:        src/xrc/xh_tglbtn.cpp

 // Purpose:     XRC resource for wxToggleButton
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // Purpose:     XRC resource for wxToggleButton
 // Author:      Bob Mitchell
 // Created:     2000/03/21


@@ -36,7 +36,7 @@ wxObject *wxToggleButtonXmlHandler::DoCreateResource()
 
    wxObject *control = m_instance;
 
 
    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"))
     {
 
     if (m_class == wxT("wxBitmapToggleButton"))
     {


@@ -71,15 +71,9 @@ void wxToggleButtonXmlHandler::DoCreateToggleButton(wxObject *control)
 {
     wxToggleButton *button = wxDynamicCast(control, wxToggleButton);
 
 {
     wxToggleButton *button = wxDynamicCast(control, wxToggleButton);
 

-    wxString label = GetText(wxT("label"));
-

     button->Create(m_parentAsWindow,
                    GetID(),
     button->Create(m_parentAsWindow,
                    GetID(),

-#if defined(__WXUNIVERSAL__)
-                   !label.empty() ? label : GetBitmap(wxT("bitmap"), wxART_BUTTON),
-#else
-                   label,
-#endif
+                   GetText(wxT("label")),

                    GetPosition(), GetSize(),
                    GetStyle(),
                    wxDefaultValidator,
                    GetPosition(), GetSize(),
                    GetStyle(),
                    wxDefaultValidator,


@@ -88,6 +82,7 @@ void wxToggleButtonXmlHandler::DoCreateToggleButton(wxObject *control)
     button->SetValue(GetBool( wxT("checked")));
 }
 
     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);
 void wxToggleButtonXmlHandler::DoCreateBitmapToggleButton(wxObject *control)
 {
     wxBitmapToggleButton *button = wxDynamicCast(control, wxBitmapToggleButton);


@@ -102,5 +97,5 @@ void wxToggleButtonXmlHandler::DoCreateBitmapToggleButton(wxObject *control)
 
     button->SetValue(GetBool( wxT("checked")));
 }
 
     button->SetValue(GetBool( wxT("checked")));
 }

-
+#endif

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