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

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 18867ec77d..1dbff8ad50 100644
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -7,19 +7,22 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #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 <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
 #include <gdk/gdkkeysyms.h>
 
 #include "wx/gtk/win_gtk.h"
@@ -35,26 +38,21 @@ 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 )
+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() );
@@ -82,35 +80,35 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_
     {
         return FALSE;
     }
-    
-    wxNode *node = rb->m_boxes.Find( (wxObject*) widget );
+
+    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.First())
-	    node = rb->m_boxes.Last();
-	else
-	    node = node->Previous();
+        if (node == rb->m_boxes.GetFirst())
+            node = rb->m_boxes.GetLast();
+        else
+            node = node->GetPrevious();
     }
     else
     {
-        if (node == rb->m_boxes.Last())
-	    node = rb->m_boxes.First();
-	else
-	    node = node->Next();
+        if (node == rb->m_boxes.GetLast())
+            node = rb->m_boxes.GetFirst();
+        else
+            node = node->GetNext();
     }
-    
-    GtkWidget *button = (GtkWidget*) node->Data();
-	
+
+    GtkWidget *button = (GtkWidget*) node->GetData();
+
     gtk_widget_grab_focus( button );
-    
+
     return TRUE;
 }
 
@@ -142,7 +140,10 @@ 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?") );
+  //    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
@@ -160,7 +161,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
 
 void wxRadioBox::Init()
 {
-    m_alreadySent = FALSE;
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 
@@ -178,12 +178,14 @@ 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 = gtk_frame_new( title.mbc_str() );
+    m_widget = gtk_frame_new( wxGTK_CONV( title ) );
 
-    m_majorDim = majorDim;
+    // 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;
 
     GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
 
@@ -201,11 +203,11 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
                 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_signal_connect( GTK_OBJECT(m_radio), "key_press_event",
            GTK_SIGNAL_FUNC(gtk_radiobox_keypress_callback), (gpointer)this );
-	   
+
         m_boxes.Append( (wxObject*) m_radio );
 
         ConnectWidget( GTK_WIDGET(m_radio) );
@@ -229,7 +231,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
     m_parent->DoAddChild( this );
 
     PostCreation();
-    
+
     ApplyWidgetStyle();
 
     SetLabel( title );
@@ -241,9 +243,9 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
     GtkRequisition req;
     req.width = 2;
     req.height = 2;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req );
     if (req.width > ls.x) ls.x = req.width;
-    
+
     wxSize newSize = size;
     if (newSize.x == -1) newSize.x = ls.x;
     if (newSize.y == -1) newSize.y = ls.y;
@@ -259,19 +261,19 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
 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::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
     wxWindow::DoSetSize( x, y, width, height, sizeFlags );
-    
+
     LayoutItems();
 }
 
@@ -304,7 +306,7 @@ wxSize wxRadioBox::LayoutItems()
         num_of_cols = num_per_major;
         num_of_rows = m_majorDim;
     }
-	
+
     if ( HasFlag(wxRA_SPECIFY_COLS) ||
          (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) )
     {
@@ -313,36 +315,36 @@ wxSize wxRadioBox::LayoutItems()
             y = 15;
 
             int max_len = 0;
-            wxNode *node = m_boxes.Nth( j*num_of_rows );
+            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->Data() );
-		
+                GtkWidget *button = GTK_WIDGET( node->GetData() );
+
                 GtkRequisition req;
                 req.width = 2;
                 req.height = 2;
-                (* GTK_WIDGET_CLASS( GTK_OBJECT(button)->klass )->size_request )
+                (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request )
                       (button, &req );
-		
+
                 if (req.width > max_len) max_len = req.width;
 
                 gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y );
                 y += req.height;
 
-                node = node->Next();
+                node = node->GetNext();
                 if (!node) break;
             }
 
             // we don't know the max_len before
 
