X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe161a2685012cf90bb5bfe95f2260aee71d8ad7..c96d7bec67801a380d029990ad1df5e2c9fc207b:/src/gtk/radiobox.cpp

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index f0af2b64a5..418c82be3e 100644
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        radiobox.cpp
+// Name:        src/gtk/radiobox.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "radiobox.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -18,37 +14,50 @@
 
 #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
+
+#if wxUSE_TOOLTIPS
+    #include "wx/tooltip.h"
+#endif
 
 #include "wx/gtk/private.h"
 #include <gdk/gdkkeysyms.h>
 
-#include "wx/gtk/win_gtk.h"
-
 //-----------------------------------------------------------------------------
-// idle system
+// wxGTKRadioButtonInfo
 //-----------------------------------------------------------------------------
+// structure internally used by wxRadioBox to store its child buttons
+
+class wxGTKRadioButtonInfo : public wxObject
+{
+public:
+    wxGTKRadioButtonInfo( GtkRadioButton * abutton, const wxRect & arect )
+    : button( abutton ), rect( arect ) {}
 
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+    GtkRadioButton * button;
+    wxRect           rect;
+};
 
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST( wxRadioBoxButtonsInfoList )
+
 extern bool          g_blockEventsOnDrag;
-extern wxWindowGTK  *g_delayedFocus;
 
 //-----------------------------------------------------------------------------
 // "clicked"
 //-----------------------------------------------------------------------------
 
+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;
 
@@ -60,19 +69,32 @@ static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBo
     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_Tab) ||
+          (gdk_event->keyval == GDK_ISO_Left_Tab)) &&
+         rb->GetParent() && (rb->GetParent()->HasFlag( wxTAB_TRAVERSAL)) )
+    {
+        wxNavigationKeyEvent new_event;
+        new_event.SetEventObject( rb->GetParent() );
+        // GDK reports GDK_ISO_Left_Tab for SHIFT-TAB
+        new_event.SetDirection( (gdk_event->keyval == GDK_Tab) );
+        // CTRL-TAB changes the (parent) window, i.e. switch notebook page
+        new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) );
+        new_event.SetCurrentFocus( rb );
+        return rb->GetParent()->GetEventHandler()->ProcessEvent( new_event );
+    }
+
     if ((gdk_event->keyval != GDK_Up) &&
         (gdk_event->keyval != GDK_Down) &&
         (gdk_event->keyval != GDK_Left) &&
@@ -81,38 +103,42 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_
         return FALSE;
     }
 
-    wxList::compatibility_iterator node = rb->m_boxes.Find( (wxObject*) widget );
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = rb->m_buttonsInfo.GetFirst();
+    while( node && GTK_WIDGET( node->GetData()->button ) != widget )
+    {
+        node = node->GetNext();
+    }
     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();
+        if (node == rb->m_buttonsInfo.GetFirst())
+            node = rb->m_buttonsInfo.GetLast();
         else
             node = node->GetPrevious();
     }
     else
     {
-        if (node == rb->m_boxes.GetLast())
-            node = rb->m_boxes.GetFirst();
+        if (node == rb->m_buttonsInfo.GetLast())
+            node = rb->m_buttonsInfo.GetFirst();
         else
             node = node->GetNext();
     }
 
-    GtkWidget *button = (GtkWidget*) node->GetData();
+    GtkWidget *button = (GtkWidget*) node->GetData()->button;
 
     gtk_widget_grab_focus( button );
 
     return TRUE;
 }
+}
 
