Query for "default_border" not "default_outside_border" since

    that is what is done in the gtk code.
  Correct wrong pos in scrolled window.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index e21402f843c93ae209e1d2eab4154c58572aa2d0..aec633f4503d231f87cf8a9f15f97e672098e0d4 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -22,6 +22,7 @@
 #include "wx/stockitem.h"
 
 #include "wx/gtk/private.h"
+#include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -69,8 +70,36 @@ 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;
 }
@@ -184,8 +213,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 */

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 7c6b7be2e7f41d9ffc9c22ee00b42f4cde18725e..b02e6a4f86f4b4aeb7f67377e27e22fea215c3f5 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -3111,15 +3111,15 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
         if (GTK_WIDGET_CAN_DEFAULT(m_widget))
         {
 #ifdef __WXGTK20__
-            GtkBorder *default_outside_border = NULL;
-            gtk_widget_style_get( m_widget, "default_outside_border", &default_outside_border, NULL );
-            if (default_outside_border)
+            GtkBorder *default_border = NULL;
+            gtk_widget_style_get( m_widget, "default_border", &default_border, NULL );
+            if (default_border)
             {
-                left_border += default_outside_border->left;
-                right_border += default_outside_border->right;
-                top_border += default_outside_border->top;
-                bottom_border += default_outside_border->bottom;
-                g_free( default_outside_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;

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index e21402f843c93ae209e1d2eab4154c58572aa2d0..aec633f4503d231f87cf8a9f15f97e672098e0d4 100644 (file)
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -22,6 +22,7 @@
 #include "wx/stockitem.h"
 
 #include "wx/gtk/private.h"
+#include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -69,8 +70,36 @@ 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;
 }
@@ -184,8 +213,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 */

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 7c6b7be2e7f41d9ffc9c22ee00b42f4cde18725e..b02e6a4f86f4b4aeb7f67377e27e22fea215c3f5 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -3111,15 +3111,15 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
         if (GTK_WIDGET_CAN_DEFAULT(m_widget))
         {
 #ifdef __WXGTK20__
-            GtkBorder *default_outside_border = NULL;
-            gtk_widget_style_get( m_widget, "default_outside_border", &default_outside_border, NULL );
-            if (default_outside_border)
+            GtkBorder *default_border = NULL;
+            gtk_widget_style_get( m_widget, "default_border", &default_border, NULL );
+            if (default_border)
             {
-                left_border += default_outside_border->left;
-                right_border += default_outside_border->right;
-                top_border += default_outside_border->top;
-                bottom_border += default_outside_border->bottom;
-                g_free( default_outside_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;