- m_needParent = TRUE;
-
- PreCreation( parent, id, pos, size, style, name );
-
- SetValidator( validator );
-
- SetLabel( label );
-
- m_widget = gtk_check_button_new_with_label( m_label );
-
- wxSize newSize = size;
- if (newSize.x == -1) newSize.x = 25+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_FUNC(gtk_checkbox_clicked_callback), (gpointer*)this );
-
- PostCreation();
-
- Show( TRUE );
-
- return TRUE;
+ m_blockEvent = false;
+
+ if (!PreCreation( parent, pos, size ) ||
+ !CreateBase( parent, id, pos, size, style, validator, name ))
+ {
+ wxFAIL_MSG( wxT("wxCheckBox creation failed") );
+ return false;
+ }
+
+ wxASSERT_MSG( (style & wxCHK_ALLOW_3RD_STATE_FOR_USER) == 0 ||
+ (style & wxCHK_3STATE) != 0,
+ wxT("Using wxCHK_ALLOW_3RD_STATE_FOR_USER")
+ wxT(" style flag for a 2-state checkbox is useless") );
+
+ if ( style & wxALIGN_RIGHT )
+ {
+ // VZ: as I don't know a way to create a right aligned checkbox with
+ // GTK we will create a checkbox without label and a label at the
+ // left of it
+ m_widgetCheckbox = gtk_check_button_new();
+
+ m_widgetLabel = gtk_label_new("");
+ gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5);
+
+ m_widget = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(m_widget), m_widgetLabel, FALSE, FALSE, 3);
+ gtk_box_pack_start(GTK_BOX(m_widget), m_widgetCheckbox, FALSE, FALSE, 3);
+
+ gtk_widget_show( m_widgetLabel );
+ gtk_widget_show( m_widgetCheckbox );
+ }
+ else
+ {
+ m_widgetCheckbox = gtk_check_button_new_with_label("");
+ m_widgetLabel = GTK_BIN(m_widgetCheckbox)->child;
+ m_widget = m_widgetCheckbox;
+ }
+ g_object_ref(m_widget);
+ SetLabel( label );
+
+ g_signal_connect (m_widgetCheckbox, "toggled",
+ G_CALLBACK (gtk_checkbox_toggled_callback), this);
+
+ m_parent->DoAddChild( this );
+
+ PostCreation(size);
+
+ return true;