Removed unused and outdated Watcom build files.

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

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 846ec6c3b2ed27c47b7f0636b61270ce1708f3ee..ae6caf193754922984c52ab21a74ff27299461da 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -1,505 +1,624 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        radiobox.cpp
+// Name:        src/gtk/radiobox.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "radiobox.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_RADIOBOX

 
 #include "wx/radiobox.h"
 
 #include "wx/radiobox.h"

+

 #include "wx/dialog.h"
 #include "wx/frame.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"
 
 #include "wx/gtk/win_gtk.h"
 

+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 

-extern bool   g_blockEventsOnDrag;
+extern bool          g_blockEventsOnDrag;
+extern wxWindowGTK  *g_delayedFocus;

 
 //-----------------------------------------------------------------------------
 // "clicked"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "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 (!rb->HasVMT()) return;
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (!rb->m_hasVMT) return;

     if (g_blockEventsOnDrag) 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() );
     wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, rb->GetId() );
     event.SetInt( rb->GetSelection() );

-    wxString tmp( rb->GetStringSelection() );
-    event.SetString( WXSTRINGCAST(tmp) );
+    event.SetString( rb->GetStringSelection() );

     event.SetEventObject( rb );
     rb->GetEventHandler()->ProcessEvent(event);
 }
     event.SetEventObject( rb );
     rb->GetEventHandler()->ProcessEvent(event);
 }

+}

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxRadioBox
+// "key_press_event"

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
+extern "C" {
+static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxRadioBox *rb )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();

 
 

-BEGIN_EVENT_TABLE(wxRadioBox, wxControl)
-    EVT_SIZE(wxRadioBox::OnSize)
-END_EVENT_TABLE()
+    if (!rb->m_hasVMT) return FALSE;
+    if (g_blockEventsOnDrag) return FALSE;

 
 

-wxRadioBox::wxRadioBox(void)
-{
-}
+    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 );
+    }

 
 

-bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
-                         const wxPoint &pos, const wxSize &size,
-                         int n, const wxString choices[], int majorDim, 
-                         long style, const wxValidator& validator, 
-                        const wxString &name )
-{
-    m_alreadySent = FALSE;
-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
-  
-    PreCreation( parent, id, pos, size, style, name );
-
-    SetValidator( validator );
-
-    m_widget = gtk_frame_new( title );
-  
-    m_majorDim = majorDim;
-  
-    GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
-  
-    GSList *radio_button_group = (GSList *) NULL;
-    for (int i = 0; i < n; i++)
+    if ((gdk_event->keyval != GDK_Up) &&
+        (gdk_event->keyval != GDK_Down) &&
+        (gdk_event->keyval != GDK_Left) &&
+        (gdk_event->keyval != GDK_Right))

     {
     {

-        if (i) radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) );
-      
-        m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, choices[i] ) );
-      
-        m_boxes.Append( (wxObject*) m_radio );
-      
-        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) );
-      
+        return FALSE;
+    }
+
+    wxList::compatibility_iterator node = rb->m_boxes.Find( (wxObject*) widget );
+    if (!node)
+    {
+        return FALSE;

     }
     }

-    
-    wxSize ls = LayoutItems();
-  
-    wxSize newSize = size;
-    if (newSize.x == -1) newSize.x = ls.x;
-    if (newSize.y == -1) newSize.y = ls.y;
-    SetSize( newSize.x, newSize.y );
-  
-    m_parent->AddChild( this );
-
-    (m_parent->m_insertCallback)( m_parent, this );
-  
-    PostCreation();
-  
-    SetLabel( title );
-  
-    SetBackgroundColour( parent->GetBackgroundColour() );
-    SetForegroundColour( parent->GetForegroundColour() );
-
-    Show( TRUE );
-    
+
+    g_signal_stop_emission_by_name (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;
 }
     return TRUE;
 }

+}

 
 

