X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..d411c5d6111551b36a6d7f0a3a991e42d26d54c3:/src/gtk1/radiobox.cpp

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index b1ecb3fc79..abe3aed93d 100644
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        radiobox.cpp
+// Name:        src/gtk/radiobox.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,19 +7,20 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "radiobox.h"
-#endif
-
-#include "wx/radiobox.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_RADIOBOX
 
+#include "wx/radiobox.h"
+
 #include "wx/dialog.h"
 #include "wx/frame.h"
+#include "wx/log.h"
+
+#include "wx/gtk/private.h"
+#include <gdk/gdkkeysyms.h>
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
@@ -33,26 +34,22 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
-extern bool   g_blockEventsOnDrag;
+extern bool          g_blockEventsOnDrag;
+extern wxWindowGTK  *g_delayedFocus;
 
 //-----------------------------------------------------------------------------
 // "clicked"
 //-----------------------------------------------------------------------------
 
-static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioBox *rb )
+extern "C" {
+static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBox *rb )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     if (!rb->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    if (rb->m_alreadySent)
-    {
-        rb->m_alreadySent = FALSE;
-        return;
-    }
-
-    rb->m_alreadySent = TRUE;
+    if (!button->active) return;
 
     wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, rb->GetId() );
     event.SetInt( rb->GetSelection() );
@@ -60,6 +57,105 @@ static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRad
     event.SetEventObject( rb );
     rb->GetEventHandler()->ProcessEvent(event);
 }
+}
+
+//-----------------------------------------------------------------------------
+// "key_press_event"
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxRadioBox *rb )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if (!rb->m_hasVMT) return FALSE;
+    if (g_blockEventsOnDrag) return FALSE;
+
+    if ((gdk_event->keyval != GDK_Up) &&
+        (gdk_event->keyval != GDK_Down) &&
+        (gdk_event->keyval != GDK_Left) &&
+        (gdk_event->keyval != GDK_Right))
+    {
+        return FALSE;
+    }
+
+    wxList::compatibility_iterator node = rb->m_boxes.Find( (wxObject*) widget );
+    if (!node)
+    {
+        return FALSE;
+    }
+
+    gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
+
+    if ((gdk_event->keyval == GDK_Up) ||
+        (gdk_event->keyval == GDK_Left))
+    {
+        if (node == rb->m_boxes.GetFirst())
+            node = rb->m_boxes.GetLast();
+        else
+            node = node->GetPrevious();
+    }
+    else
+    {
+        if (node == rb->m_boxes.GetLast())
+            node = rb->m_boxes.GetFirst();
+        else
+            node = node->GetNext();
+    }
+
+    GtkWidget *button = (GtkWidget*) node->GetData();
+
+    gtk_widget_grab_focus( button );
+
+    return TRUE;
+}
+}
+
+extern "C" {
+static gint gtk_radiobutton_focus_in( GtkWidget *widget,
+                                      GdkEvent *WXUNUSED(event),
+                                      wxRadioBox *win )
+{
+    if ( win->m_lostFocus )
+    {
+        // no, we didn't really lose it
+        win->m_lostFocus = FALSE;
+    }
+    else if ( !win->m_hasFocus )
+    {
+        win->m_hasFocus = true;
+
+        wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() );
+        event.SetEventObject( win );
+
+        // never stop the signal emission, it seems to break the kbd handling
+        // inside the radiobox
+        (void)win->GetEventHandler()->ProcessEvent( event );
+    }
+
+    return FALSE;
+}
+}
+
+extern "C" {
+static gint gtk_radiobutton_focus_out( GtkWidget *widget,
+                                       GdkEvent *WXUNUSED(event),
+                                       wxRadioBox *win )
+{
+  //    wxASSERT_MSG( win->m_hasFocus, _T("got focus out without any focus in?") );
+  // Replace with a warning, else we dump core a lot!
+  //  if (!win->m_hasFocus)
+  //      wxLogWarning(_T("Radiobox got focus out without any focus in.") );
+
+    // we might have lost the focus, but may be not - it may have just gone to
+    // another button in the same radiobox, so we'll check for it in the next
+    // idle iteration (leave m_hasFocus == true for now)
+    win->m_lostFocus = true;
+
+    return FALSE;
+}
+}
 
 //-----------------------------------------------------------------------------
 // wxRadioBox
@@ -67,12 +163,26 @@ static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRad
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
 
