Made listctrl header BG grey again

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 066c92a17a5c826ec16c36254107dac71b4af92a..140e4380ef0b5baefad76bbb1d41cf0a8ea390c0 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,12 +13,22 @@
 
 #include "wx/button.h"
 
 
 #include "wx/button.h"
 

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

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxButton;
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxButton;
 

+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -27,77 +36,110 @@ 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 )
 {
 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
 {

-  if (!button->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
-  
-  wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
-  event.SetEventObject(button);
-  button->GetEventHandler()->ProcessEvent(event);
+    if (g_isIdle) 
+       wxapp_install_idle_handler();
+
+    if (!button->m_hasVMT) return;
+    if (g_blockEventsOnDrag) return;
+    
+    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
+    event.SetEventObject(button);
+    button->GetEventHandler()->ProcessEvent(event);

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

+// 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 )
 {
 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( "" );
+    
+#if (GTK_MINOR_VERSION > 0)    
+    if (style & wxNO_BORDER)
+       gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
+#endif

 
 

-  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 );
+    SetLabel(label);

 
 

-  gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
-    GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
+    if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label.mbc_str() );
+    if (newSize.y == -1) newSize.y = 26;
+    SetSize( newSize.x, newSize.y );

 
 

-  PostCreation();
+    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
+      GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
+
+    m_parent->DoAddChild( this );
+  
+    PostCreation();
+  
+    SetBackgroundColour( parent->GetBackgroundColour() );
+    SetForegroundColour( parent->GetForegroundColour() );
+    SetFont( parent->GetFont() );

 
 

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

 
 

-  return 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 );
-*/
+    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, _T("invalid button") );
+  
+    wxControl::SetLabel( label );
+  
+    gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel().mbc_str() );

 }
 
 }
 

-void wxButton::Enable( bool enable )
+bool wxButton::Enable( bool enable )

 {
 {

-  wxControl::Enable( enable );
-  GtkButton *bin = GTK_BUTTON( m_widget );
-  GtkWidget *label = bin->child;
-  gtk_widget_set_sensitive( label, enable );
+    if ( !wxControl::Enable( enable ) )
+        return FALSE;
+  
+    gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
+
+    return TRUE;

 }
 
 }
 

+void wxButton::ApplyWidgetStyle()
+{
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widget, m_widgetStyle );
+    gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
+}