-static gint gtk_radiobutton_focus_in( GtkWidget *widget,
+extern "C" {
+static gint gtk_radiobutton_focus_in( GtkWidget * WXUNUSED(widget),
                                       GdkEvent *WXUNUSED(event),
                                       wxRadioBox *win )
 {
@@ -123,7 +149,7 @@ static gint gtk_radiobutton_focus_in( GtkWidget *widget,
     }
     else if ( !win->m_hasFocus )
     {
-        win->m_hasFocus = TRUE;
+        win->m_hasFocus = true;
 
         wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() );
         event.SetEventObject( win );
@@ -135,8 +161,10 @@ static gint gtk_radiobutton_focus_in( GtkWidget *widget,
 
     return FALSE;
 }
+}
 
-static gint gtk_radiobutton_focus_out( GtkWidget *widget,
+extern "C" {
+static gint gtk_radiobutton_focus_out( GtkWidget * WXUNUSED(widget),
                                        GdkEvent *WXUNUSED(event),
                                        wxRadioBox *win )
 {
@@ -147,11 +175,34 @@ static gint gtk_radiobutton_focus_out( GtkWidget *widget,
 
     // 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;
+    // idle iteration (leave m_hasFocus == true for now)
+    win->m_lostFocus = true;
 
     return FALSE;
 }
+}
+
+extern "C" {
+static void gtk_radiobutton_size_allocate( GtkWidget *widget,
+                                           GtkAllocation * alloc,
+                                           wxRadioBox *win )
+{
+    for ( wxRadioBoxButtonsInfoList::compatibility_iterator node = win->m_buttonsInfo.GetFirst();
+          node;
+          node = node->GetNext())
+    {
+        if (widget == GTK_WIDGET(node->GetData()->button))
+        {
+            const wxPoint origin = win->GetPosition();
+            wxRect rect = wxRect( alloc->x - origin.x, alloc->y - origin.y,
+                                  alloc->width, alloc->height );
+            node->GetData()->rect = rect;
+            break;
+        }
+    }
+}
+}
+
 
 //-----------------------------------------------------------------------------
 // wxRadioBox
@@ -161,11 +212,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
 
 void wxRadioBox::Init()
 {
-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
-
     m_hasFocus =
-    m_lostFocus = FALSE;
+    m_lostFocus = false;
 }
 
 bool wxRadioBox::Create( wxWindow *parent, wxWindowID id,
@@ -191,283 +239,149 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxRadioBox creation failed") );
-        return FALSE;
+        return false;
+    }
+
+    m_widget = GTKCreateFrame(title);
+    wxControl::SetLabel(title);
+    if ( HasFlag(wxNO_BORDER) )
+    {
+        // If we don't do this here, the wxNO_BORDER style is ignored in Show()
+        gtk_frame_set_shadow_type(GTK_FRAME(m_widget), GTK_SHADOW_NONE);
     }
 
-    m_widget = gtk_frame_new( wxGTK_CONV( title ) );
 
     // majorDim may be 0 if all trailing parameters were omitted, so don't
     // assert here but just use the correct value for it
-    m_majorDim = majorDim == 0 ? n : majorDim;
+    SetMajorDim(majorDim == 0 ? n : majorDim, style);
+
 
-    GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
+    unsigned int num_of_cols = GetColumnCount();
+    unsigned int num_of_rows = GetRowCount();
+
+    GtkRadioButton *rbtn = (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++)
+    for (unsigned int i = 0; i < (unsigned int)n; i++)
     {
         if ( i != 0 )
-            radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) );
+            radio_button_group = gtk_radio_button_get_group( GTK_RADIO_BUTTON(rbtn) );
 
         label.Empty();
-        for ( const wxChar *pc = choices[i]; *pc; pc++ )
+        for ( wxString::const_iterator pc = choices[i].begin();
+              pc != choices[i].end(); ++pc )
         {
             if ( *pc != wxT('&') )
                 label += *pc;
         }
 
-        m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, wxGTK_CONV( label ) ) );
-
-        gtk_signal_connect( GTK_OBJECT(m_radio), "key_press_event",
-           GTK_SIGNAL_FUNC(gtk_radiobox_keypress_callback), (gpointer)this );
+        rbtn = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, wxGTK_CONV( label ) ) );
+        gtk_widget_show( GTK_WIDGET(rbtn) );
 
-        m_boxes.Append( (wxObject*) m_radio );
+        g_signal_connect (rbtn, "key_press_event",
+                          G_CALLBACK (gtk_radiobox_keypress_callback), this);
 
-        ConnectWidget( GTK_WIDGET(m_radio) );
+        m_buttonsInfo.Append( new wxGTKRadioButtonInfo( rbtn, wxRect() ) );
 
-        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 );
+        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(rbtn), 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(rbtn), left, right, top, bottom,
+                  GTK_FILL, GTK_FILL, 1, 1 );
+        }
 
