X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2cc0e28f6add744e192d196951dc8be7c9cc51f5..9b73db3c34aefd98080b425459322fa821ae271f:/src/gtk/checkbox.cpp

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index 0412601c8b..946a09a413 100644
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -14,9 +14,18 @@
 
 #include "wx/checkbox.h"
 
+#if wxUSE_CHECKBOX
+
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -29,7 +38,9 @@ extern bool   g_blockEventsOnDrag;
 
 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)
     {
@@ -71,7 +82,10 @@ bool wxCheckBox::Create(wxWindow *parent,
 
     m_blockFirstEvent = FALSE;
 
+#if wxUSE_VALIDATORS
     SetValidator( validator );
+#endif
+
     wxControl::SetLabel( label );
 
     if ( style & wxALIGN_RIGHT )
@@ -81,7 +95,7 @@ bool wxCheckBox::Create(wxWindow *parent,
         //     left of it
         m_widgetCheckbox = gtk_check_button_new();
 
-        m_widgetLabel = gtk_label_new(m_label);
+        m_widgetLabel = gtk_label_new(m_label.mbc_str());
         gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5);
 
         m_widget = gtk_hbox_new(FALSE, 0);
@@ -94,7 +108,7 @@ bool wxCheckBox::Create(wxWindow *parent,
     }
     else
     {
-        m_widgetCheckbox = gtk_check_button_new_with_label( m_label );
+        m_widgetCheckbox = gtk_check_button_new_with_label( m_label.mbc_str() );
         m_widgetLabel = GTK_BUTTON( m_widgetCheckbox )->child;
         m_widget = m_widgetCheckbox;
     }
@@ -103,7 +117,7 @@ bool wxCheckBox::Create(wxWindow *parent,
     if (newSize.x == -1)
     {
         newSize.x = 25 + gdk_string_measure( m_widgetCheckbox->style->font,
-                                             m_label );
+                                             m_label.mbc_str() );
     }
     if (newSize.y == -1)
         newSize.y = 26;
@@ -115,15 +129,10 @@ 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();
 
-    gtk_widget_realize( m_widgetLabel );
-    gtk_widget_realize( m_widgetCheckbox );
-
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );
@@ -135,7 +144,7 @@ bool wxCheckBox::Create(wxWindow *parent,
 
 void wxCheckBox::SetValue( bool state )
 {
-    wxCHECK_RET( m_widgetCheckbox != NULL, "invalid checkbox" );
+    wxCHECK_RET( m_widgetCheckbox != NULL, _T("invalid checkbox") );
 
     if ( state == GetValue() )
         return;
@@ -149,27 +158,28 @@ void wxCheckBox::SetValue( bool state )
 
 bool wxCheckBox::GetValue() const
 {
-    wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, "invalid checkbox" );
+    wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, _T("invalid checkbox") );
 
     return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active;
 }
 
 void wxCheckBox::SetLabel( const wxString& label )
 {
-    wxCHECK_RET( m_widgetLabel != NULL, "invalid checkbox" );
+    wxCHECK_RET( m_widgetLabel != NULL, _T("invalid checkbox") );
 
     wxControl::SetLabel( label );
 
-    gtk_label_set( GTK_LABEL(m_widgetLabel), GetLabel() );
+    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, "invalid checkbox" );
-
-    wxControl::Enable( enable );
+    if ( !wxControl::Enable( enable ) )
+        return FALSE;
 
     gtk_widget_set_sensitive( m_widgetLabel, enable );
+
+    return TRUE;
 }
 
 void wxCheckBox::ApplyWidgetStyle()
@@ -179,3 +189,4 @@ void wxCheckBox::ApplyWidgetStyle()
     gtk_widget_set_style( m_widgetLabel, m_widgetStyle );
 }
 
+#endif