-wxRadioBox::~wxRadioBox(void)
+extern "C" {
+static gint gtk_radiobutton_focus_in( GtkWidget *widget,
+                                      GdkEvent *WXUNUSED(event),
+                                      wxRadioBox *win )

 {
 {

-    wxNode *node = m_boxes.First();
-    while (node)
+    if ( win->m_lostFocus )

     {
     {

-        GtkWidget *button = GTK_WIDGET( node->Data() );
-        gtk_widget_destroy( button );
-        node = node->Next();
+        // 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
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
+
+void wxRadioBox::Init()
+{
+    m_needParent = true;
+    m_acceptsFocus = true;
+
+    m_hasFocus =
+    m_lostFocus = false;

 }
 
 }
 

-void wxRadioBox::OnSize( wxSizeEvent &event )
+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 )

 {
 {

-    wxControl::OnSize( event );
-  
-    LayoutItems();
+    wxCArrayString chs(choices);
+
+    return Create( parent, id, title, pos, size, chs.GetCount(),
+                   chs.GetStrings(), majorDim, style, validator, name );

 }
 
 }
 

-wxSize wxRadioBox::LayoutItems()
+bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
+                         const wxPoint &pos, const wxSize &size,
+                         int n, const wxString choices[], int majorDim,
+                         long style, const wxValidator& validator,
+                         const wxString &name )

 {
 {

-    int x = 7;
-    int y = 15;
-    
-    int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1;
-    
-    wxSize res( 0, 0 );
-  
-    if (m_windowStyle & wxRA_HORIZONTAL)
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))

     {
     {

-       
-        for (int j = 0; j < m_majorDim; j++)
-       {
-            y = 15;
-           
-            int max_len = 0;
-            wxNode *node = m_boxes.Nth( j*num_per_major );
-           for (int i1 = 0; i1< num_per_major; 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 += 20;
-               
-               node = node->Next();
-               if (!node) break;
-           }
-           
-           // we don't know the max_len before
-           
-            node = m_boxes.Nth( j*num_per_major );
-           for (int i2 = 0; i2< num_per_major; i2++)
-           {
-                GtkWidget *button = GTK_WIDGET( node->Data() );
-               
-               gtk_widget_set_usize( 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;
+        wxFAIL_MSG( wxT("wxRadioBox creation failed") );
+        return false;

     }
     }

-    else
+
+    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();
+
+    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++)

     {
     {

-        int max = 0;
+        if ( i != 0 )
+            radio_button_group = gtk_radio_button_get_group( GTK_RADIO_BUTTON(m_radio) );
+
+        label.Empty();
+        for ( const wxChar *pc = choices[i]; *pc; pc++ )
+        {
+            if ( *pc != wxT('&') )
+                label += *pc;
+        }
+
+        m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, wxGTK_CONV( label ) ) );
+        gtk_widget_show( GTK_WIDGET(m_radio) );
+
+        g_signal_connect (m_radio, "key_press_event",
+                          G_CALLBACK (gtk_radiobox_keypress_callback), this);
+
+        m_boxes.Append( (wxObject*) m_radio );

 
 

-        wxNode *node = m_boxes.First();
-        while (node)
+        if (HasFlag(wxRA_SPECIFY_COLS))

         {
         {

-            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();
+            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 );

         }
         }

-    
-        node = m_boxes.First();
-        while (node)
+        else

         {
         {

-            GtkWidget *button = GTK_WIDGET( node->Data() );
-    
-            gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y );
-            x += max;
-            gtk_widget_set_usize( button, max, 20 );
-      
-            node = node->Next();
+            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 );

         }
         }

-       res.x = x+4;
-       res.y = 42;
+
+        ConnectWidget( GTK_WIDGET(m_radio) );
+
+        if (!i)
+            gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_radio), TRUE );
+
+        g_signal_connect (m_radio, "clicked",
+                          G_CALLBACK (gtk_radiobutton_clicked_callback), this);
+        g_signal_connect (m_radio, "focus_in_event",
+                          G_CALLBACK (gtk_radiobutton_focus_in), this);
+        g_signal_connect (m_radio, "focus_out_event",
+                          G_CALLBACK (gtk_radiobutton_focus_out), this);

     }
     }

-    
-    return res;
+
+    m_parent->DoAddChild( this );
+
+    PostCreation(size);
+
+    return true;

 }
 
 }
 