-        gtk_signal_connect( GTK_OBJECT(m_radio), "focus_in_event",
-            GTK_SIGNAL_FUNC(gtk_radiobutton_focus_in), (gpointer)this );
+        ConnectWidget( GTK_WIDGET(rbtn) );
 
-        gtk_signal_connect( GTK_OBJECT(m_radio), "focus_out_event",
-            GTK_SIGNAL_FUNC(gtk_radiobutton_focus_out), (gpointer)this );
+        if (!i)
+            gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(rbtn), TRUE );
 
-        gtk_pizza_put( GTK_PIZZA(m_parent->m_wxwindow),
-                         GTK_WIDGET(m_radio),
-                         m_x+10, m_y+10+(i*24), 10, 10 );
+        g_signal_connect (rbtn, "clicked",
+                          G_CALLBACK (gtk_radiobutton_clicked_callback), this);
+        g_signal_connect (rbtn, "focus_in_event",
+                          G_CALLBACK (gtk_radiobutton_focus_in), this);
+        g_signal_connect (rbtn, "focus_out_event",
+                          G_CALLBACK (gtk_radiobutton_focus_out), this);
+        g_signal_connect (rbtn, "size_allocate",
+                          G_CALLBACK (gtk_radiobutton_size_allocate), this);
     }
 
     m_parent->DoAddChild( this );
 
-    bool wasShown = IsShown();
-    if ( wasShown )
-        Hide(); // prevent PostCreation() from showing us
-
-    SetLabel( title );
-
     PostCreation(size);
 
-    if ( wasShown )
-        Show();
-
-    return TRUE;
+    return true;
 }
 
 wxRadioBox::~wxRadioBox()
 {
-    wxList::compatibility_iterator node = m_boxes.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();
     while (node)
     {
-        GtkWidget *button = GTK_WIDGET( node->GetData() );
+        GtkWidget *button = GTK_WIDGET( node->GetData()->button );
         gtk_widget_destroy( button );
         node = node->GetNext();
     }
-}
-
-void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags )
-{
-    wxWindow::DoSetSize( x, y, width, height, sizeFlags );
-
-    LayoutItems(false);
-}
-
-wxSize wxRadioBox::DoGetBestSize() const
-{
-    wxSize size = LayoutItems(true);
-
-    GtkRequisition req;
-    req.width = 2;
-    req.height = 2;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req );
-    if (req.width > size.x)
-        size.x = req.width;
-
-    return size;
-}
-
-wxSize wxRadioBox::LayoutItems(bool justCalc) const
-{
-    wxSize res( 0, 0 );
-
-    // avoid dividing by 0 below
-    wxCHECK_MSG( m_majorDim, res, wxT("dimension of radiobox should not be 0!") );
-
-    int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1;
-
-    int x = 7;
-    int y = 15;
-
-    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;
-    }
-    
-    int lineheight = GetCharHeight()+2;
-    
-    if ( HasFlag(wxRA_SPECIFY_COLS) ||
-         (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) )
-    {
-        for (int j = 0; j < num_of_cols; j++)
-        {
-            y = 3;
-            y += lineheight;
-
-            int max_len = 0;
-            wxList::compatibility_iterator node = m_boxes.Item( j*num_of_rows );
-            for (int i1 = 0; i1< num_of_rows; i1++)
-            {
-                GtkWidget *button = GTK_WIDGET( node->GetData() );
-
-                GtkRequisition req;
-                req.width = 2;
-                req.height = 2;
-                (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request )
-                      (button, &req );
-                      
-                if (req.width > max_len) max_len = req.width;
-
-                if ( !justCalc )
-                    gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y );
-                y += req.height;
-
-                node = node->GetNext();
-                if (!node) break;
-            }
-
-            // we don't know the max_len before
-
-            node = m_boxes.Item( j*num_of_rows );
-            for (int i2 = 0; i2< num_of_rows; i2++)
-            {
-                GtkWidget *button = GTK_WIDGET( node->GetData() );
-
-                if ( !justCalc )
-                    gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, lineheight );
-
-                node = node->GetNext();
-                if (!node) break;
-            }
-
-            if (y > res.y) res.y = y;
-
-            x += max_len + 2;
-        }
-
-        res.x = x+4;
-        res.y += 4;
-    }
-    else
-    {
-        int max = 0;
-
-        wxList::compatibility_iterator node = m_boxes.GetFirst();
-        while (node)
-        {
-            GtkWidget *button = GTK_WIDGET( node->GetData() );
-
-            GtkRequisition req;
-            req.width = 2;
-            req.height = 2;
-            (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request )
-                  (button, &req );
-
-            if (req.width > max) max = req.width;
-
-            node = node->GetNext();
-        }
-
-        node = m_boxes.GetFirst();
-        while (node)
-        {
-            GtkWidget *button = GTK_WIDGET( node->GetData() );
-
-            if ( !justCalc )
-                gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, lineheight );
-            x += max;
-
-            node = node->GetNext();
-        }
-        res.x = x+4;
-        res.y = 40;
-    }
-
-    return res;
+    WX_CLEAR_LIST( wxRadioBoxButtonsInfoList, m_buttonsInfo );
 }
 
 bool wxRadioBox::Show( bool show )
 {
-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
     if (!wxControl::Show(show))
     {
         // nothing to do
-        return FALSE;
+        return false;
     }
 
     if ( HasFlag(wxNO_BORDER) )
         gtk_widget_hide( m_widget );
 
-    wxList::compatibility_iterator node = m_boxes.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();
     while (node)
     {
-        GtkWidget *button = GTK_WIDGET( node->GetData() );
-
-        if (show) gtk_widget_show( button ); else gtk_widget_hide( button );
-
-        node = node->GetNext();
-    }
-
-    return TRUE;
-}
-
-int wxRadioBox::FindString( const wxString &find ) const
-{
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") );
-
-    int count = 0;
+        GtkWidget *button = GTK_WIDGET( node->GetData()->button );
 
-    wxList::compatibility_iterator node = m_boxes.GetFirst();
-    while (node)
-    {
-        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
-        if (find == str)
-            return count;
-
-        count++;
+        if (show)
+            gtk_widget_show( button );
+        else
+            gtk_widget_hide( button );
 
         node = node->GetNext();
     }
 
-    return -1;
+    return true;
 }
 
 void wxRadioBox::SetFocus()
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
-    if (m_boxes.GetCount() == 0) return;
+    if (m_buttonsInfo.GetCount() == 0) return;
 
