-Wundef fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -174,7 +174,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
|
||||
else if (HasFlag(wxBU_BOTTOM))
|
||||
y_alignment = 1.0;
|
||||
|
||||
#if __WXGTK24__
|
||||
#ifdef __WXGTK24__
|
||||
if (!gtk_check_version(2,4,0))
|
||||
{
|
||||
gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
|
||||
|
@@ -145,7 +145,7 @@ gtk_pizza_get_type ()
|
||||
return pizza_type;
|
||||
}
|
||||
|
||||
#if __WXGTK20__
|
||||
#ifdef __WXGTK20__
|
||||
/* Marshaller needed for set_scroll_adjustments signal,
|
||||
generated with GLib-2.4.6 glib-genmarshal */
|
||||
#define g_marshal_value_peek_object(v) g_value_get_object (v)
|
||||
@@ -218,7 +218,7 @@ gtk_pizza_class_init (GtkPizzaClass *klass)
|
||||
klass->set_scroll_adjustments = gtk_pizza_scroll_set_adjustments;
|
||||
|
||||
widget_class->set_scroll_adjustments_signal =
|
||||
#if __WXGTK20__
|
||||
#ifdef __WXGTK20__
|
||||
g_signal_new(
|
||||
"set_scroll_adjustments",
|
||||
G_TYPE_FROM_CLASS(object_class),
|
||||
|
@@ -174,7 +174,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
|
||||
else if (HasFlag(wxBU_BOTTOM))
|
||||
y_alignment = 1.0;
|
||||
|
||||
#if __WXGTK24__
|
||||
#ifdef __WXGTK24__
|
||||
if (!gtk_check_version(2,4,0))
|
||||
{
|
||||
gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
|
||||
|
@@ -145,7 +145,7 @@ gtk_pizza_get_type ()
|
||||
return pizza_type;
|
||||
}
|
||||
|
||||
#if __WXGTK20__
|
||||
#ifdef __WXGTK20__
|
||||
/* Marshaller needed for set_scroll_adjustments signal,
|
||||
generated with GLib-2.4.6 glib-genmarshal */
|
||||
#define g_marshal_value_peek_object(v) g_value_get_object (v)
|
||||
@@ -218,7 +218,7 @@ gtk_pizza_class_init (GtkPizzaClass *klass)
|
||||
klass->set_scroll_adjustments = gtk_pizza_scroll_set_adjustments;
|
||||
|
||||
widget_class->set_scroll_adjustments_signal =
|
||||
#if __WXGTK20__
|
||||
#ifdef __WXGTK20__
|
||||
g_signal_new(
|
||||
"set_scroll_adjustments",
|
||||
G_TYPE_FROM_CLASS(object_class),
|
||||
|
Reference in New Issue
Block a user