X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/850ff4855026066770d80c376ee6fc864169509c..fb42d7c3b4aa088a51fabf71203e8c5ee784d734:/src/gtk/radiobut.cpp

diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index fbb0a53ced..91c5da2c3e 100644
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -12,10 +12,12 @@
 #pragma implementation "radiobut.h"
 #endif
 
-#include "wx/radiobut.h"
+#include "wx/defs.h"
 
 #if wxUSE_RADIOBOX
 
+#include "wx/radiobut.h"
+
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
@@ -38,7 +40,7 @@ extern wxCursor   g_globalCursor;
 //-----------------------------------------------------------------------------
 
 static 
-void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButton *rb )
+void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *rb )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
@@ -46,6 +48,10 @@ void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButto
   
     if (g_blockEventsOnDrag) return;
   
+    if (!button->active) return;
+    
+    if (rb->m_blockEvent) return;
+  
     wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId());
     event.SetInt( rb->GetValue() );
     event.SetEventObject( rb );
@@ -65,44 +71,46 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
     m_acceptsFocus = TRUE;
     m_needParent = TRUE;
     m_isRadioButton = TRUE;
+    
+    m_blockEvent = FALSE;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxRadioButton creation failed") );
-	return FALSE;
+        return FALSE;
     }
 
     if (HasFlag(wxRB_GROUP))
     {
-        /* start a new group */
+        // start a new group
         m_radioButtonGroup = (GSList*) NULL;
     }
     else
     {
-        /* search backward for last group start */
+        // search backward for last group start
         wxRadioButton *chief = (wxRadioButton*) NULL;
         wxWindowList::Node *node = parent->GetChildren().GetLast();
         while (node)
-	    {
-	        wxWindow *child = node->GetData();
-	        if (child->m_isRadioButton)
-	        {
-	            chief = (wxRadioButton*) child;
-		        if (child->HasFlag(wxRB_GROUP)) break;
-	        }
-	        node = node->GetPrevious();
+        {
+            wxWindow *child = node->GetData();
+            if (child->m_isRadioButton)
+            {
+                chief = (wxRadioButton*) child;
+                if (child->HasFlag(wxRB_GROUP)) break;
+            }
+            node = node->GetPrevious();
+        }
+        if (chief)
+        {
+            // we are part of the group started by chief
+            m_radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) );
         }
-	    if (chief)
-	    {
-            /* we are part of the group started by chief */
-	        m_radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) );
-	    }
-	    else
-	    {
-            /* start a new group */
+        else
+        {
+            // start a new group
             m_radioButtonGroup = (GSList*) NULL;
-	    }
+        }
     }
 
     m_widget = gtk_radio_button_new_with_label( m_radioButtonGroup, label.mbc_str() );
@@ -148,24 +156,24 @@ void wxRadioButton::SetLabel( const wxString& label )
 void wxRadioButton::SetValue( bool val )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") );
-  
+
     if (val == GetValue())
         return;
 
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
-      GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+    m_blockEvent = TRUE;
 
     if (val)
     {
-        gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), TRUE );
+        gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widget), TRUE );
     }
     else
     {
         // should give an assert
+        // RL - No it shouldn't.  A wxGenericValidator might try to set it
+        //      as FALSE.  Failing silently is probably TRTTD here.
     }
-	
-    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
-      GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+
+    m_blockEvent = FALSE;
 }
 
 bool wxRadioButton::GetValue() const
@@ -205,11 +213,11 @@ void wxRadioButton::OnInternalIdle()
     if (GTK_TOGGLE_BUTTON(m_widget)->event_window && cursor.Ok())
     {
         /* I now set the cursor the anew in every OnInternalIdle call
-	   as setting the cursor in a parent window also effects the
-	   windows above so that checking for the current cursor is
-	   not possible. */
-	   
-	   gdk_window_set_cursor( GTK_TOGGLE_BUTTON(m_widget)->event_window, cursor.GetCursor() );
+       as setting the cursor in a parent window also effects the
+       windows above so that checking for the current cursor is
+       not possible. */
+       
+       gdk_window_set_cursor( GTK_TOGGLE_BUTTON(m_widget)->event_window, cursor.GetCursor() );
     }
 
     UpdateWindowUI();