X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..24bbbfb112cd755a944a76555b540af67d7f8ab1:/src/gtk/button.cpp diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp index 01b3283adc..35e0b4f537 100644 --- a/src/gtk/button.cpp +++ b/src/gtk/button.cpp @@ -1,37 +1,33 @@ ///////////////////////////////////////////////////////////////////////////// -// 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/defs.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_BUTTON #include "wx/button.h" -#include -#include +#ifndef WX_PRECOMP + #include "wx/toplevel.h" +#endif -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- +#include "wx/stockitem.h" -class wxButton; +#include "wx/gtk/private.h" +#include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- -// idle system +// classes //----------------------------------------------------------------------------- -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +class wxButton; //----------------------------------------------------------------------------- // data @@ -43,18 +39,58 @@ extern bool g_blockEventsOnDrag; // "clicked" //----------------------------------------------------------------------------- +extern "C" { 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); } +} + +//----------------------------------------------------------------------------- +// "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)) + { + GtkBorder *default_border = NULL; + gtk_widget_style_get( m_widget, "default_border", &default_border, NULL ); + if (default_border) + { + left_border += default_border->left; + right_border += default_border->right; + top_border += default_border->top; + bottom_border += default_border->bottom; + g_free( default_border ); + } + win->MoveWindow( + 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; +} //----------------------------------------------------------------------------- // wxButton @@ -74,121 +110,201 @@ 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++) + m_widget = gtk_button_new_with_mnemonic(""); + + 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; + +#ifdef __WXGTK24__ + if (!gtk_check_version(2,4,0)) { - if (label2.GetChar(i) == wxT('&')) - label2.SetChar(i,wxT('_')); + gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment); } - - 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) - if (style & wxNO_BORDER) - gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE ); + else #endif + { + if (GTK_IS_MISC(GTK_BIN(m_widget)->child)) + gtk_misc_set_alignment(GTK_MISC(GTK_BIN(m_widget)->child), + x_alignment, y_alignment); + } - gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", - GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this ); + SetLabel(label); - m_parent->DoAddChild( this ); - - PostCreation(); - - SetFont( parent->GetFont() ); + if (style & wxNO_BORDER) + gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE ); - 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, "clicked", + G_CALLBACK (gtk_button_clicked_callback), + this); - SetSize( new_size ); + g_signal_connect_after (m_widget, "style_set", + G_CALLBACK (gtk_button_style_set_callback), + this); - SetBackgroundColour( parent->GetBackgroundColour() ); - SetForegroundColour( parent->GetForegroundColour() ); + m_parent->DoAddChild( this ); - Show( TRUE ); + PostCreation(size); - return TRUE; + return true; } + void wxButton::SetDefault() { + wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); + wxCHECK_RET( tlw, _T("button without top level window?") ); + + tlw->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 ); } /* 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); + + const wxString labelGTK = GTKConvertMnemonics(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; + } + } + + 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; - return TRUE; + gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable); + + 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); + gtk_widget_modify_style(GTK_BIN(m_widget)->child, 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 ); + } + + 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; } -#endif // wxUSE_BUTTON +// static +wxVisualAttributes +wxButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_button_new); +} +#endif // wxUSE_BUTTON