-BEGIN_EVENT_TABLE(wxRadioBox, wxControl)
-    EVT_SIZE(wxRadioBox::OnSize)
-END_EVENT_TABLE()
+void wxRadioBox::Init()
+{
+    m_needParent = true;
+    m_acceptsFocus = true;
+
+    m_hasFocus =
+    m_lostFocus = false;
+}
 
-wxRadioBox::wxRadioBox()
+bool wxRadioBox::Create( wxWindow *parent, wxWindowID id,
+                         const wxString& title,
+                         const wxPoint &pos, const wxSize &size,
+                         const wxArrayString& choices, int majorDim,
+                         long style, const wxValidator& validator,
+                         const wxString &name )
 {
+    wxCArrayString chs(choices);
+
+    return Create( parent, id, title, pos, size, chs.GetCount(),
+                   chs.GetStrings(), majorDim, style, validator, name );
 }
 
 bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
@@ -81,23 +191,32 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
                          long style, const wxValidator& validator,
                          const wxString &name )
 {
-    m_alreadySent = FALSE;
-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
-
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
-        wxFAIL_MSG( T("wxRadioBox creation failed") );
-	return FALSE;
+        wxFAIL_MSG( wxT("wxRadioBox creation failed") );
+        return false;
     }
 
-    m_widget = gtk_frame_new( title.mbc_str() );
+    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);
 
-    m_majorDim = majorDim;
+
+    int num_of_cols = GetColumnCount();
+    int num_of_rows = GetRowCount();
 
     GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
 
+    GtkWidget *table = gtk_table_new( num_of_rows, num_of_cols, FALSE );
+    gtk_table_set_col_spacings( GTK_TABLE(table), 1 );
+    gtk_table_set_row_spacings( GTK_TABLE(table), 1 );
+    gtk_widget_show( table );
+    gtk_container_add( GTK_CONTAINER(m_widget), table );
+
     wxString label;
     GSList *radio_button_group = (GSList *) NULL;
     for (int i = 0; i < n; i++)
@@ -108,477 +227,391 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
         label.Empty();
         for ( const wxChar *pc = choices[i]; *pc; pc++ )
         {
-            if ( *pc != T('&') )
+            if ( *pc != wxT('&') )
                 label += *pc;
         }
 
-        m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, label.mbc_str() ) );
+        m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, wxGTK_CONV( label ) ) );
+        gtk_widget_show( GTK_WIDGET(m_radio) );
+
+        gtk_signal_connect( GTK_OBJECT(m_radio), "key_press_event",
+           GTK_SIGNAL_FUNC(gtk_radiobox_keypress_callback), (gpointer)this );
 
         m_boxes.Append( (wxObject*) m_radio );
 
+        if (HasFlag(wxRA_SPECIFY_COLS))
+        {
+            int left = i%num_of_cols;
+            int right = (i%num_of_cols) + 1;
+            int top = i/num_of_cols;
+            int bottom = (i/num_of_cols)+1;
+            gtk_table_attach( GTK_TABLE(table), GTK_WIDGET(m_radio), left, right, top, bottom,
+                  GTK_FILL, GTK_FILL, 1, 1 );
+        }
+        else
+        {
+            int left = i/num_of_rows;
+            int right = (i/num_of_rows) + 1;
+            int top = i%num_of_rows;
+            int bottom = (i%num_of_rows)+1;
+            gtk_table_attach( GTK_TABLE(table), GTK_WIDGET(m_radio), left, right, top, bottom,
+                  GTK_FILL, GTK_FILL, 1, 1 );
+        }
+
         ConnectWidget( GTK_WIDGET(m_radio) );
 
         if (!i) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_radio), TRUE );
 
         gtk_signal_connect( GTK_OBJECT(m_radio), "clicked",
-           GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
-
-        gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow),
-                         GTK_WIDGET(m_radio),
-                         m_x+10, m_y+10+(i*24), 10, 10 );
-    }
+            GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 
-    wxSize ls = LayoutItems();
+        gtk_signal_connect( GTK_OBJECT(m_radio), "focus_in_event",
+            GTK_SIGNAL_FUNC(gtk_radiobutton_focus_in), (gpointer)this );
 
