wxSlider should now display int values,

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

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index 52c4e2d4b9787992f2a2db0868616a03c13af88c..39d94b37b1fe3a05517b3e792f39b57514811934 100644 (file)
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/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
 //-----------------------------------------------------------------------------


@@ -21,68 +23,145 @@
 class wxButton;
 
 //-----------------------------------------------------------------------------
 class wxButton;
 
 //-----------------------------------------------------------------------------

-// wxButton
+// idle system

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

-IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
-
-void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
-{
-  wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
-  event.SetEventObject(button);
-  button->GetEventHandler()->ProcessEvent(event);
-};
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;

 
 

+//-----------------------------------------------------------------------------
+// data

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

-wxButton::wxButton(void)
-{
-};
+extern bool   g_blockEventsOnDrag;

 
 

-wxButton::wxButton( wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
-{
-  Create( parent, id, label, pos, size, style, name );
-};
+//-----------------------------------------------------------------------------
+// "clicked"
+//-----------------------------------------------------------------------------

 
 

-bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
+static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )

 {
 {

-  m_needParent = TRUE;
-
-  wxSize newSize = size;
+    if (g_isIdle) 
+       wxapp_install_idle_handler();

 
 

-  PreCreation( parent, id, pos, newSize, style, name );
+    if (!button->m_hasVMT) return;
+    if (g_blockEventsOnDrag) return;
+    
+    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
+    event.SetEventObject(button);
+    button->GetEventHandler()->ProcessEvent(event);
+}

 
 

-  SetLabel(label);
-  m_widget = gtk_button_new_with_label( m_label );
+//-----------------------------------------------------------------------------
+// wxButton
+//-----------------------------------------------------------------------------

 
 

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

 
 

-  gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
-    GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
+wxButton::wxButton()
+{
+}

 
 

-  PostCreation();
+wxButton::~wxButton()
+{
+    if (m_clientData) delete m_clientData;
+}

 
 

-  Show( TRUE );
+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_clientData = (wxClientData*) NULL;
+    m_needParent = TRUE;
+    m_acceptsFocus = TRUE;
+
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxButton creation failed") );
+       return FALSE;
+    }
+
+
+    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

 
 

-  return TRUE;
-};
+    SetLabel(label);
+
+    int x = 0;  int y = 0;
+    wxFont new_font( parent->GetFont() );
+    GetTextExtent( m_label, &x, &y, (int*)NULL, (int*)NULL, &new_font );
+
+    wxSize newSize = size;
+    if (newSize.x == -1)
+    {  
+        newSize.x = 12+x;
+       if (newSize.x < 80) newSize.x = 80;
+    }
+    if (newSize.y == -1)
+    {
+        newSize.y = 11+y;
+       if (newSize.x < 26) newSize.x = 26;
+    }
+       
+    SetSize( newSize.x, newSize.y );
+
+    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 );
+
+    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 );
+    
+    SetSize( m_x, m_y, m_width, m_height );
+}
+
+/* static */
+wxSize wxButton::GetDefaultSize()
+{
+    return wxSize(80,26);
+}

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

-  wxControl::SetLabel( label );
-};
+    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
+  
+    wxControl::SetLabel( label );
+  
+    gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel().mbc_str() );
+}
+
+bool wxButton::Enable( bool enable )
+{
+    if ( !wxControl::Enable( enable ) )
+        return FALSE;
+  
+    gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
+
+    return TRUE;
+}

 
 

-wxString wxButton::GetLabel(void) const
+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 );
+}