X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a90c0600bb319326aa9b70ac4551fdd11684e223..98cb8dcb0cf3b0e660f1f67e1c02451ab10257de:/src/gtk1/button.cpp?ds=sidebyside

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index e21402f843..ca57fcc514 100644
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "button.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -22,6 +18,7 @@
 #include "wx/stockitem.h"
 
 #include "wx/gtk/private.h"
+#include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -46,6 +43,7 @@ extern bool   g_blockEventsOnDrag;
 // "clicked"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
 {
     if (g_isIdle)
@@ -58,6 +56,7 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *
     event.SetEventObject(button);
     button->GetEventHandler()->ProcessEvent(event);
 }
+}
 
 //-----------------------------------------------------------------------------
 // "style_set" from m_widget
@@ -68,9 +67,37 @@ gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), w
 {
     if (g_isIdle)
         wxapp_install_idle_handler();
-    
-    if (GTK_WIDGET_REALIZED(m_widget))
-        win->SetSize( win->m_x, win->m_y, win->m_width, win->m_height );
+
+    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;
 }
@@ -103,28 +130,6 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
         return FALSE;
     }
 
-/*
-    wxString label2( label );
-    for (size_t i = 0; i < label2.Len(); i++)
-    {
-        if (label2.GetChar(i) == wxT('&'))
-        label2.SetChar(i,wxT('_'));
-    }
-
-    GtkWidget *accel_label = gtk_accel_label_new( label2.mb_str() );
-    gtk_widget_show( accel_label );
-
-    m_widget = gtk_button_new();
-    gtk_container_add( GTK_CONTAINER(m_widget), accel_label );
-
-    gtk_accel_label_set_accel_widget( GTK_ACCEL_LABEL(accel_label), m_widget );
-
-    guint accel_key = gtk_label_parse_uline (GTK_LABEL(accel_label), label2.mb_str() );
-    gtk_accel_label_refetch( GTK_ACCEL_LABEL(accel_label) );
-
-    wxControl::SetLabel( label );
-*/
-
 #ifdef __WXGTK20__
     m_widget = gtk_button_new_with_mnemonic("");
 #else
@@ -143,7 +148,7 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     else if (HasFlag(wxBU_BOTTOM))
         y_alignment = 1.0;
 
-#if __WXGTK24__
+#ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
         gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
@@ -166,14 +171,14 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
 
     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);
 
     return true;
 }
-    
+
 
 void wxButton::SetDefault()
 {
@@ -181,11 +186,12 @@ void wxButton::SetDefault()
     wxCHECK_RET( parent, _T("button without parent?") );
 
     parent->SetDefaultItem(this);
-    
+
     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 */
@@ -218,7 +224,7 @@ wxSize wxButtonBase::GetDefaultSize()
 
         size.x = wxMax(minwidth, req.width);
         size.y = wxMax(minheight, req.height);
-        
+
         gtk_widget_destroy(wnd);
     }
     return size;
@@ -238,6 +244,8 @@ void wxButton::SetLabel( const wxString &lbl )
 
     wxControl::SetLabel(label);
 
+    const wxString labelGTK = GTKConvertMnemonics(label);
+
 #ifdef __WXGTK20__
     if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label))
     {
@@ -250,15 +258,13 @@ void wxButton::SetLabel( const wxString &lbl )
         }
     }
 
-    wxString label2 = PrepareLabelMnemonics(label);
-    gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(label2));
+    gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK));
     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()));
-#endif
+#else // GTK+ 1
+    gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV(labelGTK));
+#endif // GTK+ 2/1
 }
 
 bool wxButton::Enable( bool enable )
@@ -310,7 +316,7 @@ wxSize wxButton::DoGetBestSize() const
 #ifndef __WXGTK20__
     ret.x += 10;  // add a few pixels for sloppy (but common) themes
 #endif
-    
+
     if (!HasFlag(wxBU_EXACTFIT))
     {
         wxSize defaultSize = GetDefaultSize();