-    wxSize newSize = size;
-    if (newSize.x == -1) newSize.x = ls.x;
-    if (newSize.y == -1) newSize.y = ls.y;
-    SetSize( newSize.x, newSize.y );
+        gtk_signal_connect( GTK_OBJECT(m_radio), "focus_out_event",
+            GTK_SIGNAL_FUNC(gtk_radiobutton_focus_out), (gpointer)this );
+    }
 
     m_parent->DoAddChild( this );
 
-    PostCreation();
-
-    SetLabel( title );
+    PostCreation(size);
 
-    SetBackgroundColour( parent->GetBackgroundColour() );
-    SetForegroundColour( parent->GetForegroundColour() );
-    SetFont( parent->GetFont() );
-
-    Show( TRUE );
-
-    return TRUE;
+    return true;
 }
 
 wxRadioBox::~wxRadioBox()
 {
-    wxNode *node = m_boxes.First();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
-        GtkWidget *button = GTK_WIDGET( node->Data() );
+        GtkWidget *button = GTK_WIDGET( node->GetData() );
         gtk_widget_destroy( button );
-        node = node->Next();
+        node = node->GetNext();
     }
 }
 
-void wxRadioBox::OnSize( wxSizeEvent &event )
-{
-    LayoutItems();
-
-    event.Skip();
-}
-
-wxSize wxRadioBox::LayoutItems()
-{
-    int x = 7;
-    int y = 15;
-
-    if ( m_majorDim == 0 )
-    {
-        // avoid dividing by 0 below
-        wxFAIL_MSG( T("dimension of radiobox should not be 0!") );
-
-        m_majorDim = 1;
-    }
-
-    int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1;
-
-    wxSize res( 0, 0 );
-
-    int num_of_cols = 0;
-    int num_of_rows = 0;
-    if (HasFlag(wxRA_SPECIFY_COLS))
-    {
-        num_of_cols = m_majorDim;
-        num_of_rows = num_per_major;
-    }
-    else
-    {
-        num_of_cols = num_per_major;
-        num_of_rows = m_majorDim;
-    }
-	
-    if ( HasFlag(wxRA_SPECIFY_COLS) ||
-         (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) )
-    {
-        for (int j = 0; j < num_of_cols; j++)
-        {
-            y = 15;
-
-            int max_len = 0;
-            wxNode *node = m_boxes.Nth( j*num_of_rows );
-            for (int i1 = 0; i1< num_of_rows; i1++)
-            {
-                GtkWidget *button = GTK_WIDGET( node->Data() );
-                GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child );
-                GdkFont *font = m_widget->style->font;
-                int len = 22+gdk_string_measure( font, label->label );
-                if (len > max_len) max_len = len;
-
-                gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y );
-                y += 22;
-
-                node = node->Next();
-                if (!node) break;
-            }
-
-            // we don't know the max_len before
-
-            node = m_boxes.Nth( j*num_of_rows );
-            for (int i2 = 0; i2< num_of_rows; i2++)
-            {
-                GtkWidget *button = GTK_WIDGET( node->Data() );
-
-                gtk_myfixed_resize( GTK_MYFIXED(m_parent->m_wxwindow), button, max_len, 20 );
-
-                node = node->Next();
-                if (!node) break;
-            }
-
-            if (y > res.y) res.y = y;
-
-            x += max_len + 2;
-        }
-
-        res.x = x+4;
-        res.y += 9;
-    }
-    else
-    {
-        int max = 0;
-
-        wxNode *node = m_boxes.First();
-        while (node)
-        {
-            GtkButton *button = GTK_BUTTON( node->Data() );
-            GtkLabel *label = GTK_LABEL( button->child );
-
-            GdkFont *font = m_widget->style->font;
-            int len = 22+gdk_string_measure( font, label->label );
-            if (len > max) max = len;
-
-            node = node->Next();
-        }
-
-        node = m_boxes.First();
-        while (node)
-        {
-            GtkWidget *button = GTK_WIDGET( node->Data() );
-
-            gtk_myfixed_set_size( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 );
-            x += max;
-
-            node = node->Next();
-        }
-        res.x = x+4;
-        res.y = 40;
-    }
-
-    return res;
-}
-
 bool wxRadioBox::Show( bool show )
 {
-    wxCHECK_MSG( m_widget != NULL, FALSE, T("invalid radiobox") );
-
-    wxWindow::Show( show );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
-    if ((m_windowStyle & wxNO_BORDER) != 0)
-        gtk_widget_hide( m_widget );
-
-    wxNode *node = m_boxes.First();
-    while (node)
+    if (!wxControl::Show(show))
     {
-        GtkWidget *button = GTK_WIDGET( node->Data() );
-
-        if (show) gtk_widget_show( button ); else gtk_widget_hide( button );
-
-        node = node->Next();
+        // nothing to do
+        return false;
     }
 
-    return TRUE;
-}
-
-int wxRadioBox::FindString( const wxString &s ) const
-{
-    wxCHECK_MSG( m_widget != NULL, -1, T("invalid radiobox") );
-
-    int count = 0;
+    if ( HasFlag(wxNO_BORDER) )
+        gtk_widget_hide( m_widget );
 
-    wxNode *node = m_boxes.First();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
-        GtkButton *button = GTK_BUTTON( node->Data() );
+        GtkWidget *button = GTK_WIDGET( node->GetData() );
 
-        GtkLabel *label = GTK_LABEL( button->child );
-        if (s == label->label) return count;
-        count++;
+        if (show)
+            gtk_widget_show( button );
+        else
+            gtk_widget_hide( button );
 
-        node = node->Next();
+        node = node->GetNext();
     }
 