-bool wxRadioBox::Show( bool show )
+wxRadioBox::~wxRadioBox()

 {
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, "invalid radiobox" );
-  
-    wxWindow::Show( show );
-
-    wxNode *node = m_boxes.First();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkWidget *button = GTK_WIDGET( node->Data() );
-    
-        if (show) gtk_widget_show( button ); else gtk_widget_hide( button );
-    
-        node = node->Next();
+        GtkWidget *button = GTK_WIDGET( node->GetData() );
+        gtk_widget_destroy( button );
+        node = node->GetNext();

     }
     }

-
-    return TRUE;

 }
 
 }
 

-int wxRadioBox::FindString( const wxString &s ) const
+bool wxRadioBox::Show( bool show )

 {
 {

-    wxCHECK_MSG( m_widget != NULL, -1, "invalid radiobox" );
-  
-    int count = 0;
-  
-    wxNode *node = m_boxes.First();
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
+
+    if (!wxControl::Show(show))
+    {
+        // nothing to do
+        return false;
+    }
+
+    if ( HasFlag(wxNO_BORDER) )
+        gtk_widget_hide( m_widget );
+
+    wxList::compatibility_iterator node = m_boxes.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkButton *button = GTK_BUTTON( node->Data() );
-    
-        GtkLabel *label = GTK_LABEL( button->child );
-        if (s == label->label) return count;
-        count++;
-    
-        node = node->Next();
+        GtkWidget *button = GTK_WIDGET( node->GetData() );
+
+        if (show)
+            gtk_widget_show( button );
+        else
+            gtk_widget_hide( button );
+
+        node = node->GetNext();

     }
     }

-  
-    return -1;
+
+    return true;

 }
 
 void wxRadioBox::SetFocus()
 {
 }
 
 void wxRadioBox::SetFocus()
 {

-    wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
-    
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
+

     if (m_boxes.GetCount() == 0) return;
     if (m_boxes.GetCount() == 0) return;

-    
-    wxNode *node = m_boxes.First();
+
+    wxList::compatibility_iterator node = m_boxes.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
+        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );

         if (button->active)
         if (button->active)

-       {
+        {

             gtk_widget_grab_focus( GTK_WIDGET(button) );
             gtk_widget_grab_focus( GTK_WIDGET(button) );

-           
-           return;
-       }
-        node = node->Next();
+            return;
+        }
+        node = node->GetNext();

     }
     }

-    

 }
 
 void wxRadioBox::SetSelection( int n )
 {
 }
 
 void wxRadioBox::SetSelection( int n )
 {

-    wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
-  
-    wxNode *node = m_boxes.Nth( n );
-  
-    wxCHECK_RET( node, "radiobox wrong index" );
-  
-    GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
-  
-    gtk_toggle_button_set_state( button, 1 );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
+
+    wxList::compatibility_iterator node = m_boxes.Item( n );
+
+    wxCHECK_RET( node, wxT("radiobox wrong index") );
+
+    GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );
+
+    GtkDisableEvents();
+
+    gtk_toggle_button_set_active( button, 1 );
+
+    GtkEnableEvents();

 }
 
 int wxRadioBox::GetSelection(void) const
 {
 }
 
 int wxRadioBox::GetSelection(void) const
 {

-    wxCHECK_MSG( m_widget != NULL, -1, "invalid radiobox" );
-  
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid radiobox") );
+

     int count = 0;
     int count = 0;

-  
-    wxNode *node = m_boxes.First();
+
+    wxList::compatibility_iterator node = m_boxes.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
+        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );

         if (button->active) return count;
         count++;
         if (button->active) return count;
         count++;

-        node = node->Next();
+        node = node->GetNext();

     }
     }

