X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2ff89d648e5b73172dc2f4aa84d2aadbdc063ec..2e98aa124386e26c78ca725430c0b0c692db9fc2:/src/gtk/radiobox.cpp

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index abe3aed93d..686e8979ae 100644
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -23,13 +23,6 @@
 
 #include "wx/gtk/win_gtk.h"
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -72,6 +65,20 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_
     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) &&
@@ -86,7 +93,7 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_
         return FALSE;
     }
 
-    gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
+    g_signal_stop_emission_by_name (widget, "key_press_event");
 
     if ((gdk_event->keyval == GDK_Up) ||
         (gdk_event->keyval == GDK_Left))
@@ -222,7 +229,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
     for (int i = 0; i < 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(m_radio) );
 
         label.Empty();
         for ( const wxChar *pc = choices[i]; *pc; pc++ )
@@ -234,8 +241,8 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
         m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, wxGTK_CONV( label ) ) );
         gtk_widget_show( GTK_WIDGET(m_radio) );
 
-        gtk_signal_connect( GTK_OBJECT(m_radio), "key_press_event",
-           GTK_SIGNAL_FUNC(gtk_radiobox_keypress_callback), (gpointer)this );
+        g_signal_connect (m_radio, "key_press_event",
+                          G_CALLBACK (gtk_radiobox_keypress_callback), this);
 
         m_boxes.Append( (wxObject*) m_radio );
 
@@ -260,16 +267,15 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
         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 );
+        if (!i)
+            gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_radio), TRUE );
 
-        gtk_signal_connect( GTK_OBJECT(m_radio), "focus_in_event",
-            GTK_SIGNAL_FUNC(gtk_radiobutton_focus_in), (gpointer)this );
-
-        gtk_signal_connect( GTK_OBJECT(m_radio), "focus_out_event",
-            GTK_SIGNAL_FUNC(gtk_radiobutton_focus_out), (gpointer)this );
+        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);
     }
 
     m_parent->DoAddChild( this );
@@ -383,13 +389,9 @@ wxString wxRadioBox::GetString( int n ) const
 
     wxCHECK_MSG( node, wxEmptyString, wxT("radiobox wrong index") );
 
-    GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
+    GtkLabel *label = GTK_LABEL(GTK_BIN(node->GetData())->child);
 
-#ifdef __WXGTK20__
     wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
-#else
-    wxString str( label->label );
-#endif
 
     return str;
 }
@@ -409,9 +411,9 @@ void wxRadioBox::SetString( int item, const wxString& label )
 
     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())->child);
 
-    gtk_label_set( g_label, wxGTK_CONV( label ) );
+    gtk_label_set_text( g_label, wxGTK_CONV( label ) );
 }
 
 bool wxRadioBox::Enable( bool enable )
@@ -423,7 +425,7 @@ bool wxRadioBox::Enable( bool enable )
     while (node)
     {
         GtkButton *button = GTK_BUTTON( node->GetData() );
-        GtkLabel *label = GTK_LABEL( BUTTON_CHILD(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 );
@@ -442,7 +444,7 @@ bool wxRadioBox::Enable( int item, bool enable )
     wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 
     GtkButton *button = GTK_BUTTON( node->GetData() );
-    GtkLabel *label = GTK_LABEL( BUTTON_CHILD(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 );
@@ -506,8 +508,9 @@ void wxRadioBox::GtkDisableEvents()
     wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
-        gtk_signal_disconnect_by_func( GTK_OBJECT(node->GetData()),
-           GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+        g_signal_handlers_disconnect_by_func (node->GetData(),
+                                              (gpointer) gtk_radiobutton_clicked_callback,
+                                              this);
 
         node = node->GetNext();
     }
@@ -518,8 +521,8 @@ void wxRadioBox::GtkEnableEvents()
     wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
-        gtk_signal_connect( GTK_OBJECT(node->GetData()), "clicked",
-           GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+        g_signal_connect (node->GetData(), "clicked",
+                          G_CALLBACK (gtk_radiobutton_clicked_callback), this);
 
         node = node->GetNext();
     }
@@ -528,10 +531,7 @@ void wxRadioBox::GtkEnableEvents()
 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
 
     wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
@@ -539,7 +539,7 @@ void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style)
         GtkWidget *widget = GTK_WIDGET( node->GetData() );
 
         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();
     }