X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4ca49cde3c56f0f7b249fc62925df3d99ab3c58..8de5b24e54bd7fec2a9e2011b2402b3f33117bd7:/src/gtk/radiobox.cpp diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index 551fc826aa..ea1eee5230 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -246,16 +246,10 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, bool wasShown = IsShown(); if ( wasShown ) Hide(); // prevent PostCreation() from showing us - PostCreation(); - InheritAttributes(); - - ApplyWidgetStyle(); SetLabel( title ); - SetFont( parent->GetFont() ); - - SetBestSize( size ); + PostCreation(size); if ( wasShown ) Show(); @@ -687,19 +681,17 @@ void wxRadioBox::GtkEnableEvents() } } -void wxRadioBox::ApplyWidgetStyle() +void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style) { - SetWidgetStyle(); - - gtk_widget_set_style( m_widget, m_widgetStyle ); + gtk_widget_modify_style( m_widget, style ); wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { GtkWidget *widget = GTK_WIDGET( node->GetData() ); - gtk_widget_set_style( widget, m_widgetStyle ); - gtk_widget_set_style( BUTTON_CHILD(node->GetData()), m_widgetStyle ); + gtk_widget_modify_style( widget, style ); + gtk_widget_modify_style( BUTTON_CHILD(node->GetData()), style ); node = node->GetNext(); } @@ -758,5 +750,16 @@ void wxRadioBox::OnInternalIdle() } } +// static +wxVisualAttributes +wxRadioBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + wxVisualAttributes attr; + GtkWidget* widget = gtk_radio_button_new_with_label(NULL, ""); + attr = GetDefaultAttributesFromGTKWidget(widget); + gtk_widget_destroy(widget); + return attr; +} + #endif // wxUSE_RADIOBOX