Wrong order of calls

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

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 66adc7a20703548a1583586bc2a697ea6558455c..33f01ccb61e1bd8be181309cdfd2663913109467 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -14,28 +14,42 @@
 
 #include "wx/radiobox.h"
 
 
 #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/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

 
 

-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+class wxGTKRadioButtonInfo : public wxObject
+{
+public:
+    wxGTKRadioButtonInfo( GtkRadioButton * abutton, const wxRect & arect )
+    : button( abutton ), rect( arect ) {}
+
+    GtkRadioButton * button;
+    wxRect           rect;
+};

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

+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST( wxRadioBoxButtonsInfoList )
+

 extern bool          g_blockEventsOnDrag;
 extern bool          g_blockEventsOnDrag;

-extern wxWindowGTK  *g_delayedFocus;

 
 //-----------------------------------------------------------------------------
 // "clicked"
 
 //-----------------------------------------------------------------------------
 // "clicked"


@@ -44,8 +58,6 @@ extern wxWindowGTK  *g_delayedFocus;
 extern "C" {
 static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, 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_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 


@@ -55,7 +67,7 @@ static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBo
     event.SetInt( rb->GetSelection() );
     event.SetString( rb->GetStringSelection() );
     event.SetEventObject( rb );
     event.SetInt( rb->GetSelection() );
     event.SetString( rb->GetStringSelection() );
     event.SetEventObject( rb );

-    rb->GetEventHandler()->ProcessEvent(event);
+    rb->HandleWindowEvent(event);

 }
 }
 
 }
 }
 


@@ -66,12 +78,23 @@ static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBo
 extern "C" {
 static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxRadioBox *rb )
 {
 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 (!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()->HandleWindowEvent(new_event);
+    }
+

     if ((gdk_event->keyval != GDK_Up) &&
         (gdk_event->keyval != GDK_Down) &&
         (gdk_event->keyval != GDK_Left) &&
     if ((gdk_event->keyval != GDK_Up) &&
         (gdk_event->keyval != GDK_Down) &&
         (gdk_event->keyval != GDK_Left) &&


@@ -80,31 +103,33 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_
         return FALSE;
     }
 
         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;
     }
 
     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 ((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
     {
         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();
     }
 
         else
             node = node->GetNext();
     }
 

-    GtkWidget *button = (GtkWidget*) node->GetData();
+    GtkWidget *button = (GtkWidget*) node->GetData()->button;

 
     gtk_widget_grab_focus( button );
 
 
     gtk_widget_grab_focus( button );
 


@@ -113,65 +138,65 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_
 }
 
 extern "C" {
 }
 
 extern "C" {

-static gint gtk_radiobutton_focus_in( GtkWidget *widget,
-                                      GdkEvent *WXUNUSED(event),
-                                      wxRadioBox *win )
+static gint gtk_radiobutton_focus_out( GtkWidget * WXUNUSED(widget),
+                                       GdkEventFocus *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 );
-    }
+    // NB: This control is composed of several GtkRadioButton widgets and
+    //     when focus changes from one of them to another in the same
+    //     wxRadioBox, we get a focus-out event followed by focus-in for
+    //     another GtkRadioButton owned by the same control. We don't want
+    //     to generate two spurious wxEVT_SET_FOCUS events in this case,
+    //     so we defer sending wx events until idle time.
+    win->GTKHandleFocusOut();

 
 

+    // never stop the signal emission, it seems to break the kbd handling
+    // inside the radiobox

     return FALSE;
 }
 }
 
 extern "C" {
     return FALSE;
 }
 }
 
 extern "C" {

-static gint gtk_radiobutton_focus_out( GtkWidget *widget,
-                                       GdkEvent *WXUNUSED(event),
-                                       wxRadioBox *win )
+static gint gtk_radiobutton_focus_in( GtkWidget * WXUNUSED(widget),
+                                      GdkEventFocus *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;
+    win->GTKHandleFocusIn();

 
 

+    // never stop the signal emission, it seems to break the kbd handling
+    // inside the radiobox

     return FALSE;
 }
 }
 
     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
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
 
 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
 

-void wxRadioBox::Init()
-{
-    m_needParent = true;
-    m_acceptsFocus = true;
-
-    m_hasFocus =
-    m_lostFocus = false;
-}
-

 bool wxRadioBox::Create( wxWindow *parent, wxWindowID id,
                          const wxString& title,
                          const wxPoint &pos, const wxSize &size,
 bool wxRadioBox::Create( wxWindow *parent, wxWindowID id,
                          const wxString& title,
                          const wxPoint &pos, const wxSize &size,


@@ -198,28 +223,25 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
         return false;
     }
 
         return false;
     }
 