-    return -1;
+    return true;
 }
 
 void wxRadioBox::SetFocus()
 {
-    wxCHECK_RET( m_widget != NULL, T("invalid radiobox") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
     if (m_boxes.GetCount() == 0) return;
 
-    wxNode *node = m_boxes.First();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
-        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
+        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );
         if (button->active)
         {
             gtk_widget_grab_focus( GTK_WIDGET(button) );
-
             return;
         }
-        node = node->Next();
+        node = node->GetNext();
     }
-
 }
 
 void wxRadioBox::SetSelection( int n )
 {
-    wxCHECK_RET( m_widget != NULL, T("invalid radiobox") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
+
+    wxList::compatibility_iterator node = m_boxes.Item( n );
 
-    wxNode *node = m_boxes.Nth( n );
+    wxCHECK_RET( node, wxT("radiobox wrong index") );
 
-    wxCHECK_RET( node, T("radiobox wrong index") );
+    GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );
 
-    GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
+    GtkDisableEvents();
 
-    DisableEvents();
-    
-    gtk_toggle_button_set_state( button, 1 );
-    
-    EnableEvents();
+    gtk_toggle_button_set_active( button, 1 );
+
+    GtkEnableEvents();
 }
 
 int wxRadioBox::GetSelection(void) const
 {
-    wxCHECK_MSG( m_widget != NULL, -1, T("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid radiobox") );
 
     int count = 0;
 
-    wxNode *node = m_boxes.First();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
-        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
+        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );
         if (button->active) return count;
         count++;
-        node = node->Next();
+        node = node->GetNext();
     }
 
-    wxFAIL_MSG( T("wxRadioBox none selected") );
+    wxFAIL_MSG( wxT("wxRadioBox none selected") );
 
-    return -1;
+    return wxNOT_FOUND;
 }
 
 wxString wxRadioBox::GetString( int n ) const
 {
-    wxCHECK_MSG( m_widget != NULL, T(""), T("invalid radiobox") );
-
-    wxNode *node = m_boxes.Nth( n );
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") );
 
-    wxCHECK_MSG( node, T(""), T("radiobox wrong index") );
+    wxList::compatibility_iterator node = m_boxes.Item( n );
 
-    GtkButton *button = GTK_BUTTON( node->Data() );
-    GtkLabel *label = GTK_LABEL( button->child );
+    wxCHECK_MSG( node, wxEmptyString, wxT("radiobox wrong index") );
 
-    return wxString( label->label );
-}
+    GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
 
-wxString wxRadioBox::GetLabel( int item ) const
-{
-    wxCHECK_MSG( m_widget != NULL, T(""), T("invalid radiobox") );
+#ifdef __WXGTK20__
+    wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
+#else
+    wxString str( label->label );
+#endif
 
-    return GetString( item );
+    return str;
 }
 
 void wxRadioBox::SetLabel( const wxString& label )
 {
-    wxCHECK_RET( m_widget != NULL, T("invalid radiobox") );
-
-    wxControl::SetLabel( label );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
-    gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel().mbc_str() );
+    GTKSetLabelForFrame(GTK_FRAME(m_widget), label);
 }
 
