correction after the previous commit which introduced bug 1888014

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index e7d67d6e925ae65cb96c5127fc9ae626487e2a6c..cfa49892f79a8f5a4ae4693ce8ab688f84742e96 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        button.cpp
+// Name:        src/gtk/button.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,15 +10,15 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-

 #if wxUSE_BUTTON
 
 #if wxUSE_BUTTON
 

-#include "wx/button.h"
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+#endif
+

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

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

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


@@ -39,15 +39,12 @@ 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;
 
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
     event.SetEventObject(button);
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
     event.SetEventObject(button);

-    button->GetEventHandler()->ProcessEvent(event);
+    button->HandleWindowEvent(event);

 }
 }
 
 }
 }
 


@@ -58,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;


@@ -77,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);
     }


@@ -103,18 +97,20 @@ 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 ))
     {
         wxFAIL_MSG( wxT("wxButton creation failed") );
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxButton creation failed") );

-        return FALSE;
+        return false;

     }
 
     m_widget = gtk_button_new_with_mnemonic("");
     }
 
     m_widget = gtk_button_new_with_mnemonic("");


@@ -131,18 +127,7 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     else if (HasFlag(wxBU_BOTTOM))
         y_alignment = 1.0;
 
     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);
 
 
     SetLabel(label);
 


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

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

 {
 {

-    wxWindow *parent = GetParent();
-    wxCHECK_RET( parent, _T("button without parent?") );
-
-    parent->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 */


@@ -247,14 +231,14 @@ void wxButton::SetLabel( const wxString &lbl )
 bool wxButton::Enable( bool enable )
 {
     if ( !wxControl::Enable( enable ) )
 bool wxButton::Enable( bool enable )
 {
     if ( !wxControl::Enable( enable ) )

-        return FALSE;
+        return false;

 
     gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
 
 
     gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, 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;
 }


@@ -305,4 +289,3 @@ wxButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 }
 
 #endif // wxUSE_BUTTON
 }
 
 #endif // wxUSE_BUTTON

-