X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e71aec80fd2c0d55067dd726ad1abbf5c102e168..4776c0b783a9776f94b049aecdc253d379686b6b:/src/gtk/button.cpp diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp index 2ce3e1d0a1..88e29ac4f3 100644 --- a/src/gtk/button.cpp +++ b/src/gtk/button.cpp @@ -266,17 +266,13 @@ void wxButton::SetLabel( const wxString &lbl ) bool wxButton::Enable( bool enable ) { - bool isEnabled = IsEnabled(); - - if ( !wxControl::Enable( enable ) ) + if (!base_type::Enable(enable)) return false; gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable); - if (!isEnabled && enable) - { + if (enable) GTKFixSensitivity(); - } GTKUpdateBitmap(); @@ -668,6 +664,7 @@ void wxButton::DoSetBitmapPosition(wxDirection dir) } gtk_button_set_image_position(GTK_BUTTON(m_widget), gtkpos); + InvalidateBestSize(); } #endif // GTK+ 2.10+ }