X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5f7bcb48fd9a642036a3bf5c70e2b0c9576df1b1..aa78d22e2008726218d47da1f2ac5864c11b8ebb:/src/gtk1/button.cpp diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp index d411a22eda..e12cd26f15 100644 --- a/src/gtk1/button.cpp +++ b/src/gtk1/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" @@ -21,7 +17,8 @@ #include "wx/button.h" #include "wx/stockitem.h" -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" +#include "wx/gtk1/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,38 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton * 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)) + { + 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; +} //----------------------------------------------------------------------------- // wxButton @@ -87,33 +117,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)) @@ -127,29 +131,28 @@ 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 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; } - + void wxButton::SetDefault() { @@ -157,50 +160,18 @@ 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) - { - // 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 &lbl ) @@ -209,31 +180,14 @@ void wxButton::SetLabel( const wxString &lbl ) wxString label(lbl); -#ifndef __WXGTK20__ if (label.empty() && wxIsStockID(m_windowId)) label = wxGetStockLabel(m_windowId); -#endif wxControl::SetLabel(label); -#ifdef __WXGTK20__ - 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; - } + const wxString labelGTK = GTKRemoveMnemonics(label); - wxString label2 = PrepareLabelMnemonics(label); - gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(label2)); - gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE); -#else - gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV(GetLabel())); -#endif + gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV(labelGTK)); } bool wxButton::Enable( bool enable ) @@ -248,11 +202,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) @@ -282,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();