else if (HasFlag(wxBU_BOTTOM))
y_alignment = 1.0;
-#if GTK_CHECK_VERSION(2,4,0)
- gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
-#else
- if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
- gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
- x_alignment, y_alignment);
+#if __WXGTK24__
+ if (!gtk_check_version(2,4,0))
+ {
+ gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
+ }
+ else
#endif
+ {
+ if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
+ gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
+ x_alignment, y_alignment);
+ }
SetLabel(label);
wxString label(lbl);
-#ifndef __WXGTK20__
if (label.empty() && wxIsStockID(m_windowId))
label = wxGetStockLabel(m_windowId);
-#endif
wxControl::SetLabel(label);
{
gtk_button_set_label(GTK_BUTTON(m_widget), stock);
gtk_button_set_use_stock(GTK_BUTTON(m_widget), TRUE);
+ return;
}
- return;
}
wxString label2 = PrepareLabelMnemonics(label);