X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..422d0ff0bec79832494fe4605ffdcf8e87ba6c03:/src/gtk/button.cpp

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 5f2aa87a80..d42f359e19 100644
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -108,7 +108,11 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     wxControl::SetLabel( label );
 */
 
+#ifdef __WXGTK20__
+    m_widget = gtk_button_new_with_mnemonic("");
+#else
     m_widget = gtk_button_new_with_label("");
+#endif
 
     float x_alignment = 0.5;
     if (HasFlag(wxBU_LEFT))
@@ -167,7 +171,7 @@ void wxButton::SetLabel( const wxString &label )
 
 #ifdef __WXGTK20__
     wxString label2 = PrepareLabelMnemonics( label );
-    gtk_label_set_text_with_mnemonic( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( label2 ) );
+    gtk_button_set_label( GTK_BUTTON(m_widget), wxGTK_CONV(label2) );
 #else
     gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( GetLabel() ) );
 #endif
@@ -192,11 +196,10 @@ bool wxButton::IsOwnGtkWindow( GdkWindow *window )
 #endif
 }
 
-void wxButton::ApplyWidgetStyle()
+void wxButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
-    gtk_widget_set_style( BUTTON_CHILD(m_widget), m_widgetStyle );
+    gtk_widget_modify_style(m_widget, style);
+    gtk_widget_modify_style(BUTTON_CHILD(m_widget), style);
 }
 
 wxSize wxButton::DoGetBestSize() const
@@ -229,6 +232,7 @@ wxSize wxButton::DoGetBestSize() const
         if (ret.x < 80) ret.x = 80;
     }
 
+    CacheBestSize(ret);
     return ret;
 }