-void wxRadioBox::SetLabel( int item, const wxString& label )
+void wxRadioBox::SetString( int item, const wxString& label )
 {
-    wxCHECK_RET( m_widget != NULL, T("invalid radiobox") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
-    wxNode *node = m_boxes.Nth( item );
+    wxList::compatibility_iterator node = m_boxes.Item( item );
 
-    wxCHECK_RET( node, T("radiobox wrong index") );
+    wxCHECK_RET( node, wxT("radiobox wrong index") );
 
-    GtkButton *button = GTK_BUTTON( node->Data() );
-    GtkLabel *g_label = GTK_LABEL( button->child );
+    GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
 
-    gtk_label_set( g_label, label.mbc_str() );
-}
-
-void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
-{
-    wxFAIL_MSG(T("wxRadioBox::SetLabel not implemented."));
+    gtk_label_set( g_label, wxGTK_CONV( label ) );
 }
 
 bool wxRadioBox::Enable( bool enable )
 {
     if ( !wxControl::Enable( enable ) )
-        return FALSE;
+        return false;
 
-    wxNode *node = m_boxes.First();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
-        GtkButton *button = GTK_BUTTON( node->Data() );
-        GtkWidget *label = button->child;
+        GtkButton *button = GTK_BUTTON( node->GetData() );
+        GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) );
+
         gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
-        gtk_widget_set_sensitive( label, enable );
-        node = node->Next();
+        gtk_widget_set_sensitive( GTK_WIDGET(label), enable );
+        node = node->GetNext();
     }
 
-    return TRUE;
+    return true;
 }
 
-void wxRadioBox::Enable( int item, bool enable )
+bool wxRadioBox::Enable( int item, bool enable )
 {
-    wxCHECK_RET( m_widget != NULL, T("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
+
+    wxList::compatibility_iterator node = m_boxes.Item( item );
 
-    wxNode *node = m_boxes.Nth( item );
+    wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 
-    wxCHECK_RET( node, T("radiobox wrong index") );
+    GtkButton *button = GTK_BUTTON( node->GetData() );
+    GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) );
 
-    GtkButton *button = GTK_BUTTON( node->Data() );
-    GtkWidget *label = button->child;
     gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
-    gtk_widget_set_sensitive( label, enable );
+    gtk_widget_set_sensitive( GTK_WIDGET(label), enable );
+
+    return true;
 }
 
