X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2e8613b74113418749863342f3495a9df733eece..31ad423e4fb556ec225a63b161154d3bf3445c1b:/src/gtk1/button.cpp?ds=sidebyside diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp index 764cbde38f..d42f359e19 100644 --- a/src/gtk1/button.cpp +++ b/src/gtk1/button.cpp @@ -7,10 +7,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "button.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/defs.h" #if wxUSE_BUTTON @@ -105,7 +108,11 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, wxControl::SetLabel( label ); */ +#ifdef __WXGTK20__ + m_widget = gtk_button_new_with_mnemonic(""); +#else m_widget = gtk_button_new_with_label(""); +#endif float x_alignment = 0.5; if (HasFlag(wxBU_LEFT)) @@ -120,8 +127,8 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, y_alignment = 1.0; gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)), - x_alignment, y_alignment); - + x_alignment, y_alignment); + SetLabel( label ); if (style & wxNO_BORDER) @@ -132,31 +139,18 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, 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 ); - - SetSize( new_size ); - - SetBackgroundColour( parent->GetBackgroundColour() ); - SetForegroundColour( parent->GetForegroundColour() ); - - Show( TRUE ); + PostCreation(size); return TRUE; } void wxButton::SetDefault() { + wxWindow *parent = GetParent(); + wxCHECK_RET( parent, _T("button without parent?") ); + + parent->SetDefaultItem(this); + GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT ); gtk_widget_grab_default( m_widget ); @@ -175,7 +169,12 @@ void wxButton::SetLabel( const wxString &label ) wxControl::SetLabel( label ); +#ifdef __WXGTK20__ + wxString label2 = PrepareLabelMnemonics( label ); + gtk_button_set_label( GTK_BUTTON(m_widget), wxGTK_CONV(label2) ); +#else gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( GetLabel() ) ); +#endif } bool wxButton::Enable( bool enable ) @@ -188,24 +187,61 @@ bool wxButton::Enable( bool enable ) return TRUE; } -void wxButton::ApplyWidgetStyle() +bool wxButton::IsOwnGtkWindow( GdkWindow *window ) +{ +#ifdef __WXGTK20__ + return GTK_BUTTON(m_widget)->event_window; +#else + return (window == m_widget->window); +#endif +} + +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 { + // 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() ); + if ( isDefault ) + { + // set it back again + GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT ); + } + +#ifndef __WXGTK20__ + ret.x += 10; // add a few pixels for sloppy (but common) themes +#endif + if (!HasFlag(wxBU_EXACTFIT)) { if (ret.x < 80) ret.x = 80; } + CacheBestSize(ret); return ret; } +// static +wxVisualAttributes +wxButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_button_new); +} + #endif // wxUSE_BUTTON