Should return wxImage not bool

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index e3a010662fea6e5093544a71b8e79eceae6cc0f7..acaf646e22c3b43896d83cdc0b42db3dee732c8f 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -19,8 +19,10 @@
 #if wxUSE_BUTTON
 
 #include "wx/button.h"
+#include "wx/stockitem.h"
 
 #include "wx/gtk/private.h"
+#include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -45,6 +47,7 @@ extern bool   g_blockEventsOnDrag;
 // "clicked"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
 {
     if (g_isIdle)
@@ -57,6 +60,51 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *
     event.SetEventObject(button);
     button->GetEventHandler()->ProcessEvent(event);
 }
+}
+
+//-----------------------------------------------------------------------------
+// "style_set" from m_widget
+//-----------------------------------------------------------------------------
+
+static gint
+gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), wxButton *win )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+    
+    int left_border = 0;
+    int right_border = 0;
+    int top_border = 0;
+    int bottom_border = 0;
+        
+    /* the default button has a border around it */
+    if (GTK_WIDGET_CAN_DEFAULT(m_widget))
+    {
+#ifdef __WXGTK20__
+        GtkBorder *default_border = NULL;
+        gtk_widget_style_get( m_widget, "default_border", &default_border, NULL );
+        if (default_border)
+        {
+            left_border += default_border->left;
+            right_border += default_border->right;
+            top_border += default_border->top;
+            bottom_border += default_border->bottom;
+            g_free( default_border );
+        }
+#else
+        left_border = 6;
+        right_border = 6;
+        top_border = 6;
+        bottom_border = 5;
+#endif
+        win->DoMoveWindow( win->m_x-top_border,
+                           win->m_y-left_border,
+                           win->m_width+left_border+right_border,
+                           win->m_height+top_border+bottom_border );
+    }      
+
+    return FALSE;
+}
 
 //-----------------------------------------------------------------------------
 // wxButton
@@ -109,8 +157,7 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
 */
 
 #ifdef __WXGTK20__
-    if (m_widget == NULL) // may be !=NULL if stock form of Create was used
-        m_widget = gtk_button_new_with_mnemonic("");
+    m_widget = gtk_button_new_with_mnemonic("");
 #else
     m_widget = gtk_button_new_with_label("");
 #endif
@@ -127,22 +174,30 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     else if (HasFlag(wxBU_BOTTOM))
         y_alignment = 1.0;
 
-#ifdef __WXGTK20__
-    gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
-#else
-    gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
-                            x_alignment, y_alignment);
+#if __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
+    }
+    else
 #endif
+    {
+        if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
+            gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
+                                x_alignment, y_alignment);
+    }
 
-    if (!label.empty())
-        SetLabel(label);
+    SetLabel(label);
 
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 
-    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
+    gtk_signal_connect_after( GTK_OBJECT(m_widget), "clicked",
       GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
 
+    gtk_signal_connect_after( GTK_OBJECT(m_widget), "style_set",
+      GTK_SIGNAL_FUNC(gtk_button_style_set_callback), (gpointer*) this );
+      
     m_parent->DoAddChild( this );
 
     PostCreation(size);
@@ -150,20 +205,6 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     return true;
 }
     
-bool wxButton::Create(wxWindow *parent, wxWindowID id, wxStockItemID stock,
-                      const wxString& descriptiveLabel,
-                      const wxPoint& pos, long style,
-                      const wxValidator& validator, const wxString& name)
-{
-#ifdef __WXGTK20__
-    m_widget = gtk_button_new_from_stock(wxStockItemToGTK(stock));
-    return Create(parent, id, wxEmptyString,
-                  pos, wxDefaultSize, style, validator, name);
-#else
-    return CreateStock(parent, id, stock, descriptiveLabel,
-                       pos, style, validator, name);
-#endif
-}
 
 void wxButton::SetDefault()
 {
@@ -174,8 +215,9 @@ void wxButton::SetDefault()
     
     GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
     gtk_widget_grab_default( m_widget );
-
-    SetSize( m_x, m_y, m_width, m_height );
+    
+    // resize for default border
+    gtk_button_style_set_callback( m_widget, NULL, this );
 }
 
 /* static */
@@ -217,17 +259,37 @@ wxSize wxButtonBase::GetDefaultSize()
 #endif
 }
 
-void wxButton::SetLabel( const wxString &label )
+void wxButton::SetLabel( const wxString &lbl )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
 
-    wxControl::SetLabel( label );
+    wxString label(lbl);
+
+    if (label.empty() && wxIsStockID(m_windowId))
+        label = wxGetStockLabel(m_windowId);
+
+    wxControl::SetLabel(label);
 
 #ifdef __WXGTK20__
-    wxString label2 = PrepareLabelMnemonics( label );
-    gtk_button_set_label( GTK_BUTTON(m_widget), wxGTK_CONV(label2) );
+    if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label))
+    {
+        const char *stock = wxGetStockGtkID(m_windowId);
+        if (stock)
+        {
+            gtk_button_set_label(GTK_BUTTON(m_widget), stock);
+            gtk_button_set_use_stock(GTK_BUTTON(m_widget), TRUE);
+            return;
+        }
+    }
+
+    wxString label2 = PrepareLabelMnemonics(label);
+    gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(label2));
+    gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE);
+    
+    ApplyWidgetStyle( false );
+    
 #else
-    gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( GetLabel() ) );
+    gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV(GetLabel()));
 #endif
 }