-Wundef fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index acaf646e22c3b43896d83cdc0b42db3dee732c8f..faf3fa5d0f30be372b6332f84ba95ca573bf37da 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -174,7 +174,7 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     else if (HasFlag(wxBU_BOTTOM))
         y_alignment = 1.0;
 
     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);
     if (!gtk_check_version(2,4,0))
     {
         gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 526fd5e116dda679fcca77a2d3ab08135b0abace..280f57a98b4b1331115edce7bb88c6a704b3a4b7 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -145,7 +145,7 @@ gtk_pizza_get_type ()
     return pizza_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)
 /* 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 =
     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),
         g_signal_new(
             "set_scroll_adjustments",
             G_TYPE_FROM_CLASS(object_class),

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index acaf646e22c3b43896d83cdc0b42db3dee732c8f..faf3fa5d0f30be372b6332f84ba95ca573bf37da 100644 (file)
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -174,7 +174,7 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     else if (HasFlag(wxBU_BOTTOM))
         y_alignment = 1.0;
 
     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);
     if (!gtk_check_version(2,4,0))
     {
         gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);

diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c
index 526fd5e116dda679fcca77a2d3ab08135b0abace..280f57a98b4b1331115edce7bb88c6a704b3a4b7 100644 (file)
--- a/src/gtk1/win_gtk.c
+++ b/src/gtk1/win_gtk.c
@@ -145,7 +145,7 @@ gtk_pizza_get_type ()
     return pizza_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)
 /* 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 =
     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),
         g_signal_new(
             "set_scroll_adjustments",
             G_TYPE_FROM_CLASS(object_class),