X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/354aa1e366a57d896e2cf0943c687b24e8db688c..3e7ea45c59410715c4e4f70e89690b71cb1dfa79:/src/gtk/button.cpp diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp index c12fd52778..fabe9a234f 100644 --- a/src/gtk/button.cpp +++ b/src/gtk/button.cpp @@ -1,33 +1,24 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: button.cpp +// Name: src/gtk/button.cpp // Purpose: // 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/button.h" - -#include "gdk/gdk.h" -#include "gtk/gtk.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- +#if wxUSE_BUTTON -class wxButton; +#ifndef WX_PRECOMP + #include "wx/button.h" +#endif -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- +#include "wx/stockitem.h" -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // data @@ -39,17 +30,43 @@ extern bool g_blockEventsOnDrag; // "clicked" //----------------------------------------------------------------------------- +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); - button->GetEventHandler()->ProcessEvent(event); + button->HandleWindowEvent(event); +} +} + +//----------------------------------------------------------------------------- +// "style_set" from m_widget +//----------------------------------------------------------------------------- + +extern "C" { +static void +gtk_button_style_set_callback(GtkWidget* widget, GtkStyle*, wxButton* win) +{ + /* the default button has a border around it */ + wxWindow* parent = win->GetParent(); + if (parent && parent->m_wxwindow && GTK_WIDGET_CAN_DEFAULT(widget)) + { + GtkBorder* border = NULL; + gtk_widget_style_get(widget, "default_border", &border, NULL); + if (border) + { + win->MoveWindow( + win->m_x - border->left, + win->m_y - border->top, + win->m_width + border->left + border->right, + win->m_height + border->top + border->bottom); + gtk_border_free(border); + } + } +} } //----------------------------------------------------------------------------- @@ -66,121 +83,211 @@ 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") ); - return FALSE; + return false; } -/* - wxString label2( label ); - for (size_t i = 0; i < label2.Len(); i++) - { - if (label2.GetChar(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 ); -*/ - - m_widget = gtk_button_new_with_label(""); - - SetLabel( label ); - -#if (GTK_MINOR_VERSION > 0) + m_widget = gtk_button_new_with_mnemonic(""); + g_object_ref(m_widget); + + 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_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment); + + SetLabel(label); + if (style & wxNO_BORDER) 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 ); + g_signal_connect_after (m_widget, "clicked", + G_CALLBACK (gtk_button_clicked_callback), + this); - 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.x < 26) newSize.x = 26; - } - - SetSize( newSize.x, newSize.y ); - - gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", - GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this ); + g_signal_connect_after (m_widget, "style_set", + G_CALLBACK (gtk_button_style_set_callback), + this); m_parent->DoAddChild( this ); - - PostCreation(); - - SetBackgroundColour( parent->GetBackgroundColour() ); - SetForegroundColour( parent->GetForegroundColour() ); - SetFont( parent->GetFont() ); - 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 ); - - 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 */ -wxSize wxButton::GetDefaultSize() +wxSize wxButtonBase::GetDefaultSize() { - return wxSize(80,26); + static wxSize size = wxDefaultSize; + if (size == wxDefaultSize) + { + // NB: Default size of buttons should be same as size of stock + // buttons as used in most GTK+ apps. Unfortunately it's a little + // tricky to obtain this size: stock button's size may be smaller + // than size of button in GtkButtonBox and vice versa, + // GtkButtonBox's minimal button size may be smaller than stock + // button's size. We have to retrieve both values and combine them. + + GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL); + GtkWidget *box = gtk_hbutton_box_new(); + GtkWidget *btn = gtk_button_new_from_stock(GTK_STOCK_CANCEL); + gtk_container_add(GTK_CONTAINER(box), btn); + gtk_container_add(GTK_CONTAINER(wnd), box); + GtkRequisition req; + gtk_widget_size_request(btn, &req); + + gint minwidth, minheight; + gtk_widget_style_get(box, + "child-min-width", &minwidth, + "child-min-height", &minheight, + NULL); + + size.x = wxMax(minwidth, req.width); + size.y = wxMax(minheight, req.height); + + gtk_widget_destroy(wnd); + } + return size; } -void wxButton::SetLabel( const wxString &label ) +void wxButton::SetLabel( const wxString &lbl ) { wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); - - wxControl::SetLabel( label ); - - gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel().mbc_str() ); + + wxString label(lbl); + + if (label.empty() && wxIsStockID(m_windowId)) + label = wxGetStockLabel(m_windowId); + + wxControl::SetLabel(label); + + if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label)) + { + const char *stock = wxGetStockGtkID(m_windowId); + if (stock) + { + gtk_button_set_label(GTK_BUTTON(m_widget), stock); + gtk_button_set_use_stock(GTK_BUTTON(m_widget), TRUE); + return; + } + } + + const wxString labelGTK = GTKConvertMnemonics(label); + gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK)); + gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE); + + ApplyWidgetStyle( false ); } bool wxButton::Enable( bool enable ) { if ( !wxControl::Enable( enable ) ) - return FALSE; - - gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable ); + return false; + + gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable); - return TRUE; + return true; } -void wxButton::ApplyWidgetStyle() +GdkWindow *wxButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); - gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle ); + return GTK_BUTTON(m_widget)->event_window; +} + +void wxButton::DoApplyWidgetStyle(GtkRcStyle *style) +{ + gtk_widget_modify_style(m_widget, style); + GtkWidget *child = GTK_BIN(m_widget)->child; + gtk_widget_modify_style(child, style); + + // for buttons with images, the path to the label is (at least in 2.12) + // GtkButton -> GtkAlignment -> GtkHBox -> GtkLabel + if ( GTK_IS_ALIGNMENT(child) ) + { + GtkWidget *box = GTK_BIN(child)->child; + if ( GTK_IS_BOX(box) ) + { + for (GList* item = GTK_BOX(box)->children; item; item = item->next) + { + GtkBoxChild* boxChild = static_cast(item->data); + gtk_widget_modify_style(boxChild->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 ); + } + + if (!HasFlag(wxBU_EXACTFIT)) + { + 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; +} + +// static +wxVisualAttributes +wxButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_button_new); +} + +#endif // wxUSE_BUTTON