-    m_widget = gtk_frame_new( wxGTK_CONV( title ) );
+    m_widget = GTKCreateFrame(title);
+    g_object_ref(m_widget);
+    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);
+    }
+

 
     // majorDim may be 0 if all trailing parameters were omitted, so don't
     // assert here but just use the correct value for it
 
     // 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);

 
 

-    int num_per_major = (n - 1) / m_majorDim +1;

 
 

-    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;
-    }
+    unsigned int num_of_cols = GetColumnCount();
+    unsigned int num_of_rows = GetRowCount();

 
 

-    GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
+    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 );
 
     GtkWidget *table = gtk_table_new( num_of_rows, num_of_cols, FALSE );
     gtk_table_set_col_spacings( GTK_TABLE(table), 1 );


@@ -229,25 +251,26 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
     wxString label;
     GSList *radio_button_group = (GSList *) NULL;
 
     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 )
     {
         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();
 
         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;
         }
 
         {
             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) );
+        rbtn = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, wxGTK_CONV( label ) ) );
+        gtk_widget_show( GTK_WIDGET(rbtn) );

 
 

-        gtk_signal_connect( GTK_OBJECT(m_radio), "key_press_event",
-           GTK_SIGNAL_FUNC(gtk_radiobox_keypress_callback), (gpointer)this );
+        g_signal_connect (rbtn, "key_press_event",
+                          G_CALLBACK (gtk_radiobox_keypress_callback), this);

 
 

-        m_boxes.Append( (wxObject*) m_radio );
+        m_buttonsInfo.Append( new wxGTKRadioButtonInfo( rbtn, wxRect() ) );

 
         if (HasFlag(wxRA_SPECIFY_COLS))
         {
 
         if (HasFlag(wxRA_SPECIFY_COLS))
         {


@@ -255,7 +278,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
             int right = (i%num_of_cols) + 1;
             int top = i/num_of_cols;
             int bottom = (i/num_of_cols)+1;
             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_table_attach( GTK_TABLE(table), GTK_WIDGET(rbtn), left, right, top, bottom,

                   GTK_FILL, GTK_FILL, 1, 1 );
         }
         else
                   GTK_FILL, GTK_FILL, 1, 1 );
         }
         else


@@ -264,28 +287,27 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
             int right = (i/num_of_rows) + 1;
             int top = i%num_of_rows;
             int bottom = (i%num_of_rows)+1;
             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_table_attach( GTK_TABLE(table), GTK_WIDGET(rbtn), left, right, top, bottom,

                   GTK_FILL, GTK_FILL, 1, 1 );
         }
 
                   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 );
+        ConnectWidget( GTK_WIDGET(rbtn) );

 
 

-        gtk_signal_connect( GTK_OBJECT(m_radio), "focus_in_event",
-            GTK_SIGNAL_FUNC(gtk_radiobutton_focus_in), (gpointer)this );
+        if (!i)
+            gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(rbtn), TRUE );

 
 

-        gtk_signal_connect( GTK_OBJECT(m_radio), "focus_out_event",
-            GTK_SIGNAL_FUNC(gtk_radiobutton_focus_out), (gpointer)this );
+        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 );
 
     }
 
     m_parent->DoAddChild( this );
 

-    SetLabel( title );
-

     PostCreation(size);
 
     return true;
     PostCreation(size);
 
     return true;


@@ -293,13 +315,14 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
 wxRadioBox::~wxRadioBox()
 {
 
 wxRadioBox::~wxRadioBox()
 {

-    wxList::compatibility_iterator node = m_boxes.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkWidget *button = GTK_WIDGET( node->GetData() );
+        GtkWidget *button = GTK_WIDGET( node->GetData()->button );

         gtk_widget_destroy( button );
         node = node->GetNext();
     }
         gtk_widget_destroy( button );
         node = node->GetNext();
     }

+    WX_CLEAR_LIST( wxRadioBoxButtonsInfoList, m_buttonsInfo );

 }
 
 bool wxRadioBox::Show( bool show )
 }
 
 bool wxRadioBox::Show( bool show )


@@ -315,12 +338,15 @@ bool wxRadioBox::Show( bool show )
     if ( HasFlag(wxNO_BORDER) )
         gtk_widget_hide( m_widget );
 
     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)
     {
     while (node)
     {

-        GtkWidget *button = GTK_WIDGET( node->GetData() );
+        GtkWidget *button = GTK_WIDGET( node->GetData()->button );

 
 

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

 
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }


@@ -328,60 +354,15 @@ bool wxRadioBox::Show( bool show )
     return true;
 }
 
     return true;
 }
 

