Fixed some probs in wxRadioBox

[wxWidgets.git] / src / gtk / tglbtn.cpp

diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp
index e6ca7ff17cc954a43b96e1f4f424a388acaee947..d6f4d5881f7c6d62c47c16231e0b73e1f7168b7c 100644 (file)
--- a/src/gtk/tglbtn.cpp
+++ b/src/gtk/tglbtn.cpp
@@ -10,6 +10,9 @@
 // License:     Rocketeer license
 /////////////////////////////////////////////////////////////////////////////
 
 // License:     Rocketeer license
 /////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/tglbtn.h"
 #include "wx/button.h"
 
 #include "wx/tglbtn.h"
 #include "wx/button.h"
 


@@ -63,7 +66,7 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
    wxControl::SetLabel(label);
 
    // Create the gtk widget.
    wxControl::SetLabel(label);
 
    // Create the gtk widget.

-   m_widget = gtk_toggle_button_new_with_label(m_label.mbc_str());
+   m_widget = gtk_toggle_button_new_with_label( wxGTK_CONV( m_label ) );

 
    gtk_signal_connect(GTK_OBJECT(m_widget), "clicked",
                       GTK_SIGNAL_FUNC(gtk_togglebutton_clicked_callback),
 
    gtk_signal_connect(GTK_OBJECT(m_widget), "clicked",
                       GTK_SIGNAL_FUNC(gtk_togglebutton_clicked_callback),


@@ -72,8 +75,7 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
    m_parent->DoAddChild(this);
 
    PostCreation();
    m_parent->DoAddChild(this);
 
    PostCreation();

-
-   SetFont(parent->GetFont());
+   InheritAttributes();

 
    wxSize size_best(DoGetBestSize());
    wxSize new_size(size);
 
    wxSize size_best(DoGetBestSize());
    wxSize new_size(size);


@@ -84,9 +86,6 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
    if ((new_size.x != size.x) || (new_size.y != size.y))
       SetSize(new_size.x, new_size.y);
 
    if ((new_size.x != size.x) || (new_size.y != size.y))
       SetSize(new_size.x, new_size.y);
 

-   SetBackgroundColour(parent->GetBackgroundColour());
-   SetForegroundColour(parent->GetForegroundColour());
-

    Show(TRUE);
 
    return TRUE;
    Show(TRUE);
 
    return TRUE;


@@ -123,7 +122,7 @@ void wxToggleButton::SetLabel(const wxString& label)
 
     wxControl::SetLabel(label);
 
 
     wxControl::SetLabel(label);
 

-    gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), GetLabel().mbc_str());
+    gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV( GetLabel() ) );

 }
 
 bool wxToggleButton::Enable(bool enable /*=TRUE*/)
 }
 
 bool wxToggleButton::Enable(bool enable /*=TRUE*/)


@@ -166,7 +165,8 @@ void wxToggleButton::OnInternalIdle()
         gdk_window_set_cursor(win, cursor.GetCursor());
     }
 
         gdk_window_set_cursor(win, cursor.GetCursor());
     }
 

-    UpdateWindowUI();
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);

 }
 
 // wxSize DoGetBestSize() const
 }
 
 // wxSize DoGetBestSize() const