Applied colspan corrections, #15274 and #15275 (dghart)

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

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index 764cbde38f99dba762987daf9939ee7574148116..3ff3a2424182f5ea48aaa8b1269aa5868321d4b8 100644 (file)
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -7,17 +7,19 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "button.h"
-#endif
-
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.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/gtk1/private.h"
+#include "wx/gtk1/win_gtk.h"

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


@@ -42,6 +44,7 @@ extern bool   g_blockEventsOnDrag;
 // "clicked"
 //-----------------------------------------------------------------------------
 
 // "clicked"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
 {
     if (g_isIdle)
 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
 {
     if (g_isIdle)


@@ -50,16 +53,46 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 

-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
+    wxCommandEvent event(wxEVT_BUTTON, button->GetId());

     event.SetEventObject(button);
     event.SetEventObject(button);

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

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// wxButton
+// "style_set" from m_widget

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
+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 bottom_border = 0;
+
+    /* the default button has a border around it */
+    if (GTK_WIDGET_CAN_DEFAULT(m_widget))
+    {
+        left_border = 6;
+        right_border = 6;
+        top_border = 6;
+        bottom_border = 5;
+        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;
+}
+
+//-----------------------------------------------------------------------------
+// wxButton
+//-----------------------------------------------------------------------------

 
 wxButton::wxButton()
 {
 
 wxButton::wxButton()
 {


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

-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
+    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;
-    }
-
-/*
-    wxString label2( label );
-    for (size_t i = 0; i < label2.Len(); i++)
-    {
-        if (label2.GetChar(i) == wxT('&'))
-        label2.SetChar(i,wxT('_'));
+        return false;

     }
 
     }
 

-    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 );
-*/
-

     m_widget = gtk_button_new_with_label("");
 
     float x_alignment = 0.5;
     m_widget = gtk_button_new_with_label("");
 
     float x_alignment = 0.5;


@@ -119,93 +130,124 @@ 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;
 

-    gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
-                           x_alignment, y_alignment);
-                
-    SetLabel( label );
+    if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
+        gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
+                                x_alignment, y_alignment);
+
+    SetLabel(label);

 
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 
 
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
+    gtk_signal_connect_after( GTK_OBJECT(m_widget), "clicked",

       GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
 
       GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
 

-    m_parent->DoAddChild( this );
-
-    PostCreation();
-
-    SetFont( parent->GetFont() );
-
-    wxSize best_size( DoGetBestSize() );
-    wxSize new_size( size );
-    if (new_size.x == -1)
-        new_size.x = best_size.x;
-    if (new_size.y == -1)
-        new_size.y = best_size.y;
-    if ((new_size.x != size.x) || (new_size.y != size.y))
-        SetSize( new_size.x, new_size.y );
+    gtk_signal_connect_after( GTK_OBJECT(m_widget), "style_set",
+      GTK_SIGNAL_FUNC(gtk_button_style_set_callback), (gpointer*) this );

 
 

-    SetSize( new_size );
-
-    SetBackgroundColour( parent->GetBackgroundColour() );
-    SetForegroundColour( parent->GetForegroundColour() );
+    m_parent->DoAddChild( this );

 
 

-    Show( TRUE );
+    PostCreation(size);

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

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

 {
 {

+    wxWindow *oldDefault = wxButtonBase::SetDefault();
+

     GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
     gtk_widget_grab_default( m_widget );
 
     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 );
+
+    return oldDefault;

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

-wxSize wxButton::GetDefaultSize()
+wxSize wxButtonBase::GetDefaultSize()

 {
     return wxSize(80,26);
 }
 
 {
     return wxSize(80,26);
 }
 

-void wxButton::SetLabel( const wxString &label )
+void wxButton::SetLabel( const wxString &lbl )

 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
 

-    wxControl::SetLabel( label );
+    wxString label(lbl);
+
+    if (label.empty() && wxIsStockID(m_windowId))
+        label = wxGetStockLabel(m_windowId);

 
 

-    gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( GetLabel() ) );
+    wxControl::SetLabel(label);
+
+    const wxString labelGTK = GTKRemoveMnemonics(label);
+
+    gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV(labelGTK));

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

-    return TRUE;
+    return true;
+}
+
+bool wxButton::IsOwnGtkWindow( GdkWindow *window )
+{
+    return (window == m_widget->window);

 }
 
 }
 

-void wxButton::ApplyWidgetStyle()
+void wxButton::DoApplyWidgetStyle(GtkRcStyle *style)

 {
 {

-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
-    gtk_widget_set_style( BUTTON_CHILD(m_widget), m_widgetStyle );
+    gtk_widget_modify_style(m_widget, style);
+    gtk_widget_modify_style(BUTTON_CHILD(m_widget), style);

 }
 
 wxSize wxButton::DoGetBestSize() const
 {
 }
 
 wxSize wxButton::DoGetBestSize() const
 {

+    // the default button in wxGTK is bigger than the other ones because of an
+    // extra border around it, but we don't want to take it into account in
+    // our size calculations (otherwsie the result is visually ugly), so
+    // always return the size of non default button from here
+    const bool isDefault = GTK_WIDGET_HAS_DEFAULT(m_widget);
+    if ( isDefault )
+    {
+        // temporarily unset default flag
+        GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_DEFAULT );
+    }
+

     wxSize ret( wxControl::DoGetBestSize() );
 
     wxSize ret( wxControl::DoGetBestSize() );
 

+    if ( isDefault )
+    {
+        // set it back again
+        GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
+    }
+
+    ret.x += 10;  // add a few pixels for sloppy (but common) themes
+

     if (!HasFlag(wxBU_EXACTFIT))
     {
     if (!HasFlag(wxBU_EXACTFIT))
     {

-        if (ret.x < 80) ret.x = 80;
+        wxSize defaultSize = GetDefaultSize();
+        if (ret.x < defaultSize.x) ret.x = defaultSize.x;
+        if (ret.y < defaultSize.y) ret.y = defaultSize.y;

     }
 
     }
 

+    CacheBestSize(ret);

     return ret;
 }
 
     return ret;
 }
 

-#endif // wxUSE_BUTTON
+// static
+wxVisualAttributes
+wxButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_button_new);
+}

 
 

+#endif // wxUSE_BUTTON