correct a bug in the MSW code using wxMask

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 2201232c15fe35fc7801b18f8b180c4d062281f7..8338f5bcff9ddf14cdf17c5934c1b9b28322cfc8 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -2,9 +2,8 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -21,44 +20,55 @@
 class wxButton;
 
 //-----------------------------------------------------------------------------
-// wxButton
+// data
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
+extern bool   g_blockEventsOnDrag;
+
+//-----------------------------------------------------------------------------
+// "clicked"
+//-----------------------------------------------------------------------------
 
-void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), gpointer data )
+static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
 {
-  wxButton *button = (wxButton*)data;
+  if (!button->HasVMT()) return;
+  if (g_blockEventsOnDrag) return;
+  
   wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
   event.SetEventObject(button);
-  button->ProcessEvent(event);
-};
+  button->GetEventHandler()->ProcessEvent(event);
+}
 
 //-----------------------------------------------------------------------------
+// wxButton
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
 
-wxButton::wxButton(void)
+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,
-      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 );
+  
+  SetValidator( validator );
 
-  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;
@@ -67,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 );
 
+  m_parent->AddChild( this );
+
+  (m_parent->m_insertCallback)( m_parent, this );
+  
   PostCreation();
+  
+  SetBackgroundColour( parent->GetBackgroundColour() );
+  SetForegroundColour( parent->GetForegroundColour() );
 
   Show( TRUE );
 
   return TRUE;
-};
+}
 
 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 )
 {
+  wxCHECK_RET( m_widget != NULL, "invalid button" );
+  
   wxControl::SetLabel( label );
-};
+  
+  gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel() );
+}
 
-wxString wxButton::GetLabel(void) const
+void wxButton::Enable( bool enable )
+{
+  wxCHECK_RET( m_widget != NULL, "invalid button" );
+  
+  wxControl::Enable( enable );
+  
+  gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
+}
+
+void wxButton::ApplyWidgetStyle()
 {
-  return wxControl::GetLabel();
-};
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+  gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
+}
+
+