X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a81258bee4e20d3fa9b3d2f6bf3bcd1200d1e5e0..ef44a62179cde47dffb369b9731b2f74d54de52f:/src/gtk1/button.cpp?ds=sidebyside diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp index 2a26bcc065..8338f5bcff 100644 --- a/src/gtk1/button.cpp +++ b/src/gtk1/button.cpp @@ -45,14 +45,20 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton * IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl) -wxButton::wxButton(void) +wxButton::wxButton() { } +wxButton::~wxButton() +{ + if (m_clientData) delete m_clientData; +} + 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_clientData = (wxClientData*) NULL; m_needParent = TRUE; wxSize newSize = size; @@ -71,9 +77,14 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, 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 ); + PostCreation(); SetBackgroundColour( parent->GetBackgroundColour() ); + SetForegroundColour( parent->GetForegroundColour() ); Show( TRUE ); @@ -106,34 +117,11 @@ void wxButton::Enable( bool enable ) gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable ); } -void wxButton::SetFont( const wxFont &font ) -{ - wxCHECK_RET( m_widget != NULL, "invalid button" ); - - wxControl::SetFont( font ); - - gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle ); -} - -void wxButton::SetBackgroundColour( const wxColour &colour ) +void wxButton::ApplyWidgetStyle() { - wxCHECK_RET( m_widget != NULL, "invalid button" ); - - wxControl::SetBackgroundColour( colour ); - - if (!m_backgroundColour.Ok()) return; - + SetWidgetStyle(); gtk_widget_set_style( m_widget, m_widgetStyle ); -} - -void wxButton::SetForegroundColour( const wxColour &colour ) -{ - wxCHECK_RET( m_widget != NULL, "invalid button" ); - - wxControl::SetForegroundColour( colour ); - - if (!m_foregroundColour.Ok()) return; - gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle ); } +