X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01111366c9b4ea40eee7f4b13ddfe6f6b9f886db..03ab016d6692ccceafb0f324a063bbf8f334f020:/src/gtk/button.cpp

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index b0278860ac..8c91ec2adc 100644
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -2,7 +2,7 @@
 // Name:        button.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $id$
+// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,6 +13,9 @@
 
 #include "wx/button.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
@@ -45,37 +48,51 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *
 
 IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
 
-wxButton::wxButton(void)
+wxButton::wxButton()
 {
 }
 
+wxButton::~wxButton()
+{
+  if (m_clientData) delete m_clientData;
+}
+
 bool wxButton::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;
+    m_clientData = (wxClientData*) NULL;
+    m_needParent = TRUE;
+    m_acceptsFocus = TRUE;
 
-  wxSize newSize = size;
+    wxSize newSize = size;
 
-  PreCreation( parent, id, pos, newSize, style, name );
+    PreCreation( parent, id, pos, newSize, style, name );
   
-  SetValidator( validator );
+    SetValidator( validator );
 
-  m_widget = gtk_button_new_with_label( m_label );
-  SetLabel(label);
+    m_widget = gtk_button_new_with_label( m_label );
+    SetLabel(label);
 
-  if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label );
-  if (newSize.y == -1) newSize.y = 26;
-  SetSize( newSize.x, newSize.y );
+    if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label );
+    if (newSize.y == -1) newSize.y = 26;
+    SetSize( newSize.x, newSize.y );
 
-  gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
-    GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
+    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
+      GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
 
-  PostCreation();
+    m_parent->AddChild( this );
 
-  Show( TRUE );
+    (m_parent->m_insertCallback)( m_parent, this );
+  
+    PostCreation();
+  
+    SetBackgroundColour( parent->GetBackgroundColour() );
+    SetForegroundColour( parent->GetForegroundColour() );
+
+    Show( TRUE );
 
-  return TRUE;
+    return TRUE;
 }
 
 void wxButton::SetDefault(void)
@@ -88,43 +105,27 @@ void wxButton::SetDefault(void)
 
 void wxButton::SetLabel( const wxString &label )
 {
-  wxControl::SetLabel( label );
-  GtkButton *bin = GTK_BUTTON( m_widget );
-  GtkLabel *g_label = GTK_LABEL( bin->child );
-  gtk_label_set( g_label, GetLabel() );
+    wxCHECK_RET( m_widget != NULL, "invalid button" );
+  
+    wxControl::SetLabel( label );
+  
+    gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel() );
 }
 
 void wxButton::Enable( bool enable )
 {
-  wxControl::Enable( enable );
-  GtkButton *bin = GTK_BUTTON( m_widget );
-  GtkWidget *label = bin->child;
-  gtk_widget_set_sensitive( label, enable );
+    wxCHECK_RET( m_widget != NULL, "invalid button" );
+  
+    wxControl::Enable( enable );
+  
+    gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
 }
 
-void wxButton::SetFont( const wxFont &font )
+void wxButton::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 );
 }
+
+