X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2ff89d648e5b73172dc2f4aa84d2aadbdc063ec..259858fc6a55dd1f611dbec323264fdbad8b44fb:/src/gtk1/radiobox.cpp?ds=sidebyside diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp index abe3aed93d..156ca7c879 100644 --- a/src/gtk1/radiobox.cpp +++ b/src/gtk1/radiobox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/radiobox.cpp +// Name: src/gtk1/radiobox.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -18,10 +18,10 @@ #include "wx/frame.h" #include "wx/log.h" -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" #include -#include "wx/gtk/win_gtk.h" +#include "wx/gtk1/win_gtk.h" //----------------------------------------------------------------------------- // idle system @@ -385,11 +385,7 @@ wxString wxRadioBox::GetString( int n ) const GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); -#ifdef __WXGTK20__ - wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); -#else wxString str( label->label ); -#endif return str; } @@ -529,10 +525,6 @@ void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style) { gtk_widget_modify_style( m_widget, style ); -#ifdef __WXGTK20__ - gtk_widget_modify_style(GTK_FRAME(m_widget)->label_widget, style); -#endif - wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) {