Listctrl updates

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

diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp
index a9a81ed5ab262b6dfd6c9471426c0a3c28775692..e42dcfd56b038eed016a1b4a4880a6bdd9dff56b 100644 (file)
--- a/src/gtk1/radiobut.cpp
+++ b/src/gtk1/radiobut.cpp
@@ -2,9 +2,8 @@
 // Name:        radiobut.cpp
 // Purpose:
 // Author:      Robert Roebling
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -61,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;


@@ -70,6 +76,8 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
 
 void wxRadioButton::SetLabel( const wxString& label )
 {
 
 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 );
   wxControl::SetLabel( label );
   GtkButton *bin = GTK_BUTTON( m_widget );
   GtkLabel *g_label = GTK_LABEL( bin->child );


@@ -78,46 +86,32 @@ void wxRadioButton::SetLabel( const wxString& label )
 
 void wxRadioButton::SetValue( bool val )
 {
 
 void wxRadioButton::SetValue( bool val )
 {

+  wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
+  

   gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), val );
 }
 
 bool wxRadioButton::GetValue(void) const
 {
   gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), val );
 }
 
 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 )
 {
   return GTK_TOGGLE_BUTTON(m_widget)->active;
 }
 
 void wxRadioButton::Enable( bool enable )
 {

+  wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
+  

   wxControl::Enable( enable );
   wxControl::Enable( enable );

-  GtkButton *bin = GTK_BUTTON( m_widget );
-  GtkWidget *label = bin->child;
-  gtk_widget_set_sensitive( label, enable );
+  
+  gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );

 }
 
 }
 

-void wxRadioButton::SetFont( const wxFont &font )
+void wxRadioButton::ApplyWidgetStyle()

 {
 {

-  if (((wxFont*)&font)->Ok())
-    m_font = font;
-  else
-    m_font = *wxSWISS_FONT;
-  
-  GtkButton *bin = GTK_BUTTON( m_widget );
-  GtkWidget *label = bin->child;
-  
-  GtkStyle *style = (GtkStyle*) NULL;
-  if (!m_hasOwnStyle)
-  {
-    m_hasOwnStyle = TRUE;
-    style = gtk_style_copy( gtk_widget_get_style( label ) );
-  }
-  else
-  {
-    style = gtk_widget_get_style( label );
-  }
-  
-  gdk_font_unref( style->font );
-  style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
-  
-  gtk_widget_set_style( label, style );
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+  gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );

 }
 
 }
 

+