Had missed one LPSTR.

[wxWidgets.git] / src / gtk / checkbox.cpp

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index d4023c5a042a644fd5a283f69c3f6025988538dc..946a09a4132b96b687159e20d99f4ffcd7d251c3 100644 (file)
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -14,9 +14,18 @@
 
 #include "wx/checkbox.h"
 
 
 #include "wx/checkbox.h"
 

+#if wxUSE_CHECKBOX
+

 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 

+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -29,7 +38,9 @@ extern bool   g_blockEventsOnDrag;
 
 static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckBox *cb )
 {
 
 static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckBox *cb )
 {

-    if (!cb->HasVMT()) return;
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (!cb->m_hasVMT) return;

 
     if (cb->m_blockFirstEvent)
     {
 
     if (cb->m_blockFirstEvent)
     {


@@ -71,7 +82,10 @@ bool wxCheckBox::Create(wxWindow *parent,
 
     m_blockFirstEvent = FALSE;
 
 
     m_blockFirstEvent = FALSE;
 

+#if wxUSE_VALIDATORS

     SetValidator( validator );
     SetValidator( validator );

+#endif
+

     wxControl::SetLabel( label );
 
     if ( style & wxALIGN_RIGHT )
     wxControl::SetLabel( label );
 
     if ( style & wxALIGN_RIGHT )


@@ -115,15 +129,10 @@ bool wxCheckBox::Create(wxWindow *parent,
                         GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback),
                         (gpointer *)this );
 
                         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();
 
 
     PostCreation();
 

-    gtk_widget_realize( m_widgetLabel );
-    gtk_widget_realize( m_widgetCheckbox );
-

     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );


@@ -163,13 +172,14 @@ void wxCheckBox::SetLabel( const wxString& label )
     gtk_label_set( GTK_LABEL(m_widgetLabel), GetLabel().mbc_str() );
 }
 
     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 );
 
     gtk_widget_set_sensitive( m_widgetLabel, enable );

+
+    return TRUE;

 }
 
 void wxCheckBox::ApplyWidgetStyle()
 }
 
 void wxCheckBox::ApplyWidgetStyle()


@@ -179,3 +189,4 @@ void wxCheckBox::ApplyWidgetStyle()
     gtk_widget_set_style( m_widgetLabel, m_widgetStyle );
 }
 
     gtk_widget_set_style( m_widgetLabel, m_widgetStyle );
 }
 

+#endif