some very minor changes

[wxWidgets.git] / src / gtk1 / radiobut.cpp

diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp
index 3cd45f2b8af212b82bba2fd44848002b1690d60c..a0a40eb861d2057e50235ba2d2b27c444e9a9942 100644 (file)
--- a/src/gtk1/radiobut.cpp
+++ b/src/gtk1/radiobut.cpp
@@ -2,9 +2,8 @@
 // Name:        radiobut.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -22,14 +21,20 @@
 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 (rb->m_blockFirstEvent)
+  {
+    rb->m_blockFirstEvent = FALSE;
+    return;
+  } 
+  
   if (g_blockEventsOnDrag) return;
   
   wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId());
@@ -38,6 +43,12 @@ static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRad
   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 )
@@ -50,10 +61,12 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
   
   SetValidator( validator );
 
-  m_widget = gtk_radio_button_new_with_label( NULL, label );
+  m_widget = gtk_radio_button_new_with_label( (GSList *) NULL, label );
       
   SetLabel(label);
 
+  m_blockFirstEvent = FALSE;
+    
   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 );
@@ -61,8 +74,15 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
   gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
     GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
        
+  m_parent->AddChild( this );
+
+  (m_parent->m_insertCallback)( m_parent, this );
+  
   PostCreation();
 
+  SetBackgroundColour( parent->GetBackgroundColour() );
+  SetForegroundColour( parent->GetForegroundColour() );
+  
   Show( TRUE );
 
   return TRUE;
@@ -70,6 +90,8 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
 
 void wxRadioButton::SetLabel( const wxString& label )
 {
+  wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
+  
   wxControl::SetLabel( label );
   GtkButton *bin = GTK_BUTTON( m_widget );
   GtkLabel *g_label = GTK_LABEL( bin->child );
@@ -78,12 +100,34 @@ void wxRadioButton::SetLabel( const wxString& label )
 
 void wxRadioButton::SetValue( bool val )
 {
+  wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
+  
   gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), val );
+  
+  m_blockFirstEvent = TRUE;
 }
 
 bool wxRadioButton::GetValue(void) const
 {
+  wxCHECK_MSG( m_widget != NULL, FALSE, "invalid radiobutton" );
+  
   return GTK_TOGGLE_BUTTON(m_widget)->active;
 }
 
+void wxRadioButton::Enable( bool enable )
+{
+  wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
+  
+  wxControl::Enable( enable );
+  
+  gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
+}
+
+void wxRadioButton::ApplyWidgetStyle()
+{
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+  gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
+}
+