X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..0f217db31814dde7432ceb2e00ddf42b968b9fa3:/src/gtk1/button.cpp diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp index d4361f37b8..2201232c15 100644 --- a/src/gtk1/button.cpp +++ b/src/gtk1/button.cpp @@ -41,39 +41,39 @@ wxButton::wxButton(void) }; wxButton::wxButton( wxWindow *parent, wxWindowID id, const wxString &label, - const wxPoint &pos, const wxSize &size, - const long style, const wxString &name ) + const wxPoint &pos, const wxSize &size, + long style, const wxString &name ) { Create( parent, id, label, pos, size, style, name ); }; bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, - const wxPoint &pos, const wxSize &size, - const long style, const wxString &name ) + const wxPoint &pos, const wxSize &size, + long style, const wxString &name ) { m_needParent = TRUE; - + wxSize newSize = size; PreCreation( parent, id, pos, newSize, style, name ); - - m_label = label; - m_widget = gtk_button_new_with_label( label ); - + + SetLabel(label); + m_widget = gtk_button_new_with_label( m_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 ); - - gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", + + gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this ); PostCreation(); - + Show( TRUE ); - + return TRUE; }; - + void wxButton::SetDefault(void) { };