don't forward Enter presses to the default button if any of the ancestor windows...

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 71cfd13497ebfef4fb844f29eb60f05218b2e236..12e0807e50d8132e6e46f1e95c98a6fc9591e603 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -74,8 +74,8 @@ gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), w
             gtk_border_free( default_border );
         }
         win->MoveWindow(
-            win->m_x - top_border,
-            win->m_y - left_border,
+            win->m_x - left_border,
+            win->m_y - top_border,
             win->m_width + left_border + right_border,
             win->m_height + top_border + bottom_border);
     }
@@ -127,18 +127,7 @@ bool wxButton::Create(wxWindow *parent,
     else if (HasFlag(wxBU_BOTTOM))
         y_alignment = 1.0;
 
-#ifdef __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(GTK_BIN(m_widget)->child))
-            gtk_misc_set_alignment(GTK_MISC(GTK_BIN(m_widget)->child),
-                                x_alignment, y_alignment);
-    }
+    gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
 
     SetLabel(label);