X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97149f189837c4a5e3220e9d979386ae3a264881..8de5b24e54bd7fec2a9e2011b2402b3f33117bd7:/src/gtk1/button.cpp diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp index 177356a071..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)) @@ -135,19 +139,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, m_parent->DoAddChild( this ); - PostCreation(); - InheritAttributes(); - - wxSize best_size( DoGetBestSize() ); - wxSize new_size( size ); - if (new_size.x == -1) - new_size.x = best_size.x; - if (new_size.y == -1) - new_size.y = best_size.y; - if ((new_size.x != size.x) || (new_size.y != size.y)) - SetSize( new_size.x, new_size.y ); - - SetSize( new_size ); + PostCreation(size); return TRUE; } @@ -157,7 +149,7 @@ void wxButton::SetDefault() wxWindow *parent = GetParent(); wxCHECK_RET( parent, _T("button without parent?") ); - wxWindow *winOldDefault = parent->SetDefaultItem(this); + parent->SetDefaultItem(this); GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT ); gtk_widget_grab_default( m_widget ); @@ -179,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 @@ -204,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 @@ -244,5 +235,12 @@ wxSize wxButton::DoGetBestSize() const return ret; } +// static +wxVisualAttributes +wxButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_button_new); +} + #endif // wxUSE_BUTTON