/////////////////////////////////////////////////////////////////////////////
-// Name: button.cpp
+// Name: src/gtk/button.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// 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"
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// GTK callbacks
+// ----------------------------------------------------------------------------
-class wxButton;
+extern "C"
+{
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+static void
+wxgtk_button_clicked_callback(GtkWidget *WXUNUSED(widget), wxButton *button)
+{
+ if ( button->GTKShouldIgnoreEvent() )
+ return;
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+ wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
+ event.SetEventObject(button);
+ button->HandleWindowEvent(event);
+}
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
+static void
+wxgtk_button_enter_callback(GtkWidget *WXUNUSED(widget), wxButton *button)
+{
+ if ( button->GTKShouldIgnoreEvent() )
+ return;
-extern bool g_blockEventsOnDrag;
+ button->GTKMouseEnters();
+}
-//-----------------------------------------------------------------------------
-// "clicked"
-//-----------------------------------------------------------------------------
+static void
+wxgtk_button_leave_callback(GtkWidget *WXUNUSED(widget), wxButton *button)
+{
+ if ( button->GTKShouldIgnoreEvent() )
+ return;
-static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
+ button->GTKMouseLeaves();
+}
+
+static void
+wxgtk_button_press_callback(GtkWidget *WXUNUSED(widget), wxButton *button)
{
- if (g_isIdle)
- wxapp_install_idle_handler();
+ if ( button->GTKShouldIgnoreEvent() )
+ return;
- if (!button->m_hasVMT) return;
- if (g_blockEventsOnDrag) return;
+ button->GTKPressed();
+}
- wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
- event.SetEventObject(button);
- button->GetEventHandler()->ProcessEvent(event);
+static void
+wxgtk_button_released_callback(GtkWidget *WXUNUSED(widget), wxButton *button)
+{
+ if ( button->GTKShouldIgnoreEvent() )
+ return;
+
+ button->GTKReleased();
}
//-----------------------------------------------------------------------------
-// wxButton
+// "style_set" from m_widget
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
-
-wxButton::wxButton()
+static void
+wxgtk_button_style_set_callback(GtkWidget* widget, GtkStyle*, wxButton* win)
{
+ /* the default button has a border around it */
+ wxWindow* parent = win->GetParent();
+ if (parent && parent->m_wxwindow && GTK_WIDGET_CAN_DEFAULT(widget))
+ {
+ GtkBorder* border = NULL;
+ gtk_widget_style_get(widget, "default_border", &border, NULL);
+ if (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);
+ }
+ }
}
-wxButton::~wxButton()
-{
-}
+} // extern "C"
-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;
+//-----------------------------------------------------------------------------
+// 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)
+{
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++)
+ // create either a standard button with text label (which may still contain
+ // an image under GTK+ 2.6+) or a bitmap-only button if we don't have any
+ // label
+ const bool
+ useLabel = !(style & wxBU_NOTEXT) && (!label.empty() || wxIsStockID(id));
+ if ( useLabel )
{
- if (label2.GetChar(i) == wxT('&'))
- label2.SetChar(i,wxT('_'));
+ m_widget = gtk_button_new_with_mnemonic("");
}
+ else // no label, suppose we will have a bitmap
+ {
+ m_widget = gtk_button_new();
- 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 );
-*/
+ GtkWidget *image = gtk_image_new();
+ gtk_widget_show(image);
+ gtk_container_add(GTK_CONTAINER(m_widget), image);
+ }
- m_widget = gtk_button_new_with_label("");
+ g_object_ref(m_widget);
float x_alignment = 0.5;
if (HasFlag(wxBU_LEFT))
else if (HasFlag(wxBU_BOTTOM))
y_alignment = 1.0;
- 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 );
+ if ( useLabel )
+ 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_FUNC(gtk_button_clicked_callback), (gpointer*)this );
-
- m_parent->DoAddChild( this );
+ g_signal_connect_after (m_widget, "clicked",
+ G_CALLBACK (wxgtk_button_clicked_callback),
+ this);
- PostCreation();
- InheritAttributes();
+ g_signal_connect_after (m_widget, "style_set",
+ G_CALLBACK (wxgtk_button_style_set_callback),
+ this);
- 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 );
+ m_parent->DoAddChild( this );
- SetSize( new_size );
+ PostCreation(size);
- return TRUE;
+ return true;
}
-void wxButton::SetDefault()
+
+wxWindow *wxButton::SetDefault()
{
- wxWindow *parent = GetParent();
- wxCHECK_RET( parent, _T("button without parent?") );
+ wxWindow *oldDefault = wxButtonBase::SetDefault();
- wxWindow *winOldDefault = 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
+ wxgtk_button_style_set_callback( m_widget, NULL, this );
+
+ return oldDefault;
}
/* 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 );
+ wxString label(lbl);
-#ifdef __WXGTK20__
- wxString label2 = PrepareLabelMnemonics( label );
- gtk_label_set_text_with_mnemonic( GTK_LABEL( BUTTON_CHILD(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);
+
+ // don't use label if it was explicitly disabled
+ if ( HasFlag(wxBU_NOTEXT) )
+ return;
+
+ 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;
+ }
+ }
+
+ // this call is necessary if the button had been initially created without
+ // a (text) label -- then we didn't use gtk_button_new_with_mnemonic() and
+ // so "use-underline" GtkButton property remained unset
+ gtk_button_set_use_underline(GTK_BUTTON(m_widget), TRUE);
+ 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);
+
+ GTKApplyWidgetStyle( false );
+}
+
+#if wxUSE_MARKUP
+bool wxButton::DoSetLabelMarkup(const wxString& markup)
+{
+ wxCHECK_MSG( m_widget != NULL, false, "invalid button" );
+
+ const wxString stripped = RemoveMarkup(markup);
+ if ( stripped.empty() && !markup.empty() )
+ return false;
+
+ wxControl::SetLabel(stripped);
+
+ GtkLabel * const label = GTKGetLabel();
+ wxCHECK_MSG( label, false, "no label in this button?" );
+
+ GTKSetLabelWithMarkupForLabel(label, markup);
+
+ return true;
}
+#endif // wxUSE_MARKUP
bool wxButton::Enable( bool enable )
{
- if ( !wxControl::Enable( enable ) )
- return FALSE;
+ if (!base_type::Enable(enable))
+ return false;
+
+ gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
- gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable );
+ if (enable)
+ GTKFixSensitivity();
- return TRUE;
+ GTKUpdateBitmap();
+
+ return true;
}
-bool wxButton::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
{
-#ifdef __WXGTK20__
return GTK_BUTTON(m_widget)->event_window;
-#else
- return (window == m_widget->window);
-#endif
}
-void wxButton::ApplyWidgetStyle()
+GtkLabel *wxButton::GTKGetLabel() const
+{
+ GtkWidget *child = GTK_BIN(m_widget)->child;
+ if ( GTK_IS_ALIGNMENT(child) )
+ {
+ GtkWidget *box = GTK_BIN(child)->child;
+ for (GList* item = GTK_BOX(box)->children; item; item = item->next)
+ {
+ GtkBoxChild* boxChild = static_cast<GtkBoxChild*>(item->data);
+ if ( GTK_IS_LABEL(boxChild->widget) )
+ return GTK_LABEL(boxChild->widget);
+ }
+
+ return NULL;
+ }
+
+ return GTK_LABEL(child);
+}
+
+void wxButton::DoApplyWidgetStyle(GtkRcStyle *style)
{
- SetWidgetStyle();
- gtk_widget_set_style( m_widget, m_widgetStyle );
- gtk_widget_set_style( BUTTON_CHILD(m_widget), m_widgetStyle );
+ gtk_widget_modify_style(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<GtkBoxChild*>(item->data);
+ gtk_widget_modify_style(boxChild->widget, 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
+ // our size calculations (otherwise 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 )
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))
{
- if (ret.x < 80) ret.x = 80;
+ 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);
+}
+
+// ----------------------------------------------------------------------------
+// bitmaps support
+// ----------------------------------------------------------------------------
+
+void wxButton::GTKMouseEnters()
+{
+ m_isCurrent = true;
+
+ GTKUpdateBitmap();
+}
+
+void wxButton::GTKMouseLeaves()
+{
+ m_isCurrent = false;
+
+ GTKUpdateBitmap();
+}
+
+void wxButton::GTKPressed()
+{
+ m_isPressed = true;
+
+ GTKUpdateBitmap();
+}
+
+void wxButton::GTKReleased()
+{
+ m_isPressed = false;
+
+ GTKUpdateBitmap();
+}
+
+void wxButton::GTKOnFocus(wxFocusEvent& event)
+{
+ event.Skip();
+
+ GTKUpdateBitmap();
+}
+
+wxButton::State wxButton::GTKGetCurrentState() const
+{
+ if ( !IsThisEnabled() )
+ return m_bitmaps[State_Disabled].IsOk() ? State_Disabled : State_Normal;
+
+ if ( m_isPressed && m_bitmaps[State_Pressed].IsOk() )
+ return State_Pressed;
+
+ if ( m_isCurrent && m_bitmaps[State_Current].IsOk() )
+ return State_Current;
+
+ if ( HasFocus() && m_bitmaps[State_Focused].IsOk() )
+ return State_Focused;
+ return State_Normal;
+}
+
+void wxButton::GTKUpdateBitmap()
+{
+ // if we don't show bitmaps at all, there is nothing to update
+ if ( m_bitmaps[State_Normal].IsOk() )
+ {
+ // if we do show them, this will return a state for which we do have a
+ // valid bitmap
+ State state = GTKGetCurrentState();
+
+ GTKDoShowBitmap(m_bitmaps[state]);
+ }
+}
+
+void wxButton::GTKDoShowBitmap(const wxBitmap& bitmap)
+{
+ wxASSERT_MSG( bitmap.IsOk(), "invalid bitmap" );
+
+ GtkWidget *image;
+ if ( DontShowLabel() )
+ {
+ image = GTK_BIN(m_widget)->child;
+ }
+ else // have both label and bitmap
+ {
+#ifdef __WXGTK26__
+ if ( !gtk_check_version(2,6,0) )
+ {
+ image = gtk_button_get_image(GTK_BUTTON(m_widget));
+ }
+ else
+#endif // __WXGTK26__
+ {
+ // buttons with both label and bitmap are only supported with GTK+
+ // 2.6 so far
+ //
+ // it shouldn't be difficult to implement them ourselves for the
+ // previous GTK+ versions by stuffing a container with a label and
+ // an image inside GtkButton but there doesn't seem to be much
+ // point in doing this for ancient GTK+ versions
+ return;
+ }
+ }
+
+ wxCHECK_RET( image && GTK_IS_IMAGE(image), "must have image widget" );
+
+ gtk_image_set_from_pixbuf(GTK_IMAGE(image), bitmap.GetPixbuf());
+}
+
+wxBitmap wxButton::DoGetBitmap(State which) const
+{
+ return m_bitmaps[which];
+}
+
+void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which)
+{
+ switch ( which )
+ {
+ case State_Normal:
+ if ( DontShowLabel() )
+ {
+ // we only have the bitmap in this button, never remove it but
+ // do invalidate the best size when the bitmap (and presumably
+ // its size) changes
+ InvalidateBestSize();
+ }
+#ifdef __WXGTK26__
+ // normal image is special: setting it enables images for the button and
+ // resetting it to nothing disables all of them
+ else if ( !gtk_check_version(2,6,0) )
+ {
+ GtkWidget *image = gtk_button_get_image(GTK_BUTTON(m_widget));
+ if ( image && !bitmap.IsOk() )
+ {
+ gtk_container_remove(GTK_CONTAINER(m_widget), image);
+ }
+ else if ( !image && bitmap.IsOk() )
+ {
+ image = gtk_image_new();
+ gtk_button_set_image(GTK_BUTTON(m_widget), image);
+ }
+ else // image presence or absence didn't change
+ {
+ // don't invalidate best size below
+ break;
+ }
+
+ InvalidateBestSize();
+ }
+#endif // GTK+ 2.6+
+ break;
+
+ case State_Pressed:
+ if ( bitmap.IsOk() )
+ {
+ if ( !m_bitmaps[which].IsOk() )
+ {
+ // we need to install the callbacks to be notified about
+ // the button pressed state change
+ g_signal_connect
+ (
+ m_widget,
+ "pressed",
+ G_CALLBACK(wxgtk_button_press_callback),
+ this
+ );
+
+ g_signal_connect
+ (
+ m_widget,
+ "released",
+ G_CALLBACK(wxgtk_button_released_callback),
+ this
+ );
+ }
+ }
+ else // no valid bitmap
+ {
+ if ( m_bitmaps[which].IsOk() )
+ {
+ // we don't need to be notified about the button pressed
+ // state changes any more
+ g_signal_handlers_disconnect_by_func
+ (
+ m_widget,
+ (gpointer)wxgtk_button_press_callback,
+ this
+ );
+
+ g_signal_handlers_disconnect_by_func
+ (
+ m_widget,
+ (gpointer)wxgtk_button_released_callback,
+ this
+ );
+
+ // also make sure we don't remain stuck in pressed state
+ if ( m_isPressed )
+ {
+ m_isPressed = false;
+ GTKUpdateBitmap();
+ }
+ }
+ }
+ break;
+
+ case State_Current:
+ // the logic here is the same as above for State_Pressed: we need
+ // to connect the handlers if we must be notified about the changes
+ // in the button current state and we disconnect them when/if we
+ // don't need them any more
+ if ( bitmap.IsOk() )
+ {
+ if ( !m_bitmaps[which].IsOk() )
+ {
+ g_signal_connect
+ (
+ m_widget,
+ "enter",
+ G_CALLBACK(wxgtk_button_enter_callback),
+ this
+ );
+
+ g_signal_connect
+ (
+ m_widget,
+ "leave",
+ G_CALLBACK(wxgtk_button_leave_callback),
+ this
+ );
+ }
+ }
+ else // no valid bitmap
+ {
+ if ( m_bitmaps[which].IsOk() )
+ {
+ g_signal_handlers_disconnect_by_func
+ (
+ m_widget,
+ (gpointer)wxgtk_button_enter_callback,
+ this
+ );
+
+ g_signal_handlers_disconnect_by_func
+ (
+ m_widget,
+ (gpointer)wxgtk_button_leave_callback,
+ this
+ );
+
+ if ( m_isCurrent )
+ {
+ m_isCurrent = false;
+ GTKUpdateBitmap();
+ }
+ }
+ }
+ break;
+
+ case State_Focused:
+ if ( bitmap.IsOk() )
+ {
+ Connect(wxEVT_SET_FOCUS,
+ wxFocusEventHandler(wxButton::GTKOnFocus));
+ Connect(wxEVT_KILL_FOCUS,
+ wxFocusEventHandler(wxButton::GTKOnFocus));
+ }
+ else // no valid focused bitmap
+ {
+ Disconnect(wxEVT_SET_FOCUS,
+ wxFocusEventHandler(wxButton::GTKOnFocus));
+ Disconnect(wxEVT_KILL_FOCUS,
+ wxFocusEventHandler(wxButton::GTKOnFocus));
+ }
+ break;
+
+ default:
+ // no callbacks to connect/disconnect
+ ;
+ }
+
+ m_bitmaps[which] = bitmap;
+
+ // update the bitmap immediately if necessary, otherwise it will be done
+ // when the bitmap for the corresponding state is needed the next time by
+ // GTKUpdateBitmap()
+ if ( bitmap.IsOk() && which == GTKGetCurrentState() )
+ {
+ GTKDoShowBitmap(bitmap);
+ }
+}
+
+void wxButton::DoSetBitmapPosition(wxDirection dir)
+{
+#ifdef __WXGTK210__
+ if ( !gtk_check_version(2,10,0) )
+ {
+ GtkPositionType gtkpos;
+ switch ( dir )
+ {
+ default:
+ wxFAIL_MSG( "invalid position" );
+ // fall through
+
+ case wxLEFT:
+ gtkpos = GTK_POS_LEFT;
+ break;
+
+ case wxRIGHT:
+ gtkpos = GTK_POS_RIGHT;
+ break;
+
+ case wxTOP:
+ gtkpos = GTK_POS_TOP;
+ break;
+
+ case wxBOTTOM:
+ gtkpos = GTK_POS_BOTTOM;
+ break;
+ }
+
+ gtk_button_set_image_position(GTK_BUTTON(m_widget), gtkpos);
+ InvalidateBestSize();
+ }
+#endif // GTK+ 2.10+
+}
+
+#endif // wxUSE_BUTTON