X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2593d0ddae43a3e9054d2e9bb59646e19dffe73..ee3510132b8b4160f848bd4f502a6f5315f90dbc:/src/gtk1/button.cpp diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp index 47662e31de..d594d37e26 100644 --- a/src/gtk1/button.cpp +++ b/src/gtk1/button.cpp @@ -4,13 +4,17 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ #pragma implementation "button.h" #endif +#include "wx/defs.h" + +#if wxUSE_BUTTON + #include "wx/button.h" #include @@ -77,7 +81,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, !CreateBase( parent, id, pos, size, style, validator, name )) { wxFAIL_MSG( wxT("wxButton creation failed") ); - return FALSE; + return FALSE; } /* @@ -85,7 +89,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, for (size_t i = 0; i < label2.Len(); i++) { if (label2.GetChar(i) == wxT('&')) - label2.SetChar(i,wxT('_')); + label2.SetChar(i,wxT('_')); } GtkWidget *accel_label = gtk_accel_label_new( label2.mb_str() ); @@ -111,24 +115,6 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE ); #endif - int x = 0; int y = 0; - wxFont new_font( parent->GetFont() ); - GetTextExtent( m_label, &x, &y, (int*)NULL, (int*)NULL, &new_font ); - - wxSize newSize = size; - if (newSize.x == -1) - { - newSize.x = 12+x; - if (newSize.x < 80) newSize.x = 80; - } - if (newSize.y == -1) - { - newSize.y = 11+y; - if (newSize.y < 26) newSize.y = 26; - } - - SetSize( newSize.x, newSize.y ); - gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this ); @@ -136,9 +122,21 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, 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 ); + + SetSize( new_size ); + SetBackgroundColour( parent->GetBackgroundColour() ); SetForegroundColour( parent->GetForegroundColour() ); - SetFont( parent->GetFont() ); Show( TRUE ); @@ -184,3 +182,18 @@ void wxButton::ApplyWidgetStyle() gtk_widget_set_style( m_widget, m_widgetStyle ); gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle ); } + +wxSize wxButton::DoGetBestSize() const +{ + wxSize ret( wxControl::DoGetBestSize() ); + + if (!HasFlag(wxBU_EXACTFIT)) + { + if (ret.x < 80) ret.x = 80; + } + + return ret; +} + +#endif // wxUSE_BUTTON +