fixed labels under GTK+ 1 after recent changes (remove underscores from them again)

[wxWidgets.git] / src / gtk1 / radiobox.cpp

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index f4bc5fed50f81dcb2d58dda9530ab3b51241b68a..abe3aed93d8f038273545e9b0873e5a0c54fcdae 100644 (file)
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -198,7 +198,8 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
         return false;
     }
 
-    m_widget = gtk_frame_new( wxGTK_CONV( title ) );
+    m_widget = gtk_frame_new(NULL);
+    SetLabel(title);
 
     // majorDim may be 0 if all trailing parameters were omitted, so don't
     // assert here but just use the correct value for it
@@ -273,8 +274,6 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
     m_parent->DoAddChild( this );
 
-    SetLabel( title );
-
     PostCreation(size);
 
     return true;
@@ -399,9 +398,7 @@ void wxRadioBox::SetLabel( const wxString& label )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
-    wxControl::SetLabel( label );
-
-    gtk_frame_set_label( GTK_FRAME(m_widget), wxGTK_CONV( wxControl::GetLabel() ) );
+    GTKSetLabelForFrame(GTK_FRAME(m_widget), label);
 }
 
 void wxRadioBox::SetString( int item, const wxString& label )