X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8e24dfa9322702d56a125586a7d4a37f4a5dfd7..1ab608ee00f21fa3164e1838395783a86fac82d7:/src/gtk/checkbox.cpp diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp index 2a7d0437bf..1c64e26ba1 100644 --- a/src/gtk/checkbox.cpp +++ b/src/gtk/checkbox.cpp @@ -120,19 +120,7 @@ bool wxCheckBox::Create(wxWindow *parent, m_parent->DoAddChild( this ); - PostCreation(); - InheritAttributes(); - - wxSize size_best( DoGetBestSize() ); - wxSize new_size( size ); - if (new_size.x == -1) - new_size.x = size_best.x; - if (new_size.y == -1) - new_size.y = size_best.y; - if ((new_size.x != size.x) || (new_size.y != size.y)) - SetSize( new_size.x, new_size.y ); - - Show( TRUE ); + PostCreation(size); return TRUE; } @@ -182,11 +170,10 @@ bool wxCheckBox::Enable( bool enable ) return TRUE; } -void wxCheckBox::ApplyWidgetStyle() +void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style) { - SetWidgetStyle(); - gtk_widget_set_style( m_widgetCheckbox, m_widgetStyle ); - gtk_widget_set_style( m_widgetLabel, m_widgetStyle ); + gtk_widget_modify_style(m_widgetCheckbox, style); + gtk_widget_modify_style(m_widgetLabel, style); } bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window ) @@ -228,4 +215,11 @@ wxSize wxCheckBox::DoGetBestSize() const return wxControl::DoGetBestSize(); } +// static +wxVisualAttributes +wxCheckBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_check_button_new); +} + #endif