-    wxList::compatibility_iterator node = m_boxes.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();
     while (node)
     {
-        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );
+        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData()->button );
         if (button->active)
         {
             gtk_widget_grab_focus( GTK_WIDGET(button) );
@@ -481,11 +395,11 @@ void wxRadioBox::SetSelection( int n )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
-    wxList::compatibility_iterator node = m_boxes.Item( n );
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( n );
 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 
-    GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );
+    GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData()->button );
 
     GtkDisableEvents();
 
@@ -496,14 +410,14 @@ void wxRadioBox::SetSelection( int n )
 
 int wxRadioBox::GetSelection(void) const
 {
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid radiobox") );
 
     int count = 0;
 
-    wxList::compatibility_iterator node = m_boxes.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();
     while (node)
     {
-        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );
+        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData()->button );
         if (button->active) return count;
         count++;
         node = node->GetNext();
@@ -511,24 +425,20 @@ int wxRadioBox::GetSelection(void) const
 
     wxFAIL_MSG( wxT("wxRadioBox none selected") );
 
-    return -1;
+    return wxNOT_FOUND;
 }
 
-wxString wxRadioBox::GetString( int n ) const
+wxString wxRadioBox::GetString(unsigned int n) const
 {
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") );
 
-    wxList::compatibility_iterator node = m_boxes.Item( n );
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( n );
 
-    wxCHECK_MSG( node, wxT(""), wxT("radiobox wrong index") );
+    wxCHECK_MSG( node, wxEmptyString, wxT("radiobox wrong index") );
 
-    GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
+    GtkLabel *label = GTK_LABEL(GTK_BIN(node->GetData()->button)->child);
 
-#ifdef __WXGTK20__
     wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
-#else
-    wxString str( label->label );
-#endif
 
     return str;
 }
@@ -537,135 +447,116 @@ 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() ) );
-
-    PostSetLabel();
+    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") );
 
