[gtk+] Re-enable deprecation guards

[Javier Jardón <jjardon src gnome org>]

commit 8b512bd9dd4c16abb27d18dc40b32b6c0545fff5
Author: Javier Jardón <jjardon gnome org>
Date:   Fri Oct 29 03:28:24 2010 +0200

    Re-enable deprecation guards

 gtk/gtklayout.c   |    2 --
 gtk/gtklayout.h   |    2 +-
 gtk/gtkviewport.c |    3 +--
 gtk/gtkviewport.h |    2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c
index fd04e68..a2589c2 100644
--- a/gtk/gtklayout.c
+++ b/gtk/gtklayout.c
@@ -30,8 +30,6 @@
 
 #include "config.h"
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include "gtklayout.h"
 
 #include "gdkconfig.h"
diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index 61ba27f..c2159f5 100644
--- a/gtk/gtklayout.h
+++ b/gtk/gtklayout.h
@@ -94,7 +94,7 @@ void           gtk_layout_get_size        (GtkLayout     *layout,
 					   guint         *width,
 					   guint         *height);
 
-#ifndef GTK_DISABLE_DEPRECATED
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 
 GtkAdjustment* gtk_layout_get_hadjustment (GtkLayout     *layout);
 GtkAdjustment* gtk_layout_get_vadjustment (GtkLayout     *layout);
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index 573910d..7f7445f 100644
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -26,9 +26,8 @@
 
 #include "config.h"
 
-#undef GTK_DISABLE_DEPRECATED
 #include "gtkviewport.h"
-#define GTK_DISABLE_DEPRECATED
+
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtktypeutils.h"
diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index c1d9ce4..6865310 100644
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.h
@@ -75,7 +75,7 @@ GType          gtk_viewport_get_type        (void) G_GNUC_CONST;
 GtkWidget*     gtk_viewport_new             (GtkAdjustment *hadjustment,
 					     GtkAdjustment *vadjustment);
 
-#ifndef GTK_DISABLE_DEPRECATED
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 
 GtkAdjustment* gtk_viewport_get_hadjustment (GtkViewport   *viewport);
 GtkAdjustment* gtk_viewport_get_vadjustment (GtkViewport   *viewport);