Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.

[wxWidgets.git] / src / gtk / button.cpp

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 2a26bcc065e1de02857a02d4b2b76bba7c8101cf..8c91ec2adc36c3fc3861641e4ef8a05335a28ae1 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -13,6 +13,9 @@
 
 #include "wx/button.h"
 
 
 #include "wx/button.h"
 

+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------


@@ -45,39 +48,51 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *
 
 IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
 
 
 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 )
 {
 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 );
+    m_parent->AddChild( this );

 
 

-  PostCreation();
+    (m_parent->m_insertCallback)( m_parent, this );

   
   

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

 
 

-  Show( TRUE );
+    Show( TRUE );

 
 

-  return TRUE;
+    return TRUE;

 }
 
 void wxButton::SetDefault(void)
 }
 
 void wxButton::SetDefault(void)


@@ -90,50 +105,27 @@ void wxButton::SetDefault(void)
 
 void wxButton::SetLabel( const wxString &label )
 {
 
 void wxButton::SetLabel( const wxString &label )
 {

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

   
   

-  wxControl::SetLabel( label );
+    wxControl::SetLabel( label );

   
   

-  gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel() );
+    gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel() );

 }
 
 void wxButton::Enable( bool enable )
 {
 }
 
 void wxButton::Enable( bool enable )
 {

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

   
   

-  wxControl::Enable( enable );
+    wxControl::Enable( enable );

   
   

-  gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
+    gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );

 }
 
 }
 

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

 {
 {

-  wxCHECK_RET( m_widget != NULL, "invalid button" );
-  
-  wxControl::SetFont( font );
-  
-  gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widget, m_widgetStyle );
+    gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );

 }
 
 }
 

-void wxButton::SetBackgroundColour( const wxColour &colour )
-{
-  wxCHECK_RET( m_widget != NULL, "invalid button" );
-
-  wxControl::SetBackgroundColour( colour );
-  
-  if (!m_backgroundColour.Ok()) return;
-  
-  gtk_widget_set_style( m_widget, m_widgetStyle );
-}
-
-void wxButton::SetForegroundColour( const wxColour &colour )
-{
-  wxCHECK_RET( m_widget != NULL, "invalid button" );
-
-  wxControl::SetForegroundColour( colour );
-  
-  if (!m_foregroundColour.Ok()) return;
-  
-  gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
-}