X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..f8405d6e6fc2a361d9710dfdaea0b158952803aa:/src/gtk/button.cpp diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp index 01b3283adc..d42f359e19 100644 --- a/src/gtk/button.cpp +++ b/src/gtk/button.cpp @@ -4,21 +4,23 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// 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 #include "wx/button.h" -#include -#include +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // classes @@ -45,12 +47,12 @@ extern bool g_blockEventsOnDrag; static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button ) { - if (g_isIdle) + 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); button->GetEventHandler()->ProcessEvent(event); @@ -81,7 +83,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; } /* @@ -89,65 +91,69 @@ 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() ); 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 ); */ - + +#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)) + x_alignment = 0.0; + else if (HasFlag(wxBU_RIGHT)) + x_alignment = 1.0; + + float y_alignment = 0.5; + if (HasFlag(wxBU_TOP)) + y_alignment = 0.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_MINOR_VERSION > 0) if (style & wxNO_BORDER) gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE ); -#endif gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 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 ); - - 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 ); - + SetSize( m_x, m_y, m_width, m_height ); } @@ -160,35 +166,82 @@ wxSize wxButton::GetDefaultSize() void wxButton::SetLabel( const wxString &label ) { wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); - + wxControl::SetLabel( label ); - - gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel().mbc_str() ); + +#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 ) { if ( !wxControl::Enable( enable ) ) return FALSE; - - gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable ); + + gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable ); return TRUE; } -void wxButton::ApplyWidgetStyle() +bool wxButton::IsOwnGtkWindow( GdkWindow *window ) { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); - gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle ); +#ifdef __WXGTK20__ + return GTK_BUTTON(m_widget)->event_window; +#else + return (window == m_widget->window); +#endif +} + +void wxButton::DoApplyWidgetStyle(GtkRcStyle *style) +{ + 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 (ret.x < 80) ret.x = 80; + + 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