X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/acfd422afac254f4356904275656c0c15685fa1e..8dbf458911c24bae120bed07d5627a65f362b8d1:/src/gtk1/checkbox.cpp diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp index 1811807ab0..946a09a413 100644 --- a/src/gtk1/checkbox.cpp +++ b/src/gtk1/checkbox.cpp @@ -14,6 +14,8 @@ #include "wx/checkbox.h" +#if wxUSE_CHECKBOX + #include "gdk/gdk.h" #include "gtk/gtk.h" @@ -38,7 +40,7 @@ static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckB { if (g_isIdle) wxapp_install_idle_handler(); - if (!cb->HasVMT()) return; + if (!cb->m_hasVMT) return; if (cb->m_blockFirstEvent) { @@ -80,7 +82,10 @@ bool wxCheckBox::Create(wxWindow *parent, m_blockFirstEvent = FALSE; +#if wxUSE_VALIDATORS SetValidator( validator ); +#endif + wxControl::SetLabel( label ); if ( style & wxALIGN_RIGHT ) @@ -124,9 +129,7 @@ bool wxCheckBox::Create(wxWindow *parent, GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback), (gpointer *)this ); - m_parent->AddChild( this ); - - (m_parent->m_insertCallback)( m_parent, this ); + m_parent->DoAddChild( this ); PostCreation(); @@ -169,13 +172,14 @@ void wxCheckBox::SetLabel( const wxString& label ) gtk_label_set( GTK_LABEL(m_widgetLabel), GetLabel().mbc_str() ); } -void wxCheckBox::Enable( bool enable ) +bool wxCheckBox::Enable( bool enable ) { - wxCHECK_RET( m_widgetLabel != NULL, _T("invalid checkbox") ); - - wxControl::Enable( enable ); + if ( !wxControl::Enable( enable ) ) + return FALSE; gtk_widget_set_sensitive( m_widgetLabel, enable ); + + return TRUE; } void wxCheckBox::ApplyWidgetStyle() @@ -185,3 +189,4 @@ void wxCheckBox::ApplyWidgetStyle() gtk_widget_set_style( m_widgetLabel, m_widgetStyle ); } +#endif