X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9fa72bd2a637cee761c56e2ce61cec3e43c62765..8ba80c6f8325e61de2e3fc4bbd7cf3d750f432cd:/src/gtk/button.cpp diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp index 5a05a8db2e..fabe9a234f 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$ @@ -10,28 +10,15 @@ // 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/gtk/win_gtk.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxButton; - -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; //----------------------------------------------------------------------------- // data @@ -46,15 +33,12 @@ extern bool g_blockEventsOnDrag; 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); } } @@ -62,37 +46,27 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton * // "style_set" from m_widget //----------------------------------------------------------------------------- -static gint -gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), wxButton *win ) +extern "C" { +static void +gtk_button_style_set_callback(GtkWidget* widget, GtkStyle*, 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)) + wxWindow* parent = win->GetParent(); + if (parent && parent->m_wxwindow && GTK_WIDGET_CAN_DEFAULT(widget)) { - GtkBorder *default_border = NULL; - gtk_widget_style_get( m_widget, "default_border", &default_border, NULL ); - if (default_border) + GtkBorder* border = NULL; + gtk_widget_style_get(widget, "default_border", &border, NULL); + if (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 - 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); } - 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; +} } //----------------------------------------------------------------------------- @@ -109,21 +83,24 @@ 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; } m_widget = gtk_button_new_with_mnemonic(""); + g_object_ref(m_widget); float x_alignment = 0.5; if (HasFlag(wxBU_LEFT)) @@ -137,18 +114,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, else if (HasFlag(wxBU_BOTTOM)) y_alignment = 1.0; -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment); - } - else -#endif - { - if (GTK_IS_MISC(BUTTON_CHILD(m_widget))) - gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)), - x_alignment, y_alignment); - } + gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment); SetLabel(label); @@ -171,18 +137,17 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, } -void wxButton::SetDefault() +wxWindow *wxButton::SetDefault() { - wxWindow *parent = GetParent(); - wxCHECK_RET( parent, _T("button without parent?") ); - - parent->SetDefaultItem(this); + wxWindow *oldDefault = wxButtonBase::SetDefault(); GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT ); gtk_widget_grab_default( m_widget ); // resize for default border gtk_button_style_set_callback( m_widget, NULL, this ); + + return oldDefault; } /* static */ @@ -231,8 +196,6 @@ void wxButton::SetLabel( const wxString &lbl ) wxControl::SetLabel(label); - const wxString labelGTK = GTKConvertMnemonics(label); - if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label)) { const char *stock = wxGetStockGtkID(m_windowId); @@ -244,6 +207,7 @@ void wxButton::SetLabel( const wxString &lbl ) } } + 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); @@ -253,14 +217,14 @@ void wxButton::SetLabel( const wxString &lbl ) bool wxButton::Enable( bool enable ) { if ( !wxControl::Enable( enable ) ) - return FALSE; + return false; - gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable ); + gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable); - return TRUE; + return true; } -bool wxButton::IsOwnGtkWindow( GdkWindow *window ) +GdkWindow *wxButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { return GTK_BUTTON(m_widget)->event_window; } @@ -268,7 +232,23 @@ bool wxButton::IsOwnGtkWindow( GdkWindow *window ) void wxButton::DoApplyWidgetStyle(GtkRcStyle *style) { gtk_widget_modify_style(m_widget, style); - gtk_widget_modify_style(BUTTON_CHILD(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 @@ -311,4 +291,3 @@ wxButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) } #endif // wxUSE_BUTTON -