-int wxRadioBox::FindString( const wxString &find, bool bCase ) const
-{
-    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid radiobox") );
-
-    int count = 0;
-
-    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.IsSameAs( str, bCase ))
-            return count;
-
-        count++;
-
-        node = node->GetNext();
-    }
-
-    return wxNOT_FOUND;
-}
-
-void wxRadioBox::SetFocus()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
-
-    if (m_boxes.GetCount() == 0) return;
-
-    wxList::compatibility_iterator node = m_boxes.GetFirst();
-    while (node)
-    {
-        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );
-        if (button->active)
-        {
-            gtk_widget_grab_focus( GTK_WIDGET(button) );
-            return;
-        }
-        node = node->GetNext();
-    }
-}
-

 void wxRadioBox::SetSelection( int n )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
 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") );
 
 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 

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

 
     GtkDisableEvents();
 
 
     GtkDisableEvents();
 


@@ -396,10 +377,10 @@ int wxRadioBox::GetSelection(void) const
 
     int count = 0;
 
 
     int count = 0;
 

-    wxList::compatibility_iterator node = m_boxes.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();

     while (node)
     {
     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();
         if (button->active) return count;
         count++;
         node = node->GetNext();


@@ -410,21 +391,17 @@ int wxRadioBox::GetSelection(void) const
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 

-wxString wxRadioBox::GetString( int n ) const
+wxString wxRadioBox::GetString(unsigned int n) const

 {
     wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") );
 
 {
     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, wxEmptyString, 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) ) );
     wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );

-#else
-    wxString str( label->label );
-#endif

 
     return str;
 }
 
     return str;
 }


@@ -433,22 +410,20 @@ void wxRadioBox::SetLabel( const wxString& label )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 

-    wxControl::SetLabel( label );
-
-    gtk_frame_set_label( GTK_FRAME(m_widget), wxGTK_CONV( wxControl::GetLabel() ) );
+    GTKSetLabelForFrame(GTK_FRAME(m_widget), label);

 }
 
 }
 

-void wxRadioBox::SetString( int item, const wxString& label )
+void wxRadioBox::SetString(unsigned int item, const wxString& label)

 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
 {
     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") );
 
 
     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 )
 }
 
 bool wxRadioBox::Enable( bool enable )


@@ -456,11 +431,11 @@ bool wxRadioBox::Enable( bool enable )
     if ( !wxControl::Enable( enable ) )
         return false;
 
     if ( !wxControl::Enable( enable ) )
         return false;
 

-    wxList::compatibility_iterator node = m_boxes.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();

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


@@ -470,16 +445,16 @@ bool wxRadioBox::Enable( bool enable )
     return true;
 }
 
     return true;
 }
 

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

 {
     wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
 {
     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_MSG( node, false, 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 );
 
     gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
     gtk_widget_set_sensitive( GTK_WIDGET(label), enable );


@@ -487,15 +462,30 @@ bool wxRadioBox::Enable( int item, bool enable )
     return true;
 }
 
     return true;
 }
 

-bool wxRadioBox::Show( int item, bool show )
+bool wxRadioBox::IsItemEnabled(unsigned int item) const
+{
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
+
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item );
+
+    wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
+
+    GtkButton *button = GTK_BUTTON( node->GetData()->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));
+}
+
+bool wxRadioBox::Show(unsigned int item, bool show)

 {
     wxCHECK_MSG( m_widget != NULL, false, 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_MSG( node, false, wxT("radiobox wrong index") );
 
 
     wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 

-    GtkWidget *button = GTK_WIDGET( node->GetData() );
+    GtkWidget *button = GTK_WIDGET( node->GetData()->button );

 
     if (show)
         gtk_widget_show( button );
 
     if (show)
         gtk_widget_show( button );


@@ -505,55 +495,31 @@ bool wxRadioBox::Show( int item, bool show )
     return true;
 }
 
     return true;
 }
 

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

 {
 {

-    wxCHECK_MSG( m_widget != NULL, wxEmptyString, 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()) );
-
-#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( m_widget != NULL, false, wxT("invalid radiobox") );

 
 

-    wxFAIL_MSG( wxT("wxRadioBox none selected") );
-    return wxEmptyString;
-}
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item );

 
 

-bool wxRadioBox::SetStringSelection( const wxString &s )
-{
-    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
+    wxCHECK_MSG( node, false, wxT("radiobox wrong index") );

 
 

-    int res = FindString( s );
-    if (res == wxNOT_FOUND) return false;
-    SetSelection( res );
+    GtkButton *button = GTK_BUTTON( node->GetData()->button );

 
 

-    return true;
+    return GTK_WIDGET_VISIBLE(GTK_WIDGET(button));

 }
 
 }
 

