another wxBeginBusyCursor fix

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 5d95c5ea7b32e3b27af3904a6cac08472edbced6..af6d56d5982f01b14c4cf4af6be0643791f55b42 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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -14,6 +13,9 @@
 
 #include "wx/button.h"
 
 
 #include "wx/button.h"
 

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

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


@@ -27,11 +29,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;


@@ -42,51 +42,91 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *
   button->GetEventHandler()->ProcessEvent(event);
 }
 
   button->GetEventHandler()->ProcessEvent(event);
 }
 

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

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

-wxButton::wxButton(void)
+IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
+
+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 );

 
 

-  PostCreation();
+    m_parent->AddChild( this );

 
 

-  Show( TRUE );
+    (m_parent->m_insertCallback)( m_parent, this );
+  
+    PostCreation();
+  
+    SetBackgroundColour( parent->GetBackgroundColour() );
+    SetForegroundColour( parent->GetForegroundColour() );
+    SetFont( parent->GetFont() );

 
 

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

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

-  gtk_widget_grab_default( m_widget );
+    GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
+    gtk_widget_grab_default( m_widget );
+    
+    SetSize( m_x, m_y, m_width, m_height );

 }
 
 void wxButton::SetLabel( const wxString &label )
 {
 }
 
 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 )
+{
+    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 );

 }
 
 }
 

+