X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d522606d0a1dfd22bcdc1a386b3dca01fa985e3..8de5b24e54bd7fec2a9e2011b2402b3f33117bd7:/src/gtk1/button.cpp diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp index 4638f0a6b1..d64273b780 100644 --- a/src/gtk1/button.cpp +++ b/src/gtk1/button.cpp @@ -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