-    wxList::compatibility_iterator node = m_boxes.Item( item );
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item );
 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 
-    GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
+    GtkLabel *g_label = GTK_LABEL(GTK_BIN(node->GetData()->button)->child);
 
-    gtk_label_set( g_label, wxGTK_CONV( label ) );
+    gtk_label_set_text( g_label, wxGTK_CONV( label ) );
 }
 
 bool wxRadioBox::Enable( bool enable )
 {
     if ( !wxControl::Enable( enable ) )
-        return FALSE;
+        return false;
 
-    wxList::compatibility_iterator node = m_boxes.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();
     while (node)
     {
-        GtkButton *button = GTK_BUTTON( node->GetData() );
-        GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) );
+        GtkButton *button = GTK_BUTTON( node->GetData()->button );
+        GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child);
 
         gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
         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(unsigned int item, bool enable)
 {
-    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
-    wxList::compatibility_iterator node = m_boxes.Item( item );
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item );
 
-    wxCHECK_RET( node, wxT("radiobox wrong index") );
+    wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 
-    GtkButton *button = GTK_BUTTON( node->GetData() );
-    GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) );
+    GtkButton *button = GTK_BUTTON( node->GetData()->button );
+    GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child);
 
     gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
     gtk_widget_set_sensitive( GTK_WIDGET(label), enable );
+
+    return true;
 }
 
-void wxRadioBox::Show( int item, bool show )
+bool wxRadioBox::IsItemEnabled(unsigned int item) const
 {
-    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
-    wxList::compatibility_iterator node = m_boxes.Item( item );
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item );
 
-    wxCHECK_RET( node, wxT("radiobox wrong index") );
+    wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 
-    GtkWidget *button = GTK_WIDGET( node->GetData() );
+    GtkButton *button = GTK_BUTTON( node->GetData()->button );
 
-    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(unsigned int item, bool show)
 {
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
-    wxList::compatibility_iterator node = m_boxes.GetFirst();
-    while (node)
-    {
-        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );
-        if (button->active)
-        {
-            GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item );
 
-#ifdef __WXGTK20__
-            wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
-#else
-            wxString str( label->label );
-#endif
-            return str;
-        }
-        node = node->GetNext();
-    }
+    wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 
-    wxFAIL_MSG( wxT("wxRadioBox none selected") );
-    return wxT("");
+    GtkWidget *button = GTK_WIDGET( node->GetData()->button );
+
+    if (show)
+        gtk_widget_show( button );
+    else
+        gtk_widget_hide( button );
+
+    return true;
 }
 
-bool wxRadioBox::SetStringSelection( const wxString &s )
+bool wxRadioBox::IsItemShown(unsigned int item) const
 {
-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
-    int res = FindString( s );
-    if (res == -1) return FALSE;
-    SetSelection( res );
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item );
 
-    return TRUE;
-}
+    wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 
-int wxRadioBox::GetCount() const
-{
-    return m_boxes.GetCount();
-}
+    GtkButton *button = GTK_BUTTON( node->GetData()->button );
 
-int wxRadioBox::GetNumberOfRowsOrCols() const
-{
-    return 1;
+    return GTK_WIDGET_VISIBLE(GTK_WIDGET(button));
 }
 
