X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58614078c466cffaf0e5d0369741706f130fb793..47765ba2b8bc04fdc00257dcba45dcdb34c451e4:/src/gtk/radiobut.cpp?ds=sidebyside

diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index 4091543d8e..909c1ebf6d 100644
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -14,6 +14,18 @@
 
 #include "wx/radiobut.h"
 
+#if wxUSE_RADIOBOX
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -21,93 +33,157 @@
 extern bool g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
-// wxRadioButton
+// "clicked"
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl)
-  
-static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButton *rb )
+static 
+void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButton *rb )
 {
-  if (!rb->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (!rb->m_hasVMT) return;
   
-  wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId());
-  event.SetInt( rb->GetValue() );
-  event.SetEventObject( rb );
-  rb->GetEventHandler()->ProcessEvent( event );
+    if (g_blockEventsOnDrag) return;
+  
+    wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId());
+    event.SetInt( rb->GetValue() );
+    event.SetEventObject( rb );
+    rb->GetEventHandler()->ProcessEvent( event );
 }
 
+//-----------------------------------------------------------------------------
+// wxRadioButton
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl)
+  
 bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& label,
   const wxPoint& pos,  const wxSize& size, long style,
   const wxValidator& validator, const wxString& name )
 {
-  m_needParent = TRUE;
-
-  wxSize newSize = size;
-
-  PreCreation( parent, id, pos, newSize, style, name );
-  
-  SetValidator( validator );
-
-  m_widget = gtk_radio_button_new_with_label( (GSList *) NULL, label );
+    m_acceptsFocus = TRUE;
+    m_needParent = TRUE;
+    m_isRadioButton = TRUE;
+
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxRadioButton creation failed") );
+	return FALSE;
+    }
+
+    if (HasFlag(wxRB_GROUP))
+    {
+        /* start a new group */
+        m_radioButtonGroup = (GSList*) NULL;
+    }
+    else
+    {
+        /* 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();
+        }
+	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 */
+            m_radioButtonGroup = (GSList*) NULL;
+	}
+    }
+
+    m_widget = gtk_radio_button_new_with_label( m_radioButtonGroup, label.mbc_str() );
       
-  SetLabel(label);
+    SetLabel(label);
 
-  if (newSize.x == -1) newSize.x = 22+gdk_string_measure( m_widget->style->font, label );
-  if (newSize.y == -1) newSize.y = 26;
-  SetSize( newSize.x, newSize.y );
+    wxSize newSize = size;
+    if (newSize.x == -1) newSize.x = 22+gdk_string_measure( m_widget->style->font, label.mbc_str() );
+    if (newSize.y == -1) newSize.y = 26;
+    SetSize( newSize.x, newSize.y );
 
-  gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
-    GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
+      GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
        
-  PostCreation();
+    m_parent->DoAddChild( this );
+  
+    PostCreation();
 
-  SetBackgroundColour( parent->GetBackgroundColour() );
-  SetForegroundColour( parent->GetForegroundColour() );
+    SetBackgroundColour( parent->GetBackgroundColour() );
+    SetForegroundColour( parent->GetForegroundColour() );
+    SetFont( parent->GetFont() );
   
-  Show( TRUE );
+    Show( TRUE );
 
-  return TRUE;
+    return TRUE;
 }
 
 void wxRadioButton::SetLabel( const wxString& label )
 {
-  wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") );
   
-  wxControl::SetLabel( label );
-  GtkButton *bin = GTK_BUTTON( m_widget );
-  GtkLabel *g_label = GTK_LABEL( bin->child );
-  gtk_label_set( g_label, GetLabel() );
+    wxControl::SetLabel( label );
+    GtkButton *bin = GTK_BUTTON( m_widget );
+    GtkLabel *g_label = GTK_LABEL( bin->child );
+    gtk_label_set( g_label, GetLabel().mbc_str() );
 }
 
 void wxRadioButton::SetValue( bool val )
 {
-  wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") );
   
-  gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), val );
+    if (val == GetValue())
+        return;
+
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
+      GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+
+    if (val)
+    {
+        gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), TRUE );
+    }
+    else
+    {
+        // should give an assert
+    }
+	
+    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
+      GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 }
 
-bool wxRadioButton::GetValue(void) const
+bool wxRadioButton::GetValue() const
 {
-  wxCHECK_MSG( m_widget != NULL, FALSE, "invalid radiobutton" );
+    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobutton") );
   
-  return GTK_TOGGLE_BUTTON(m_widget)->active;
+    return GTK_TOGGLE_BUTTON(m_widget)->active;
 }
 
-void wxRadioButton::Enable( bool enable )
+bool wxRadioButton::Enable( bool enable )
 {
-  wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
-  
-  wxControl::Enable( enable );
+    if ( !wxControl::Enable( enable ) )
+        return FALSE;
   
-  gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
+    gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
+
+    return TRUE;
 }
 
 void wxRadioButton::ApplyWidgetStyle()
 {
-  SetWidgetStyle();
-  gtk_widget_set_style( m_widget, m_widgetStyle );
-  gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widget, m_widgetStyle );
+    gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
 }
 
-
+#endif