some very minor changes

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

diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp
index d1edb9d78b1761001148a988949e5b26f6aa9a81..a0a40eb861d2057e50235ba2d2b27c444e9a9942 100644 (file)
--- a/src/gtk1/radiobut.cpp
+++ b/src/gtk1/radiobut.cpp
@@ -21,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());
@@ -37,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 )
@@ -53,6 +65,8 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
       
   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 );
@@ -60,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;
@@ -82,6 +103,8 @@ 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
@@ -100,29 +123,11 @@ void wxRadioButton::Enable( bool enable )
   gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
 }
 
-void wxRadioButton::SetFont( const wxFont &font )
+void wxRadioButton::ApplyWidgetStyle()
 {
-  wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
-  
-  wxControl::SetFont( font );
-  
-  gtk_widget_set_style( GTK_BUTTON(m_widget)->child, 
-    gtk_style_ref(
-      gtk_widget_get_style( m_widget ) ) );
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+  gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
 }
 
-void wxRadioButton::SetBackgroundColour( const wxColour &colour )
-{
-  return;
-
-  wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
-
-  wxControl::SetBackgroundColour( colour );
-  
-  if (!m_backgroundColour.Ok()) return;
-  
-  gtk_widget_set_style( GTK_BUTTON(m_widget)->child, 
-    gtk_style_ref(
-      gtk_widget_get_style( m_widget ) ) );
-}