X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fab591c5cceff41c0bedaa89af34cd039e2c44e1..ad653fa23069c5d9378247084f03c9a718c3ad62:/src/gtk/button.cpp?ds=sidebyside diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp index fc88afb789..a2ec92fdde 100644 --- a/src/gtk/button.cpp +++ b/src/gtk/button.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: button.cpp +// Name: src/gtk/button.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,190 +7,329 @@ // 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 -#include "wx/button.h" - -#include "wx/gtk/private.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxButton; - -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +#ifndef WX_PRECOMP + #include "wx/button.h" +#endif -//----------------------------------------------------------------------------- -// data -//----------------------------------------------------------------------------- +#include "wx/stockitem.h" -extern bool g_blockEventsOnDrag; +#include +#include "wx/gtk/private.h" +#include "wx/gtk/private/gtk2-compat.h" +#include "wx/gtk/private/list.h" -//----------------------------------------------------------------------------- -// "clicked" -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// GTK callbacks +// ---------------------------------------------------------------------------- -static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button ) +extern "C" { - if (g_isIdle) - wxapp_install_idle_handler(); - if (!button->m_hasVMT) return; - if (g_blockEventsOnDrag) return; +static void +wxgtk_button_clicked_callback(GtkWidget *WXUNUSED(widget), wxButton *button) +{ + if ( button->GTKShouldIgnoreEvent() ) + return; - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId()); + wxCommandEvent event(wxEVT_BUTTON, button->GetId()); event.SetEventObject(button); - button->GetEventHandler()->ProcessEvent(event); + button->HandleWindowEvent(event); } //----------------------------------------------------------------------------- -// wxButton +// "style_set" from m_widget //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl) - -wxButton::wxButton() +static void +wxgtk_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_get_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); + } + } } -wxButton::~wxButton() -{ -} +} // extern "C" -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; +//----------------------------------------------------------------------------- +// 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) +{ 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++) + // create either a standard button with text label (which may still contain + // an image under GTK+ 2.6+) or a bitmap-only button if we don't have any + // label + const bool + useLabel = !(style & wxBU_NOTEXT) && (!label.empty() || wxIsStockID(id)); + if ( useLabel ) { - if (label2.GetChar(i) == wxT('&')) - label2.SetChar(i,wxT('_')); + m_widget = gtk_button_new_with_mnemonic(""); } + else // no label, suppose we will have a bitmap + { + m_widget = gtk_button_new(); - 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 ); + GtkWidget *image = gtk_image_new(); + gtk_widget_show(image); + gtk_container_add(GTK_CONTAINER(m_widget), image); + } - gtk_accel_label_set_accel_widget( GTK_ACCEL_LABEL(accel_label), m_widget ); + g_object_ref(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) ); + float x_alignment = 0.5; + if (HasFlag(wxBU_LEFT)) + x_alignment = 0.0; + else if (HasFlag(wxBU_RIGHT)) + x_alignment = 1.0; - wxControl::SetLabel( label ); -*/ + float y_alignment = 0.5; + if (HasFlag(wxBU_TOP)) + y_alignment = 0.0; + else if (HasFlag(wxBU_BOTTOM)) + y_alignment = 1.0; - m_widget = gtk_button_new_with_label(""); + gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment); - SetLabel( label ); + if ( useLabel ) + SetLabel(label); 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_FUNC(gtk_button_clicked_callback), (gpointer*)this ); - - m_parent->DoAddChild( this ); - - PostCreation(); - - SetFont( parent->GetFont() ); + g_signal_connect_after (m_widget, "clicked", + G_CALLBACK (wxgtk_button_clicked_callback), + this); - 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 ); + g_signal_connect_after (m_widget, "style_set", + G_CALLBACK (wxgtk_button_style_set_callback), + 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() { - GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT ); + wxWindow *oldDefault = wxButtonBase::SetDefault(); + + gtk_widget_set_can_default(m_widget, TRUE); gtk_widget_grab_default( m_widget ); - SetSize( m_x, m_y, m_width, m_height ); + // resize for default border + wxgtk_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_button_box_new(GTK_ORIENTATION_HORIZONTAL); + 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_get_preferred_size(btn, NULL, &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 ); + wxString label(lbl); + + if (label.empty() && wxIsStockID(m_windowId)) + label = wxGetStockLabel(m_windowId); + + wxAnyButton::SetLabel(label); - gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( GetLabel() ) ); + // don't use label if it was explicitly disabled + if ( HasFlag(wxBU_NOTEXT) ) + return; + + 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; + } + } + + // this call is necessary if the button had been initially created without + // a (text) label -- then we didn't use gtk_button_new_with_mnemonic() and + // so "use-underline" GtkButton property remained unset + gtk_button_set_use_underline(GTK_BUTTON(m_widget), TRUE); + 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); + + GTKApplyWidgetStyle( false ); } -bool wxButton::Enable( bool enable ) +#if wxUSE_MARKUP +bool wxButton::DoSetLabelMarkup(const wxString& markup) { - if ( !wxControl::Enable( enable ) ) - return FALSE; + wxCHECK_MSG( m_widget != NULL, false, "invalid button" ); + + const wxString stripped = RemoveMarkup(markup); + if ( stripped.empty() && !markup.empty() ) + return false; + + wxControl::SetLabel(stripped); + + GtkLabel * const label = GTKGetLabel(); + wxCHECK_MSG( label, false, "no label in this button?" ); + + GTKSetLabelWithMarkupForLabel(label, markup); - gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable ); + return true; +} + +GtkLabel *wxButton::GTKGetLabel() const +{ + GtkWidget* child = gtk_bin_get_child(GTK_BIN(m_widget)); + if ( GTK_IS_ALIGNMENT(child) ) + { + GtkWidget* box = gtk_bin_get_child(GTK_BIN(child)); + GtkLabel* label = NULL; + wxGtkList list(gtk_container_get_children(GTK_CONTAINER(box))); + for (GList* item = list; item; item = item->next) + { + if (GTK_IS_LABEL(item->data)) + label = GTK_LABEL(item->data); + } + + return label; + } - return TRUE; + return GTK_LABEL(child); } +#endif // wxUSE_MARKUP -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 ); + GTKApplyStyle(m_widget, style); + GtkWidget* child = gtk_bin_get_child(GTK_BIN(m_widget)); + GTKApplyStyle(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_get_child(GTK_BIN(child)); + if ( GTK_IS_BOX(box) ) + { + wxGtkList list(gtk_container_get_children(GTK_CONTAINER(box))); + for (GList* item = list; item; item = item->next) + { + GTKApplyStyle(GTK_WIDGET(item->data), style); + } + } + } } wxSize wxButton::DoGetBestSize() const { - wxSize ret( wxControl::DoGetBestSize() ); + // 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 (otherwise 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) != 0; + if ( isDefault ) + { + // temporarily unset default flag + gtk_widget_set_can_default(m_widget, FALSE); + } + + wxSize ret( wxAnyButton::DoGetBestSize() ); + + if ( isDefault ) + { + // set it back again + gtk_widget_set_can_default(m_widget, TRUE); + } 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; } -#endif // wxUSE_BUTTON +// static +wxVisualAttributes +wxButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_button_new()); +} +#endif // wxUSE_BUTTON