X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32c77a71336262a7d7d5e79ac690a4bff78d1c92..ee3510132b8b4160f848bd4f502a6f5315f90dbc:/src/gtk1/button.cpp diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp index 2201232c15..d594d37e26 100644 --- a/src/gtk1/button.cpp +++ b/src/gtk1/button.cpp @@ -2,18 +2,24 @@ // Name: button.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ #pragma implementation "button.h" #endif +#include "wx/defs.h" + +#if wxUSE_BUTTON + #include "wx/button.h" +#include +#include + //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- @@ -21,69 +27,173 @@ class wxButton; //----------------------------------------------------------------------------- -// wxButton +// idle system //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl) +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; -void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), gpointer data ) +//----------------------------------------------------------------------------- +// data +//----------------------------------------------------------------------------- + +extern bool g_blockEventsOnDrag; + +//----------------------------------------------------------------------------- +// "clicked" +//----------------------------------------------------------------------------- + +static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button ) { - wxButton *button = (wxButton*)data; - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId()); - event.SetEventObject(button); - button->ProcessEvent(event); -}; + 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); +} //----------------------------------------------------------------------------- +// wxButton +//----------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl) -wxButton::wxButton(void) +wxButton::wxButton() { -}; +} -wxButton::wxButton( wxWindow *parent, wxWindowID id, const wxString &label, - const wxPoint &pos, const wxSize &size, - long style, const wxString &name ) +wxButton::~wxButton() { - Create( parent, id, label, pos, size, style, name ); -}; +} bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, const wxPoint &pos, const wxSize &size, - long style, const wxString &name ) + long style, const wxValidator& validator, const wxString &name ) { - m_needParent = TRUE; - - wxSize newSize = size; + 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; + } + +/* + 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 ); +*/ + + 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 ); +#endif - PreCreation( parent, id, pos, newSize, style, name ); + gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", + GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this ); - SetLabel(label); - m_widget = gtk_button_new_with_label( m_label ); + m_parent->DoAddChild( this ); + + PostCreation(); + + SetFont( parent->GetFont() ); - if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label ); - if (newSize.y == -1) newSize.y = 26; - SetSize( newSize.x, newSize.y ); + 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 ); - gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", - GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this ); + SetSize( new_size ); - PostCreation(); + SetBackgroundColour( parent->GetBackgroundColour() ); + SetForegroundColour( parent->GetForegroundColour() ); - Show( TRUE ); + Show( TRUE ); - return TRUE; -}; + return TRUE; +} -void wxButton::SetDefault(void) +void wxButton::SetDefault() { -}; + GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT ); + gtk_widget_grab_default( m_widget ); + + SetSize( m_x, m_y, m_width, m_height ); +} + +/* static */ +wxSize wxButton::GetDefaultSize() +{ + return wxSize(80,26); +} void wxButton::SetLabel( const wxString &label ) { - wxControl::SetLabel( label ); -}; + wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); + + wxControl::SetLabel( label ); + + gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel().mbc_str() ); +} + +bool wxButton::Enable( bool enable ) +{ + if ( !wxControl::Enable( enable ) ) + return FALSE; + + gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable ); + + return TRUE; +} + +void wxButton::ApplyWidgetStyle() +{ + SetWidgetStyle(); + gtk_widget_set_style( m_widget, m_widgetStyle ); + gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle ); +} -wxString wxButton::GetLabel(void) const +wxSize wxButton::DoGetBestSize() const { - return wxControl::GetLabel(); -}; + wxSize ret( wxControl::DoGetBestSize() ); + + if (!HasFlag(wxBU_EXACTFIT)) + { + if (ret.x < 80) ret.x = 80; + } + + return ret; +} + +#endif // wxUSE_BUTTON +