-            node = m_boxes.Nth( j*num_of_rows );
+            node = m_boxes.Item( j*num_of_rows );
             for (int i2 = 0; i2< num_of_rows; i2++)
             {
-                GtkWidget *button = GTK_WIDGET( node->Data() );
+                GtkWidget *button = GTK_WIDGET( node->GetData() );
 
                 gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, 20 );
 
-                node = node->Next();
+                node = node->GetNext();
                 if (!node) break;
             }
 
@@ -358,31 +360,31 @@ wxSize wxRadioBox::LayoutItems()
     {
         int max = 0;
 
-        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() );
 
             GtkRequisition req;
             req.width = 2;
             req.height = 2;
-            (* GTK_WIDGET_CLASS( GTK_OBJECT(button)->klass )->size_request )
+            (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request )
                   (button, &req );
 
             if (req.width > max) max = req.width;
 
-            node = node->Next();
+            node = node->GetNext();
         }
 
-        node = m_boxes.First();
+        node = m_boxes.GetFirst();
         while (node)
         {
-            GtkWidget *button = GTK_WIDGET( node->Data() );
+            GtkWidget *button = GTK_WIDGET( node->GetData() );
 
             gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 );
             x += max;
 
-            node = node->Next();
+            node = node->GetNext();
         }
         res.x = x+4;
         res.y = 40;
@@ -404,35 +406,40 @@ bool wxRadioBox::Show( bool show )
     if ((m_windowStyle & wxNO_BORDER) != 0)
         gtk_widget_hide( m_widget );
 
-    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 (show) gtk_widget_show( button ); else gtk_widget_hide( button );
 
-        node = node->Next();
+        node = node->GetNext();
     }
 
     return TRUE;
 }
 
-int wxRadioBox::FindString( const wxString &s ) const
+int wxRadioBox::FindString( const wxString &find ) const
 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") );
 
     int count = 0;
 
-    wxNode *node = m_boxes.First();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
-        GtkButton *button = GTK_BUTTON( node->Data() );
+        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;
 
-        GtkLabel *label = GTK_LABEL( button->child );
-        if (s == label->label) return count;
         count++;
 
-        node = node->Next();
+        node = node->GetNext();
     }
 
     return -1;
@@ -444,34 +451,33 @@ void wxRadioBox::SetFocus()
 
     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, wxT("invalid radiobox") );
 
-    wxNode *node = m_boxes.Nth( n );
+    wxList::compatibility_iterator node = m_boxes.Item( n );
 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 
-    GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
+    GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );
 
     GtkDisableEvents();
-    
-    gtk_toggle_button_set_state( button, 1 );
-    
+
+    gtk_toggle_button_set_active( button, 1 );
+
     GtkEnableEvents();
 }
 
@@ -481,13 +487,13 @@ int wxRadioBox::GetSelection(void) const
 
     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( wxT("wxRadioBox none selected") );
@@ -499,21 +505,19 @@ wxString wxRadioBox::GetString( int n ) const
 {
     wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
 
-    wxNode *node = m_boxes.Nth( n );
+    wxList::compatibility_iterator node = m_boxes.Item( n );
 
     wxCHECK_MSG( node, wxT(""), wxT("radiobox wrong index") );
 
-    GtkButton *button = GTK_BUTTON( node->Data() );
-    GtkLabel *label = GTK_LABEL( button->child );
-
-    return wxString( label->label );
-}
+    GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
 
-wxString wxRadioBox::GetLabel( int item ) const
-{
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("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 )
@@ -522,26 +526,20 @@ void wxRadioBox::SetLabel( const wxString& label )
 
     wxControl::SetLabel( label );
 
-    gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel().mbc_str() );
+    gtk_frame_set_label( GTK_FRAME(m_widget), wxGTK_CONV( wxControl::GetLabel() ) );
 }
 
-void wxRadioBox::SetLabel( int item, const wxString& label )
+void wxRadioBox::SetString( int item, const wxString& label )
 {
     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, wxT("radiobox wrong index") );
 
