X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7fa7eaa2dc8ef4154ac4d9d739bcfb6be1669ac..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/gtk/tglbtn.cpp diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp index e6ca7ff17c..e5baaa3835 100644 --- a/src/gtk/tglbtn.cpp +++ b/src/gtk/tglbtn.cpp @@ -10,6 +10,9 @@ // License: Rocketeer license ///////////////////////////////////////////////////////////////////////////// +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.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. - 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), @@ -123,7 +126,7 @@ void wxToggleButton::SetLabel(const wxString& 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*/) @@ -166,7 +169,8 @@ void wxToggleButton::OnInternalIdle() gdk_window_set_cursor(win, cursor.GetCursor()); } - UpdateWindowUI(); + if (wxUpdateUIEvent::CanUpdate(this)) + UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } // wxSize DoGetBestSize() const