remove the line for image.h, restore a line commented out by mistake

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 9e64e2579e839a5b5764f904296526b564a8950b..8338f5bcff9ddf14cdf17c5934c1b9b28322cfc8 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -2,9 +2,8 @@
 // Name:        button.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        button.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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -27,11 +26,9 @@ class wxButton;
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------

-// wxButton
+// "clicked"

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
-

 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
 {
   if (!button->HasVMT()) return;
 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
 {
   if (!button->HasVMT()) return;


@@ -40,33 +37,38 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *
   wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
   event.SetEventObject(button);
   button->GetEventHandler()->ProcessEvent(event);
   wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
   event.SetEventObject(button);
   button->GetEventHandler()->ProcessEvent(event);

-};
+}

 
 

+//-----------------------------------------------------------------------------
+// wxButton

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-wxButton::wxButton(void)
+IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
+
+wxButton::wxButton()

 {
 {

-};
+}

 
 

-wxButton::wxButton( wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
+wxButton::~wxButton()

 {
 {

-  Create( parent, id, label, pos, size, style, name );
-};
+  if (m_clientData) delete m_clientData;
+}

 
 bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
       const wxPoint &pos, const wxSize &size,
 
 bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
       const wxPoint &pos, const wxSize &size,

-      long style, const wxString &name )
+      long style, const wxValidator& validator, const wxString &name )

 {
 {

+  m_clientData = (wxClientData*) NULL;

   m_needParent = TRUE;
 
   wxSize newSize = size;
 
   PreCreation( parent, id, pos, newSize, style, name );
   m_needParent = TRUE;
 
   wxSize newSize = size;
 
   PreCreation( parent, id, pos, newSize, style, name );

+  
+  SetValidator( validator );

 
 

-  SetLabel(label);

   m_widget = gtk_button_new_with_label( m_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;
 
   if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label );
   if (newSize.y == -1) newSize.y = 26;


@@ -75,23 +77,51 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
   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 );
+
+  (m_parent->m_insertCallback)( m_parent, this );
+  

   PostCreation();
   PostCreation();

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

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

-};
+}

 
 void wxButton::SetDefault(void)
 {
 
 void wxButton::SetDefault(void)
 {

-};
+/*
+  GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
+  gtk_widget_grab_default( m_widget );
+*/
+}

 
 void wxButton::SetLabel( const wxString &label )
 {
 
 void wxButton::SetLabel( const wxString &label )
 {

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

   wxControl::SetLabel( label );
   wxControl::SetLabel( label );

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

 
 

-wxString wxButton::GetLabel(void) const
+void wxButton::Enable( bool enable )

 {
 {

-  return wxControl::GetLabel();
-};
+  wxCHECK_RET( m_widget != NULL, "invalid button" );
+  
+  wxControl::Enable( enable );
+  
+  gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
+}
+
+void wxButton::ApplyWidgetStyle()
+{
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+  gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
+}
+
+