-    GtkButton *button = GTK_BUTTON( node->Data() );
-    GtkLabel *g_label = GTK_LABEL( button->child );
-
-    gtk_label_set( g_label, label.mbc_str() );
-}
+    GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
 
-void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
-{
-    wxFAIL_MSG(wxT("wxRadioBox::SetLabel not implemented."));
+    gtk_label_set( g_label, wxGTK_CONV( label ) );
 }
 
 bool wxRadioBox::Enable( bool enable )
@@ -549,14 +547,15 @@ bool wxRadioBox::Enable( bool enable )
     if ( !wxControl::Enable( enable ) )
         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;
@@ -566,25 +565,26 @@ void wxRadioBox::Enable( int item, bool enable )
 {
     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, wxT("radiobox wrong index") );
 
-    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 );
+    gtk_widget_set_sensitive( GTK_WIDGET(label), enable );
 }
 
 void wxRadioBox::Show( int item, bool show )
 {
     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, wxT("radiobox wrong index") );
 
-    GtkWidget *button = GTK_WIDGET( node->Data() );
+    GtkWidget *button = GTK_WIDGET( node->GetData() );
 
     if (show)
         gtk_widget_show( button );
@@ -596,16 +596,22 @@ wxString wxRadioBox::GetStringSelection() const
 {
     wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
 
-    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)
         {
-            GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child );
-            return label->label;
+            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;
         }
-        node = node->Next();
+        node = node->GetNext();
     }
 
     wxFAIL_MSG( wxT("wxRadioBox none selected") );
@@ -623,9 +629,9 @@ bool wxRadioBox::SetStringSelection( const wxString &s )
     return TRUE;
 }
 
-int wxRadioBox::Number() const
+int wxRadioBox::GetCount() const
 {
-    return m_boxes.Number();
+    return m_boxes.GetCount();
 }
 
 int wxRadioBox::GetNumberOfRowsOrCols() const
@@ -640,25 +646,25 @@ void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
 
 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::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();
     }
 }
 
@@ -668,28 +674,27 @@ void wxRadioBox::ApplyWidgetStyle()
 
     gtk_widget_set_style( m_widget, m_widgetStyle );
 
-    wxNode *node = m_boxes.First();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
-        GtkWidget *widget = GTK_WIDGET( node->Data() );
+        GtkWidget *widget = GTK_WIDGET( node->GetData() );
         gtk_widget_set_style( widget, m_widgetStyle );
 
-        GtkButton *button = GTK_BUTTON( node->Data() );
-        gtk_widget_set_style( button->child, m_widgetStyle );
+        gtk_widget_set_style( BUTTON_CHILD(node->GetData()), m_widgetStyle );
 
-        node = node->Next();
+        node = node->GetNext();
     }
 }
 
 #if wxUSE_TOOLTIPS
 void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
 {
-    wxNode *node = m_boxes.First();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
-        GtkWidget *widget = GTK_WIDGET( node->Data() );
+        GtkWidget *widget = GTK_WIDGET( node->GetData() );
         gtk_tooltips_set_tip( tips, widget, wxConvCurrent->cWX2MB(tip), (gchar*) NULL );
-        node = node->Next();
+        node = node->GetNext();
     }
 }
 #endif // wxUSE_TOOLTIPS
@@ -698,14 +703,14 @@ bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
 {
     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;
 
-        node = node->Next();
+        node = node->GetNext();
     }
 
     return FALSE;
@@ -723,6 +728,15 @@ void wxRadioBox::OnInternalIdle()
 
         (void)GetEventHandler()->ProcessEvent( event );
     }
+
+    if (g_delayedFocus == this)
+    {
+        if (GTK_WIDGET_REALIZED(m_widget))
+        {
+            g_delayedFocus = NULL;
+            SetFocus();
+        }
+    }
 }
 
 #endif // wxUSE_RADIOBOX