X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83624f79609f0d5e240c1f7d77d044bfff9702fc..2e1a688e3e9c6c265620e4f05d579077367e9fdb:/src/gtk1/button.cpp diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp index 8c91ec2adc..39d94b37b1 100644 --- a/src/gtk1/button.cpp +++ b/src/gtk1/button.cpp @@ -22,6 +22,13 @@ class wxButton; +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -34,12 +41,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); } //----------------------------------------------------------------------------- @@ -54,7 +64,7 @@ wxButton::wxButton() wxButton::~wxButton() { - if (m_clientData) delete m_clientData; + if (m_clientData) delete m_clientData; } bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, @@ -65,30 +75,51 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, 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 ); - m_widget = gtk_button_new_with_label( m_label ); + m_widget = gtk_button_new_with_label( "" ); + +#if (GTK_MINOR_VERSION > 0) + if (style & wxNO_BORDER) + gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE ); +#endif + SetLabel(label); - if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label ); - if (newSize.y == -1) newSize.y = 26; + int x = 0; int y = 0; + wxFont new_font( parent->GetFont() ); + GetTextExtent( m_label, &x, &y, (int*)NULL, (int*)NULL, &new_font ); + + wxSize newSize = size; + if (newSize.x == -1) + { + newSize.x = 12+x; + if (newSize.x < 80) newSize.x = 80; + } + if (newSize.y == -1) + { + newSize.y = 11+y; + if (newSize.x < 26) newSize.x = 26; + } + SetSize( newSize.x, newSize.y ); gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this ); - m_parent->AddChild( this ); - - (m_parent->m_insertCallback)( m_parent, this ); + m_parent->DoAddChild( this ); PostCreation(); SetBackgroundColour( parent->GetBackgroundColour() ); SetForegroundColour( parent->GetForegroundColour() ); + SetFont( parent->GetFont() ); Show( TRUE ); @@ -97,28 +128,35 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, void wxButton::SetDefault(void) { -/* - 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 ); +} + +/* static */ +wxSize wxButton::GetDefaultSize() +{ + return wxSize(80,26); } void wxButton::SetLabel( const wxString &label ) { - wxCHECK_RET( m_widget != NULL, "invalid button" ); + wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); wxControl::SetLabel( label ); - gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel() ); + gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel().mbc_str() ); } -void wxButton::Enable( bool enable ) +bool wxButton::Enable( bool enable ) { - wxCHECK_RET( m_widget != NULL, "invalid button" ); - - wxControl::Enable( enable ); + if ( !wxControl::Enable( enable ) ) + return FALSE; gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable ); + + return TRUE; } void wxButton::ApplyWidgetStyle() @@ -127,5 +165,3 @@ void wxButton::ApplyWidgetStyle() gtk_widget_set_style( m_widget, m_widgetStyle ); gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle ); } - -