- m_needParent = TRUE;
-
- PreCreation( parent, id, pos, size, style, name );
-
- SetValidator( validator );
-
- wxControl::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_needParent = TRUE;
+ m_acceptsFocus = TRUE;
+
+ if (!PreCreation( parent, pos, size ) ||
+ !CreateBase( parent, id, pos, size, style, validator, name ))
+ {
+ wxFAIL_MSG( wxT("wxCheckBox creation failed") );
+ return FALSE;
+ }
+
+ wxControl::SetLabel( label );
+
+ 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(m_label.mbc_str());
+ 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_label.mbc_str() );
+ m_widgetLabel = GTK_BUTTON( m_widgetCheckbox )->child;
+ m_widget = m_widgetCheckbox;
+ }
+
+ wxSize newSize(size);
+ if (newSize.x == -1)
+ {
+ newSize.x = 25 + gdk_string_measure( m_widgetCheckbox->style->font,
+ m_label.mbc_str() );
+ }
+ if (newSize.y == -1)
+ newSize.y = 26;
+
+ SetSize( newSize.x, newSize.y );
+
+ gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
+ "clicked",
+ GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback),
+ (gpointer *)this );
+
+ m_parent->DoAddChild( this );
+
+ PostCreation();
+
+ SetBackgroundColour( parent->GetBackgroundColour() );
+ SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
+
+ Show( TRUE );
+
+ return TRUE;