-void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
+unsigned int wxRadioBox::GetCount() const
 {
-    wxFAIL_MSG(wxT("wxRadioBox::SetNumberOfRowsOrCols not implemented."));
+    return m_buttonsInfo.GetCount();
 }
 
 void wxRadioBox::GtkDisableEvents()
 {
-    wxList::compatibility_iterator node = m_boxes.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();
     while (node)
     {
-        gtk_signal_disconnect_by_func( GTK_OBJECT(node->GetData()),
-           GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+        g_signal_handlers_block_by_func(node->GetData()->button,
+            (gpointer)gtk_radiobutton_clicked_callback, this);
 
         node = node->GetNext();
     }
@@ -673,11 +564,11 @@ void wxRadioBox::GtkDisableEvents()
 
 void wxRadioBox::GtkEnableEvents()
 {
-    wxList::compatibility_iterator node = m_boxes.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();
     while (node)
     {
-        gtk_signal_connect( GTK_OBJECT(node->GetData()), "clicked",
-           GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+        g_signal_handlers_unblock_by_func(node->GetData()->button,
+            (gpointer)gtk_radiobutton_clicked_callback, this);
 
         node = node->GetNext();
     }
@@ -685,71 +576,90 @@ void wxRadioBox::GtkEnableEvents()
 
 void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    gtk_widget_modify_style( m_widget, style );
+    GTKFrameApplyWidgetStyle(GTK_FRAME(m_widget), style);
 
-    wxList::compatibility_iterator node = m_boxes.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();
     while (node)
     {
-        GtkWidget *widget = GTK_WIDGET( node->GetData() );
+        GtkWidget *widget = GTK_WIDGET( node->GetData()->button );
 
         gtk_widget_modify_style( widget, style );
-        gtk_widget_modify_style( BUTTON_CHILD(node->GetData()), style );
+        gtk_widget_modify_style(GTK_BIN(widget)->child, style);
 
         node = node->GetNext();
     }
 }
 
+bool wxRadioBox::GTKWidgetNeedsMnemonic() const
+{
+    return true;
+}
+
+void wxRadioBox::GTKWidgetDoSetMnemonic(GtkWidget* w)
+{
+    GTKFrameSetMnemonicWidget(GTK_FRAME(m_widget), w);
+}
+
 #if wxUSE_TOOLTIPS
-void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
+void wxRadioBox::ApplyToolTip(GtkTooltips * WXUNUSED(tips), const gchar *tip)
 {
-    wxList::compatibility_iterator node = m_boxes.GetFirst();
-    while (node)
+    // set this tooltip for all radiobuttons which don't have their own tips
+    unsigned n = 0;
+    for ( wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();
+          node;
+          node = node->GetNext(), n++ )
     {
-        GtkWidget *widget = GTK_WIDGET( node->GetData() );
-        gtk_tooltips_set_tip( tips, widget, wxConvCurrent->cWX2MB(tip), (gchar*) NULL );
-        node = node->GetNext();
+        if ( !GetItemToolTip(n) )
+        {
+            wxToolTip::Apply(GTK_WIDGET(node->GetData()->button), tip);
+        }
     }
 }
+
+void wxRadioBox::DoSetItemToolTip(unsigned int n, wxToolTip *tooltip)
+{
+    wxCharBuffer buf;
+    if ( !tooltip )
+        tooltip = GetToolTip();
+    if ( tooltip )
+        buf = wxGTK_CONV(tooltip->GetTip());
+
+    wxToolTip::Apply(GTK_WIDGET(m_buttonsInfo[n]->button), buf);
+}
+
 #endif // wxUSE_TOOLTIPS
 
-bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxRadioBox::GTKGetWindow(wxArrayGdkWindows& windows) const
 {
-    if (window == m_widget->window) return TRUE;
+    windows.push_back(m_widget->window);
 
-    wxList::compatibility_iterator node = m_boxes.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();
     while (node)
     {
-        GtkWidget *button = GTK_WIDGET( node->GetData() );
+        GtkWidget *button = GTK_WIDGET( node->GetData()->button );
 
-        if (window == button->window) return TRUE;
+        windows.push_back(button->window);
 
         node = node->GetNext();
     }
 
-    return FALSE;
+    return NULL;
 }
 
 void wxRadioBox::OnInternalIdle()
 {
+    wxControl::OnInternalIdle();
+
     if ( m_lostFocus )
     {
-        m_hasFocus = FALSE;
-        m_lostFocus = FALSE;
+        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
@@ -757,11 +667,27 @@ 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(widget);
+    gtk_widget_destroy(wnd);
     return attr;
 }
 
-#endif // wxUSE_RADIOBOX
+int wxRadioBox::GetItemFromPoint(const wxPoint& point) const
+{
+    const wxPoint pt = ScreenToClient(point);
+    unsigned n = 0;
+    for ( wxRadioBoxButtonsInfoList::compatibility_iterator
+            node = m_buttonsInfo.GetFirst(); node; node = node->GetNext(), n++ )
+    {
+        if ( m_buttonsInfo[n]->rect.Contains(pt) )
+            return n;
+    }
 
+    return wxNOT_FOUND;
+}
+
+#endif // wxUSE_RADIOBOX