-  
-    wxFAIL_MSG( "wxRadioBox none selected" );
-  
-    return -1;
+
+    wxFAIL_MSG( wxT("wxRadioBox none selected") );
+
+    return wxNOT_FOUND;

 }
 
 wxString wxRadioBox::GetString( int n ) const
 {
 }
 
 wxString wxRadioBox::GetString( int n ) const
 {

-    wxCHECK_MSG( m_widget != NULL, "", "invalid radiobox" );
-  
-    wxNode *node = m_boxes.Nth( n );
-  
-    wxCHECK_MSG( node, "", "radiobox wrong index" );
-  
-    GtkButton *button = GTK_BUTTON( node->Data() );
-    GtkLabel *label = GTK_LABEL( button->child );
-  
-    return wxString( label->label );
-}
-
-wxString wxRadioBox::GetLabel( int item ) const
-{
-    wxCHECK_MSG( m_widget != NULL, "", "invalid radiobox" );
-  
-    return GetString( item );
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") );
+
+    wxList::compatibility_iterator node = m_boxes.Item( n );
+
+    wxCHECK_MSG( node, wxEmptyString, wxT("radiobox wrong index") );
+
+    GtkLabel *label = GTK_LABEL(GTK_BIN(node->GetData())->child);
+
+    wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
+
+    return str;

 }
 
 void wxRadioBox::SetLabel( const wxString& label )
 {
 }
 
 void wxRadioBox::SetLabel( const wxString& label )
 {

-    wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
-  
-    wxControl::SetLabel( label );
-  
-    gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel() );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
+
+    GTKSetLabelForFrame(GTK_FRAME(m_widget), label);

 }
 
 }
 

-void wxRadioBox::SetLabel( int item, const wxString& label )
-{
-    wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
-  
-    wxNode *node = m_boxes.Nth( item );
-  
-    wxCHECK_RET( node, "radiobox wrong index" );
-  
-    GtkButton *button = GTK_BUTTON( node->Data() );
-    GtkLabel *g_label = GTK_LABEL( button->child );
-  
-    gtk_label_set( g_label, label );
-}
-
-void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
+void wxRadioBox::SetString( int item, const wxString& label )

 {
 {

-    wxFAIL_MSG("wxRadioBox::SetLabel not implemented.");
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
+
+    wxList::compatibility_iterator node = m_boxes.Item( item );
+
+    wxCHECK_RET( node, wxT("radiobox wrong index") );
+
+    GtkLabel *g_label = GTK_LABEL(GTK_BIN(node->GetData())->child);
+
+    gtk_label_set_text( g_label, wxGTK_CONV( label ) );

 }
 
 }
 

-void wxRadioBox::Enable( bool enable )
+bool wxRadioBox::Enable( bool enable )

 {
 {

-    wxControl::Enable( enable );
-  
-    wxNode *node = m_boxes.First();
+    if ( !wxControl::Enable( enable ) )
+        return false;
+
+    wxList::compatibility_iterator node = m_boxes.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkButton *button = GTK_BUTTON( node->Data() );
-        GtkWidget *label = button->child;
+        GtkButton *button = GTK_BUTTON( node->GetData() );
+        GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child);
+

         gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
         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;

 }
 
 }
 

-void wxRadioBox::Enable( int item, bool enable )
+bool wxRadioBox::Enable( int item, bool enable )

 {
 {

-    wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
-  
-    wxNode *node = m_boxes.Nth( item );
-  
-    wxCHECK_RET( node, "radiobox wrong index" );
-  
-    GtkButton *button = GTK_BUTTON( node->Data() );
-    GtkWidget *label = button->child;
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
+
+    wxList::compatibility_iterator node = m_boxes.Item( item );
+
+    wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
+
+    GtkButton *button = GTK_BUTTON( node->GetData() );
+    GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child);
+

     gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
     gtk_widget_set_sensitive( GTK_WIDGET(button), enable );

-    gtk_widget_set_sensitive( label, enable );
+    gtk_widget_set_sensitive( GTK_WIDGET(label), enable );
+
+    return true;
+}
+
+bool wxRadioBox::IsItemEnabled(int item) const
+{
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
+
+    wxList::compatibility_iterator node = m_boxes.Item( item );
+
+    wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
+
+    GtkButton *button = GTK_BUTTON( node->GetData() );
+
+    // 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));

 }
 
 }
 

