X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a650b927dafff6decbafdab9b3a2aaeac5e25670..d968078adbfb147e913b9a33fc54242a36f117ce:/src/gtk1/button.cpp diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp index 7b8ef4ed8c..a388cc3474 100644 --- a/src/gtk1/button.cpp +++ b/src/gtk1/button.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: button.cpp +// Name: src/gtk1/button.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,20 +7,19 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#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" +#ifndef WX_PRECOMP + #include "wx/button.h" +#endif + +#include "wx/stockitem.h" -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" +#include "wx/gtk1/win_gtk.h" //----------------------------------------------------------------------------- // classes @@ -45,6 +44,7 @@ extern bool g_blockEventsOnDrag; // "clicked" //----------------------------------------------------------------------------- +extern "C" { static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button ) { if (g_isIdle) @@ -55,7 +55,39 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton * wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId()); event.SetEventObject(button); - button->GetEventHandler()->ProcessEvent(event); + button->HandleWindowEvent(event); +} +} + +//----------------------------------------------------------------------------- +// "style_set" from m_widget +//----------------------------------------------------------------------------- + +static gint +gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), wxButton *win ) +{ + if (g_isIdle) + wxapp_install_idle_handler(); + + int left_border = 0; + int right_border = 0; + int top_border = 0; + int bottom_border = 0; + + /* the default button has a border around it */ + if (GTK_WIDGET_CAN_DEFAULT(m_widget)) + { + left_border = 6; + right_border = 6; + top_border = 6; + bottom_border = 5; + win->DoMoveWindow( win->m_x-top_border, + win->m_y-left_border, + win->m_width+left_border+right_border, + win->m_height+top_border+bottom_border ); + } + + return FALSE; } //----------------------------------------------------------------------------- @@ -76,44 +108,17 @@ 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; + 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 ); -*/ - -#ifdef __WXGTK20__ - if (m_widget == NULL) // may be !=NULL if stock form of Create was used - 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)) @@ -127,128 +132,77 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, else if (HasFlag(wxBU_BOTTOM)) y_alignment = 1.0; -#if GTK_CHECK_VERSION(2,4,0) - gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment); -#else if (GTK_IS_MISC(BUTTON_CHILD(m_widget))) gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)), x_alignment, y_alignment); -#endif - if (!label.empty()) - SetLabel(label); + 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_connect_after( GTK_OBJECT(m_widget), "clicked", GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this ); + gtk_signal_connect_after( GTK_OBJECT(m_widget), "style_set", + GTK_SIGNAL_FUNC(gtk_button_style_set_callback), (gpointer*) this ); + m_parent->DoAddChild( this ); PostCreation(size); return true; } - -bool wxButton::Create(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel, - const wxPoint& pos, long style, - const wxValidator& validator, const wxString& name) -{ -#ifdef __WXGTK20__ - m_widget = gtk_button_new_from_stock(wxStockItemToGTK(stock)); - return Create(parent, id, wxEmptyString, - pos, wxDefaultSize, style, validator, name); -#else - return CreateStock(parent, id, stock, descriptiveLabel, - pos, style, validator, name); -#endif -} -void wxButton::SetDefault() + +wxWindow *wxButton::SetDefault() { - wxWindow *parent = GetParent(); - wxCHECK_RET( parent, _T("button without parent?") ); + wxWindow *oldDefault = wxButtonBase::SetDefault(); - 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 ); + // resize for default border + gtk_button_style_set_callback( m_widget, NULL, this ); + + return oldDefault; } /* static */ wxSize wxButtonBase::GetDefaultSize() { -#ifdef __WXGTK20__ - 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; -#else return wxSize(80,26); -#endif } -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); -#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 + if (label.empty() && wxIsStockID(m_windowId)) + label = wxGetStockLabel(m_windowId); + + wxControl::SetLabel(label); + + const wxString labelGTK = GTKRemoveMnemonics(label); + + gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV(labelGTK)); } bool wxButton::Enable( bool enable ) { if ( !wxControl::Enable( enable ) ) - return FALSE; + return false; gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable ); - return TRUE; + return true; } 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) @@ -278,10 +232,8 @@ wxSize wxButton::DoGetBestSize() const 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)) { wxSize defaultSize = GetDefaultSize(); @@ -301,4 +253,3 @@ wxButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) } #endif // wxUSE_BUTTON -