X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a90c0600bb319326aa9b70ac4551fdd11684e223..4c410aa14e7818b946351842fed2905239c15592:/src/gtk/button.cpp?ds=sidebyside diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp index e21402f843..5a05a8db2e 100644 --- a/src/gtk/button.cpp +++ b/src/gtk/button.cpp @@ -7,10 +7,6 @@ // 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" @@ -22,6 +18,7 @@ #include "wx/stockitem.h" #include "wx/gtk/private.h" +#include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- // classes @@ -46,6 +43,7 @@ extern bool g_blockEventsOnDrag; // "clicked" //----------------------------------------------------------------------------- +extern "C" { static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button ) { if (g_isIdle) @@ -58,6 +56,7 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton * event.SetEventObject(button); button->GetEventHandler()->ProcessEvent(event); } +} //----------------------------------------------------------------------------- // "style_set" from m_widget @@ -68,9 +67,30 @@ gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), w { if (g_isIdle) wxapp_install_idle_handler(); - - if (GTK_WIDGET_REALIZED(m_widget)) - win->SetSize( win->m_x, win->m_y, win->m_width, win->m_height ); + + 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->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; } @@ -103,33 +123,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, 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__ 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)) @@ -143,7 +137,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, else if (HasFlag(wxBU_BOTTOM)) y_alignment = 1.0; -#if __WXGTK24__ +#ifdef __WXGTK24__ if (!gtk_check_version(2,4,0)) { gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment); @@ -161,19 +155,21 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, if (style & wxNO_BORDER) gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE ); - gtk_signal_connect_after( GTK_OBJECT(m_widget), "clicked", - GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this ); + g_signal_connect_after (m_widget, "clicked", + G_CALLBACK (gtk_button_clicked_callback), + this); + + g_signal_connect_after (m_widget, "style_set", + G_CALLBACK (gtk_button_style_set_callback), + 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; } - + void wxButton::SetDefault() { @@ -181,17 +177,17 @@ void wxButton::SetDefault() wxCHECK_RET( parent, _T("button without parent?") ); 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 ); } /* static */ wxSize wxButtonBase::GetDefaultSize() { -#ifdef __WXGTK20__ static wxSize size = wxDefaultSize; if (size == wxDefaultSize) { @@ -218,13 +214,10 @@ wxSize wxButtonBase::GetDefaultSize() 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 &lbl ) @@ -238,7 +231,8 @@ void wxButton::SetLabel( const wxString &lbl ) wxControl::SetLabel(label); -#ifdef __WXGTK20__ + const wxString labelGTK = GTKConvertMnemonics(label); + if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label)) { const char *stock = wxGetStockGtkID(m_windowId); @@ -250,15 +244,10 @@ void wxButton::SetLabel( const wxString &lbl ) } } - wxString label2 = PrepareLabelMnemonics(label); - gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(label2)); + gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK)); gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE); - + ApplyWidgetStyle( false ); - -#else - gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV(GetLabel())); -#endif } bool wxButton::Enable( bool enable ) @@ -273,11 +262,7 @@ bool wxButton::Enable( bool enable ) 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) @@ -307,10 +292,6 @@ 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();