-int wxRadioBox::GetCount() const
+unsigned int wxRadioBox::GetCount() const

 {
 {

-    return m_boxes.GetCount();
+    return m_buttonsInfo.GetCount();

 }
 
 void wxRadioBox::GtkDisableEvents()
 {
 }
 
 void wxRadioBox::GtkDisableEvents()
 {

-    wxList::compatibility_iterator node = m_boxes.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();

     while (node)
     {
     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();
     }
 
         node = node->GetNext();
     }


@@ -561,11 +527,11 @@ void wxRadioBox::GtkDisableEvents()
 
 void wxRadioBox::GtkEnableEvents()
 {
 
 void wxRadioBox::GtkEnableEvents()
 {

-    wxList::compatibility_iterator node = m_boxes.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();

     while (node)
     {
     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();
     }
 
         node = node->GetNext();
     }


@@ -573,75 +539,74 @@ void wxRadioBox::GtkEnableEvents()
 
 void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {
 
 void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {

-    gtk_widget_modify_style( m_widget, style );
-
-#ifdef __WXGTK20__
-    gtk_widget_modify_style(GTK_FRAME(m_widget)->label_widget, style);
-#endif
+    GTKFrameApplyWidgetStyle(GTK_FRAME(m_widget), style);

 
 

-    wxList::compatibility_iterator node = m_boxes.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();

     while (node)
     {
     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( widget, style );

-        gtk_widget_modify_style( BUTTON_CHILD(node->GetData()), style );
+        gtk_widget_modify_style(GTK_BIN(widget)->child, style);

 
         node = node->GetNext();
     }
 }
 
 
         node = node->GetNext();
     }
 }
 

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

 {
 {

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

 }
 }

-#endif // wxUSE_TOOLTIPS

 
 

-bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
+void wxRadioBox::GTKWidgetDoSetMnemonic(GtkWidget* w)

 {
 {

-    if (window == m_widget->window) return true;
+    GTKFrameSetMnemonicWidget(GTK_FRAME(m_widget), w);
+}

 
 

-    wxList::compatibility_iterator node = m_boxes.GetFirst();
-    while (node)
+#if wxUSE_TOOLTIPS
+void wxRadioBox::ApplyToolTip(GtkTooltips * WXUNUSED(tips), const gchar *tip)
+{
+    // 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 *button = GTK_WIDGET( node->GetData() );
-
-        if (window == button->window) return true;
-
-        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());

 
 

-    return false;
+    wxToolTip::Apply(GTK_WIDGET(m_buttonsInfo[n]->button), buf);

 }
 
 }
 

-void wxRadioBox::OnInternalIdle()
+#endif // wxUSE_TOOLTIPS
+
+GdkWindow *wxRadioBox::GTKGetWindow(wxArrayGdkWindows& windows) const

 {
 {

-    if ( m_lostFocus )
+    windows.push_back(m_widget->window);
+
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();
+    while (node)

     {
     {

-        m_hasFocus = false;
-        m_lostFocus = false;
+        GtkWidget *button = GTK_WIDGET( node->GetData()->button );

 
 

-        wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() );
-        event.SetEventObject( this );
+        windows.push_back(button->window);

 
 

-        (void)GetEventHandler()->ProcessEvent( event );
+        node = node->GetNext();

     }
 
     }
 

-    if (g_delayedFocus == this)
-    {
-        if (GTK_WIDGET_REALIZED(m_widget))
-        {
-            g_delayedFocus = NULL;
-            SetFocus();
-        }
-    }
+    return NULL;

 }
 
 // static
 }
 
 // static


@@ -658,23 +623,18 @@ wxRadioBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
     return attr;
 }
 
     return attr;
 }
 

-#if WXWIN_COMPATIBILITY_2_2
-
-int wxRadioBox::Number() const
+int wxRadioBox::GetItemFromPoint(const wxPoint& point) const

 {
 {

-    return GetCount();
-}
-
-wxString wxRadioBox::GetLabel(int n) const
-{
-    return GetString(n);
-}
+    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;
+    }

 
 

-void wxRadioBox::SetLabel( int item, const wxString& label )
-{
-    SetString(item, label);
+    return wxNOT_FOUND;

 }
 
 }
 

-#endif // WXWIN_COMPATIBILITY_2_2
-

 #endif // wxUSE_RADIOBOX
 #endif // wxUSE_RADIOBOX