Listctrl updates

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

diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp
index a08d452336f69d844e18b44f8dce77e22bd08876..e42dcfd56b038eed016a1b4a4880a6bdd9dff56b 100644 (file)
--- a/src/gtk1/radiobut.cpp
+++ b/src/gtk1/radiobut.cpp
@@ -60,8 +60,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 );
        
   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();
 
   PostCreation();
 

+  SetBackgroundColour( parent->GetBackgroundColour() );
+  SetForegroundColour( parent->GetForegroundColour() );
+  

   Show( TRUE );
 
   return TRUE;
   Show( TRUE );
 
   return TRUE;


@@ -100,23 +107,11 @@ void wxRadioButton::Enable( bool enable )
   gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, 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 );
-  
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );

   gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
 }
 
   gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
 }
 

-void wxRadioButton::SetBackgroundColour( const wxColour &colour )
-{
-  wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
-
-  wxControl::SetBackgroundColour( colour );
-  
-  if (!m_backgroundColour.Ok()) return;
-  
-  gtk_widget_set_style( m_widget, m_widgetStyle );
-}