X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8017ee9be3f4672cf17a4aac59909d5fe522381d..9894cc01c98b0d6fa960d57e9a6155bbb07ed67b:/src/gtk/radiobox.cpp

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index cf1cb5c16e..d10997621e 100644
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -45,6 +45,7 @@ extern wxWindowGTK  *g_delayedFocus;
 // "clicked"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBox *rb )
 {
     if (g_isIdle) wxapp_install_idle_handler();
@@ -60,11 +61,13 @@ static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBo
     event.SetEventObject( rb );
     rb->GetEventHandler()->ProcessEvent(event);
 }
+}
 
 //-----------------------------------------------------------------------------
 // "key_press_event"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxRadioBox *rb )
 {
     if (g_isIdle)
@@ -111,7 +114,9 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_
 
     return TRUE;
 }
+}
 
+extern "C" {
 static gint gtk_radiobutton_focus_in( GtkWidget *widget,
                                       GdkEvent *WXUNUSED(event),
                                       wxRadioBox *win )
@@ -135,7 +140,9 @@ static gint gtk_radiobutton_focus_in( GtkWidget *widget,
 
     return FALSE;
 }
+}
 
+extern "C" {
 static gint gtk_radiobutton_focus_out( GtkWidget *widget,
                                        GdkEvent *WXUNUSED(event),
                                        wxRadioBox *win )
@@ -152,6 +159,7 @@ static gint gtk_radiobutton_focus_out( GtkWidget *widget,
 
     return FALSE;
 }
+}
 
 //-----------------------------------------------------------------------------
 // wxRadioBox
@@ -218,8 +226,8 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
     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), 2 );
-    gtk_table_set_row_spacings( GTK_TABLE(table), 2 );
+    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 );
     
@@ -251,7 +259,8 @@ 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;
-            gtk_table_attach_defaults( GTK_TABLE(table), GTK_WIDGET(m_radio), left, right, top, bottom ); 
+            gtk_table_attach( GTK_TABLE(table), GTK_WIDGET(m_radio), left, right, top, bottom, 
+                  GTK_FILL, GTK_FILL, 1, 1 ); 
         }
         else
         {
@@ -259,7 +268,8 @@ 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;
-            gtk_table_attach_defaults( GTK_TABLE(table), GTK_WIDGET(m_radio), left, right, top, bottom ); 
+            gtk_table_attach( GTK_TABLE(table), GTK_WIDGET(m_radio), left, right, top, bottom, 
+                  GTK_FILL, GTK_FILL, 1, 1 ); 
         }
 
         ConnectWidget( GTK_WIDGET(m_radio) );