- m_needParent = TRUE;
-
- wxSize newSize = size;
-
- PreCreation( parent, id, pos, newSize, style, name );
-
- m_label = label;
- m_widget = gtk_button_new_with_label( label );
-
- if (newSize.x == -1) newSize.x = 15+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_button_clicked_callback), (gpointer*)this );
-
- PostCreation();
-
- Show( TRUE );
-
- return TRUE;
-};
-
-void wxButton::SetDefault(void)
+ m_needParent = TRUE;
+ m_acceptsFocus = TRUE;
+
+ if (!PreCreation( parent, pos, size ) ||
+ !CreateBase( parent, id, pos, size, style, validator, name ))
+ {
+ wxFAIL_MSG( wxT("wxButton creation failed") );
+ return FALSE;
+ }
+
+/*
+ wxString label2( label );
+ for (size_t i = 0; i < label2.Len(); i++)
+ {
+ if (label2.GetChar(i) == wxT('&'))
+ label2.SetChar(i,wxT('_'));
+ }
+
+ GtkWidget *accel_label = gtk_accel_label_new( label2.mb_str() );
+ gtk_widget_show( accel_label );
+
+ m_widget = gtk_button_new();
+ gtk_container_add( GTK_CONTAINER(m_widget), accel_label );
+
+ gtk_accel_label_set_accel_widget( GTK_ACCEL_LABEL(accel_label), m_widget );
+
+ guint accel_key = gtk_label_parse_uline (GTK_LABEL(accel_label), label2.mb_str() );
+ gtk_accel_label_refetch( GTK_ACCEL_LABEL(accel_label) );
+
+ wxControl::SetLabel( label );
+*/
+
+ m_widget = gtk_button_new_with_label("");
+
+ float x_alignment = 0.5;
+ if (HasFlag(wxBU_LEFT))
+ x_alignment = 0.0;
+ else if (HasFlag(wxBU_RIGHT))
+ x_alignment = 1.0;
+
+ float y_alignment = 0.5;
+ if (HasFlag(wxBU_TOP))
+ y_alignment = 0.0;
+ else if (HasFlag(wxBU_BOTTOM))
+ y_alignment = 1.0;
+
+ gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
+ x_alignment, y_alignment);
+
+ SetLabel( label );
+
+ if (style & wxNO_BORDER)
+ gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
+
+ gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
+ GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
+
+ m_parent->DoAddChild( this );
+
+ PostCreation();
+
+ SetFont( parent->GetFont() );
+
+ wxSize best_size( DoGetBestSize() );
+ wxSize new_size( size );
+ if (new_size.x == -1)
+ new_size.x = best_size.x;
+ if (new_size.y == -1)
+ new_size.y = best_size.y;
+ if ((new_size.x != size.x) || (new_size.y != size.y))
+ SetSize( new_size.x, new_size.y );
+
+ SetSize( new_size );
+
+ SetBackgroundColour( parent->GetBackgroundColour() );
+ SetForegroundColour( parent->GetForegroundColour() );
+
+ Show( TRUE );
+
+ return TRUE;
+}
+
+void wxButton::SetDefault()