buttons now become default when they have focus

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 8c91ec2adc36c3fc3861641e4ef8a05335a28ae1..613aab8a05068dbb9222ba0b19278b94f099ecbc 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -22,6 +22,13 @@
 
 class wxButton;
 
 
 class wxButton;
 

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

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


@@ -34,12 +41,15 @@ extern bool   g_blockEventsOnDrag;
 
 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);

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


@@ -54,7 +64,7 @@ wxButton::wxButton()
 
 wxButton::~wxButton()
 {
 
 wxButton::~wxButton()
 {

-  if (m_clientData) delete m_clientData;
+    if (m_clientData) delete m_clientData;

 }
 
 bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
 }
 
 bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,


@@ -69,26 +79,33 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
 
     PreCreation( parent, id, pos, newSize, style, name );
   
 
     PreCreation( parent, id, pos, newSize, style, name );
   

+#if wxUSE_VALIDATORS

     SetValidator( validator );
     SetValidator( validator );

+#endif // wxUSE_VALIDATORS
+
+    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

 
 

-    m_widget = gtk_button_new_with_label( m_label );

     SetLabel(label);
 
     SetLabel(label);
 

-    if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label );
+    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 );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
       GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
 
     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 );
 

-    m_parent->AddChild( this );
-
-    (m_parent->m_insertCallback)( m_parent, this );
+    m_parent->DoAddChild( this );

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

+    SetFont( parent->GetFont() );

 
     Show( TRUE );
 
 
     Show( TRUE );
 


@@ -97,28 +114,29 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
 
 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 )
 {

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

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

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

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( m_widget != NULL, "invalid button" );
-  
-    wxControl::Enable( enable );
+    if ( !wxControl::Enable( enable ) )
+        return FALSE;

   
     gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
   
     gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );

+
+    return TRUE;

 }
 
 void wxButton::ApplyWidgetStyle()
 }
 
 void wxButton::ApplyWidgetStyle()


@@ -127,5 +145,3 @@ void wxButton::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
     gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
 }
     gtk_widget_set_style( m_widget, m_widgetStyle );
     gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
 }

-
-