-void wxRadioBox::Show( int item, bool show )
+bool wxRadioBox::IsItemEnabled(int item) const
 {
-    wxCHECK_RET( m_widget != NULL, T("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
-    wxNode *node = m_boxes.Nth( item );
+    wxList::compatibility_iterator node = m_boxes.Item( item );
 
-    wxCHECK_RET( node, T("radiobox wrong index") );
+    wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 
-    GtkWidget *button = GTK_WIDGET( node->Data() );
+    GtkButton *button = GTK_BUTTON( node->GetData() );
 
-    if (show)
-        gtk_widget_show( button );
-    else
-        gtk_widget_hide( button );
+    // don't use GTK_WIDGET_IS_SENSITIVE() here, we want to return true even if
+    // the parent radiobox is disabled
+    return GTK_WIDGET_SENSITIVE(GTK_WIDGET(button));
 }
 
-wxString wxRadioBox::GetStringSelection() const
+bool wxRadioBox::Show( int item, bool show )
 {
-    wxCHECK_MSG( m_widget != NULL, T(""), T("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
-    wxNode *node = m_boxes.First();
-    while (node)
-    {
-        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
-        if (button->active)
-        {
-            GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child );
-            return label->label;
-        }
-        node = node->Next();
-    }
+    wxList::compatibility_iterator node = m_boxes.Item( item );
 
-    wxFAIL_MSG( T("wxRadioBox none selected") );
-    return T("");
-}
+    wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 
-bool wxRadioBox::SetStringSelection( const wxString &s )
-{
-    wxCHECK_MSG( m_widget != NULL, FALSE, T("invalid radiobox") );
+    GtkWidget *button = GTK_WIDGET( node->GetData() );
 
-    int res = FindString( s );
-    if (res == -1) return FALSE;
-    SetSelection( res );
+    if (show)
+        gtk_widget_show( button );
+    else
+        gtk_widget_hide( button );
 
-    return TRUE;
+    return true;
 }
 
-int wxRadioBox::Number() const
+bool wxRadioBox::IsItemShown(int item) const
 {
-    return m_boxes.Number();
-}
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
-int wxRadioBox::GetNumberOfRowsOrCols() const
-{
-    return 1;
+    wxList::compatibility_iterator node = m_boxes.Item( item );
+
+    wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
+
+    GtkButton *button = GTK_BUTTON( node->GetData() );
+
+    return GTK_WIDGET_VISIBLE(GTK_WIDGET(button));
 }
 
-void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
+int wxRadioBox::GetCount() const
 {
-    wxFAIL_MSG(T("wxRadioBox::SetNumberOfRowsOrCols not implemented."));
+    return m_boxes.GetCount();
 }
 
-void wxRadioBox::DisableEvents()
+void wxRadioBox::GtkDisableEvents()
 {
-    wxNode *node = m_boxes.First();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
-        gtk_signal_disconnect_by_func( GTK_OBJECT(node->Data()),
+        gtk_signal_disconnect_by_func( GTK_OBJECT(node->GetData()),
            GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 
-	node = node->Next();
+        node = node->GetNext();
     }
 }
 
-void wxRadioBox::EnableEvents()
+void wxRadioBox::GtkEnableEvents()
 {
-    wxNode *node = m_boxes.First();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
-        gtk_signal_connect( GTK_OBJECT(node->Data()), "clicked",
+        gtk_signal_connect( GTK_OBJECT(node->GetData()), "clicked",
            GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 
-	node = node->Next();
+        node = node->GetNext();
     }
 }
 
-void wxRadioBox::ApplyWidgetStyle()
+void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    SetWidgetStyle();
+    gtk_widget_modify_style( m_widget, style );
 
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+#ifdef __WXGTK20__
+    gtk_widget_modify_style(GTK_FRAME(m_widget)->label_widget, style);
+#endif
 
-    wxNode *node = m_boxes.First();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
-        GtkWidget *widget = GTK_WIDGET( node->Data() );
-        gtk_widget_set_style( widget, m_widgetStyle );
+        GtkWidget *widget = GTK_WIDGET( node->GetData() );
 
-        GtkButton *button = GTK_BUTTON( node->Data() );
-        gtk_widget_set_style( button->child, m_widgetStyle );
+        gtk_widget_modify_style( widget, style );
+        gtk_widget_modify_style( BUTTON_CHILD(node->GetData()), style );
 
-        node = node->Next();
+        node = node->GetNext();
     }
 }
 
+#if wxUSE_TOOLTIPS
+void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
+{
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
+    while (node)
+    {
+        GtkWidget *widget = GTK_WIDGET( node->GetData() );
+        gtk_tooltips_set_tip( tips, widget, wxConvCurrent->cWX2MB(tip), (gchar*) NULL );
+        node = node->GetNext();
+    }
+}
+#endif // wxUSE_TOOLTIPS
+
 bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
 {
-    if (window == m_widget->window) return TRUE;
+    if (window == m_widget->window)
+        return true;
 
-    wxNode *node = m_boxes.First();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
-        GtkWidget *button = GTK_WIDGET( node->Data() );
+        GtkWidget *button = GTK_WIDGET( node->GetData() );
 
-        if (window == button->window) return TRUE;
+        if (window == button->window)
+            return true;
 
-        node = node->Next();
+        node = node->GetNext();
     }
 
-    return FALSE;
+    return false;
 }
 
-#endif
+void wxRadioBox::OnInternalIdle()
+{
+    if ( m_lostFocus )
+    {
+        m_hasFocus = false;
+        m_lostFocus = false;
+
+        wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() );
+        event.SetEventObject( this );
+
+        (void)GetEventHandler()->ProcessEvent( event );
+    }
+
+    if (g_delayedFocus == this)
+    {
+        if (GTK_WIDGET_REALIZED(m_widget))
+        {
+            g_delayedFocus = NULL;
+            SetFocus();
+        }
+    }
+}
+
+// static
+wxVisualAttributes
+wxRadioBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    wxVisualAttributes attr;
+    // NB: we need toplevel window so that GTK+ can find the right style
+    GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    GtkWidget* widget = gtk_radio_button_new_with_label(NULL, "");
+    gtk_container_add(GTK_CONTAINER(wnd), widget);
+    attr = GetDefaultAttributesFromGTKWidget(widget);
+    gtk_widget_destroy(wnd);
+    return attr;
+}
+
+#endif // wxUSE_RADIOBOX