-void wxRadioBox::Show( int item, bool show )
+bool wxRadioBox::Show( int item, bool show )

 {
 {

-    wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
-  
-    wxNode *node = m_boxes.Nth( item );
-  
-    wxCHECK_RET( node, "radiobox wrong index" );
-  
-    GtkWidget *button = GTK_WIDGET( node->Data() );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
+
+    wxList::compatibility_iterator node = m_boxes.Item( item );
+
+    wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
+
+    GtkWidget *button = GTK_WIDGET( node->GetData() );

 
     if (show)
         gtk_widget_show( button );
     else
         gtk_widget_hide( button );
 
     if (show)
         gtk_widget_show( button );
     else
         gtk_widget_hide( button );

+
+    return true;

 }
 
 }
 

-wxString wxRadioBox::GetStringSelection(void) const
+bool wxRadioBox::IsItemShown(int item) const

 {
 {

-    wxCHECK_MSG( m_widget != NULL, "", "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();
-    }
-  
-    wxFAIL_MSG( "wxRadioBox none selected" );
-    return "";
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
+
+    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));

 }
 
 }
 

-bool wxRadioBox::SetStringSelection( const wxString &s )
+int wxRadioBox::GetCount() const

 {
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, "invalid radiobox" ); 
-  
-    int res = FindString( s );
-    if (res == -1) return FALSE;
-    SetSelection( res );
-    
-    return TRUE;
+    return m_boxes.GetCount();

 }
 
 }
 

-int wxRadioBox::Number(void) const
+void wxRadioBox::GtkDisableEvents()

 {
 {

-    return m_boxes.Number();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
+    while (node)
+    {
+        g_signal_handlers_disconnect_by_func (node->GetData(),
+                                              (gpointer) gtk_radiobutton_clicked_callback,
+                                              this);
+
+        node = node->GetNext();
+    }

 }
 
 }
 

-int wxRadioBox::GetNumberOfRowsOrCols(void) const
+void wxRadioBox::GtkEnableEvents()

 {
 {

-    return 1;
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
+    while (node)
+    {
+        g_signal_connect (node->GetData(), "clicked",
+                          G_CALLBACK (gtk_radiobutton_clicked_callback), this);
+
+        node = node->GetNext();
+    }

 }
 
 }
 

-void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
+void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style)

 {
 {

-    wxFAIL_MSG("wxRadioBox::SetNumberOfRowsOrCols not implemented.");
+    gtk_widget_modify_style( m_widget, style );
+    gtk_widget_modify_style(GTK_FRAME(m_widget)->label_widget, style);
+
+    wxList::compatibility_iterator node = m_boxes.GetFirst();
+    while (node)
+    {
+        GtkWidget *widget = GTK_WIDGET( node->GetData() );
+
+        gtk_widget_modify_style( widget, style );
+        gtk_widget_modify_style(GTK_BIN(widget)->child, style);
+
+        node = node->GetNext();
+    }

 }
 
 }
 

-void wxRadioBox::ApplyWidgetStyle()
+#if wxUSE_TOOLTIPS
+void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )

 {
 {

-    SetWidgetStyle();
-  
-    gtk_widget_set_style( m_widget, m_widgetStyle );
-  
-    wxNode *node = m_boxes.First();
+    wxList::compatibility_iterator node = m_boxes.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkWidget *widget = GTK_WIDGET( node->Data() );
-        gtk_widget_set_style( widget, m_widgetStyle );
-    
-        GtkButton *button = GTK_BUTTON( node->Data() );
-        gtk_widget_set_style( button->child, m_widgetStyle );
-    
-        node = node->Next();
+        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 )
 {
 
 bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
 {

-    if (window == m_widget->window) return TRUE;
-  
-    wxNode *node = m_boxes.First();
+    if (window == m_widget->window)
+        return true;
+
+    wxList::compatibility_iterator node = m_boxes.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkWidget *button = GTK_WIDGET( node->Data() );
-    
-        if (window == button->window) return TRUE;
-    
-        node = node->Next();
+        GtkWidget *button = GTK_WIDGET( node->GetData() );
+
+        if (window == button->window)
+            return true;
+
+        node = node->GetNext();

     }
     }

-  
-    return FALSE;
+
+    return false;

 }
 }

+
+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