X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f96aa4d9eb296b3dfc468a351ce013bf92fab983..e22c13fe7ed64b4a7cb68ef42b338b6805f9fc64:/src/gtk/button.cpp diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp index f2a516ec65..01b3283adc 100644 --- a/src/gtk/button.cpp +++ b/src/gtk/button.cpp @@ -2,7 +2,7 @@ // Name: button.cpp // Purpose: // Author: Robert Roebling -// Id: $id$ +// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -11,14 +11,28 @@ #pragma implementation "button.h" #endif +#include "wx/defs.h" + +#if wxUSE_BUTTON + #include "wx/button.h" +#include +#include + //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- class wxButton; +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -31,12 +45,15 @@ extern bool g_blockEventsOnDrag; static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button ) { - if (!button->HasVMT()) return; - if (g_blockEventsOnDrag) return; - - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId()); - event.SetEventObject(button); - button->GetEventHandler()->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); } //----------------------------------------------------------------------------- @@ -45,7 +62,11 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton * IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl) -wxButton::wxButton(void) +wxButton::wxButton() +{ +} + +wxButton::~wxButton() { } @@ -53,83 +74,121 @@ 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_needParent = TRUE; + m_acceptsFocus = TRUE; - wxSize newSize = size; + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, validator, name )) + { + wxFAIL_MSG( wxT("wxButton creation failed") ); + return FALSE; + } - PreCreation( parent, id, pos, newSize, style, name ); - - SetValidator( validator ); +/* + 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(""); - m_widget = gtk_button_new_with_label( m_label ); - SetLabel(label); + SetLabel( label ); - 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 ); +#if (GTK_MINOR_VERSION > 0) + if (style & wxNO_BORDER) + gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE ); +#endif - gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", - GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this ); + gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", + GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this ); - PostCreation(); + m_parent->DoAddChild( this ); + + PostCreation(); - SetBackgroundColour( parent->GetBackgroundColour() ); + SetFont( parent->GetFont() ); - Show( TRUE ); + 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 ); - return TRUE; + SetSize( new_size ); + + SetBackgroundColour( parent->GetBackgroundColour() ); + SetForegroundColour( parent->GetForegroundColour() ); + + Show( 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 ); -*/ + GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT ); + gtk_widget_grab_default( m_widget ); + + SetSize( m_x, m_y, m_width, m_height ); } -void wxButton::SetLabel( const wxString &label ) +/* static */ +wxSize wxButton::GetDefaultSize() { - wxCHECK_RET( m_widget != NULL, "invalid button" ); - - wxControl::SetLabel( label ); - - gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel() ); + return wxSize(80,26); } -void wxButton::Enable( bool enable ) +void wxButton::SetLabel( const wxString &label ) { - wxCHECK_RET( m_widget != NULL, "invalid button" ); + wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); - wxControl::Enable( enable ); + wxControl::SetLabel( label ); - gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable ); + gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel().mbc_str() ); } -void wxButton::SetFont( const wxFont &font ) +bool wxButton::Enable( bool enable ) { - wxCHECK_RET( m_widget != NULL, "invalid button" ); - - wxControl::SetFont( font ); + if ( !wxControl::Enable( enable ) ) + return FALSE; - gtk_widget_set_style( GTK_BUTTON(m_widget)->child, - gtk_style_ref( - gtk_widget_get_style( m_widget ) ) ); + gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable ); + + return TRUE; } -void wxButton::SetBackgroundColour( const wxColour &colour ) +void wxButton::ApplyWidgetStyle() { - return; - - wxCHECK_RET( m_widget != NULL, "invalid button" ); + SetWidgetStyle(); + gtk_widget_set_style( m_widget, m_widgetStyle ); + gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle ); +} - wxControl::SetBackgroundColour( colour ); - - if (!m_backgroundColour.Ok()) return; - - gtk_widget_set_style( GTK_BUTTON(m_widget)->child, - gtk_style_ref( - gtk_widget_get_style( m_widget ) ) ); +wxSize wxButton::DoGetBestSize() const +{ + wxSize ret( wxControl::DoGetBestSize() ); + if (ret.x < 80) ret.x = 80; + return ret; } +#endif // wxUSE_BUTTON