Bring back double border

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index efcfb9626fd11a816c2f9c0fdcd93d2363dbb01d..61e1ad1396012e6518706b3cdcc64ef039aad0cf 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -12,16 +12,13 @@
 
 #if wxUSE_BUTTON
 
 
 #if wxUSE_BUTTON
 

-#include "wx/button.h"
-

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/toplevel.h"
+    #include "wx/button.h"

 #endif
 
 #include "wx/stockitem.h"
 
 #include "wx/gtk/private.h"
 #endif
 
 #include "wx/stockitem.h"
 
 #include "wx/gtk/private.h"

-#include "wx/gtk/win_gtk.h"

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -42,9 +39,6 @@ extern bool   g_blockEventsOnDrag;
 extern "C" {
 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
 {
 extern "C" {
 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
 {

-    if (g_isIdle)
-       wxapp_install_idle_handler();
-

     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 


@@ -61,9 +55,6 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *
 static gint
 gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), wxButton *win )
 {
 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 left_border = 0;
     int right_border = 0;
     int top_border = 0;


@@ -80,11 +71,11 @@ gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), w
             right_border += default_border->right;
             top_border += default_border->top;
             bottom_border += default_border->bottom;
             right_border += default_border->right;
             top_border += default_border->top;
             bottom_border += default_border->bottom;

-            g_free( default_border );
+            gtk_border_free( default_border );

         }
         win->MoveWindow(
         }
         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);
     }
             win->m_width + left_border + right_border,
             win->m_height + top_border + bottom_border);
     }


@@ -106,13 +97,15 @@ wxButton::~wxButton()
 {
 }
 
 {
 }
 

-bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxValidator& validator, const wxString &name )
+bool wxButton::Create(wxWindow *parent,
+                      wxWindowID id,
+                      const wxString &label,
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      long style,
+                      const wxValidator& validator,
+                      const wxString& name)

 {
 {

-    m_needParent = true;
-    m_acceptsFocus = true;
-

     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {


@@ -168,18 +161,17 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
 }
 
 
 }
 
 

-void wxButton::SetDefault()
+wxWindow *wxButton::SetDefault()

 {
 {

-    wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
-    wxCHECK_RET( tlw, _T("button without top level window?") );
-
-    tlw->SetDefaultItem(this);
+    wxWindow *oldDefault = wxButtonBase::SetDefault();

 
     GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
     gtk_widget_grab_default( m_widget );
 
     // resize for default border
     gtk_button_style_set_callback( m_widget, NULL, this );
 
     GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
     gtk_widget_grab_default( m_widget );
 
     // resize for default border
     gtk_button_style_set_callback( m_widget, NULL, this );

+
+    return oldDefault;

 }
 
 /* static */
 }
 
 /* static */


@@ -257,7 +249,7 @@ bool wxButton::Enable( bool enable )
     return true;
 }
 
     return true;
 }
 

-bool wxButton::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const

 {
     return GTK_BUTTON(m_widget)->event_window;
 }
 {
     return GTK_BUTTON(m_widget)->event_window;
 }