X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27c78e4552aaefac9a4db0d4453eff09cdfef2ad..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/gtk1/radiobox.cpp

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index f4bc5fed50..f969e6e4d1 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$
@@ -14,14 +14,16 @@
 
 #include "wx/radiobox.h"
 
-#include "wx/dialog.h"
-#include "wx/frame.h"
-#include "wx/log.h"
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/frame.h"
+    #include "wx/dialog.h"
+#endif
 
-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"
 #include <gdk/gdkkeysyms.h>
 
-#include "wx/gtk/win_gtk.h"
+#include "wx/gtk1/win_gtk.h"
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -198,15 +200,16 @@ 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
     SetMajorDim(majorDim == 0 ? n : majorDim, style);
 
 
-    int num_of_cols = GetColumnCount();
-    int num_of_rows = GetRowCount();
+    unsigned int num_of_cols = GetColumnCount();
+    unsigned int num_of_rows = GetRowCount();
 
     GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
 
@@ -273,8 +276,6 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
     m_parent->DoAddChild( this );
 
-    SetLabel( title );
-
     PostCreation(size);
 
     return true;
@@ -291,7 +292,7 @@ wxRadioBox::~wxRadioBox()
     }
 }
 
-bool wxRadioBox::Show( bool show )
+bool wxRadioBox::Show(bool show)
 {
     wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
@@ -376,7 +377,7 @@ int wxRadioBox::GetSelection(void) const
     return wxNOT_FOUND;
 }
 
-wxString wxRadioBox::GetString( int n ) const
+wxString wxRadioBox::GetString(unsigned int n) const
 {
     wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") );
 
@@ -386,11 +387,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;
 }
@@ -399,12 +396,10 @@ 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 )
+void wxRadioBox::SetString(unsigned int item, const wxString& label)
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
@@ -436,7 +431,7 @@ bool wxRadioBox::Enable( bool enable )
     return true;
 }
 
-bool wxRadioBox::Enable( int item, bool enable )
+bool wxRadioBox::Enable(unsigned int item, bool enable)
 {
     wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
@@ -453,7 +448,7 @@ bool wxRadioBox::Enable( int item, bool enable )
     return true;
 }
 
-bool wxRadioBox::IsItemEnabled(int item) const
+bool wxRadioBox::IsItemEnabled(unsigned int item) const
 {
     wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
@@ -468,7 +463,7 @@ bool wxRadioBox::IsItemEnabled(int item) const
     return GTK_WIDGET_SENSITIVE(GTK_WIDGET(button));
 }
 
-bool wxRadioBox::Show( int item, bool show )
+bool wxRadioBox::Show(unsigned int item, bool show)
 {
     wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
@@ -486,7 +481,7 @@ bool wxRadioBox::Show( int item, bool show )
     return true;
 }
 
-bool wxRadioBox::IsItemShown(int item) const
+bool wxRadioBox::IsItemShown(unsigned int item) const
 {
     wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
@@ -499,7 +494,7 @@ bool wxRadioBox::IsItemShown(int item) const
     return GTK_WIDGET_VISIBLE(GTK_WIDGET(button));
 }
 
-int wxRadioBox::GetCount() const
+unsigned int wxRadioBox::GetCount() const
 {
     return m_boxes.GetCount();
 }
@@ -532,10 +527,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)
     {