[gtk+/gtk-2-24] gdk: Remove GTK_COMPILATION checks from headers

[Benjamin Otte <otte src gnome org>]

commit 882db1cf5f36bd255bbab9de5fcf821db0a6a0d8
Author: Benjamin Otte <otte redhat com>
Date:   Mon Jan 3 19:03:33 2011 +0100

    gdk: Remove GTK_COMPILATION checks from headers
    
    Now that gtk doesn't compile with GDK_DISABLE_DEPRECATED anymore,
    they're not needed.

 gdk/gdk.h         |    5 +----
 gdk/gdkdrawable.h |    4 ++--
 gdk/gdkfont.h     |    2 +-
 gdk/gdkwindow.h   |    2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/gdk/gdk.h b/gdk/gdk.h
index 7096937..1db77ec 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -96,15 +96,12 @@ gboolean  gdk_get_use_xshm		(void);
 gchar*	                  gdk_get_display		(void);
 G_CONST_RETURN gchar*	  gdk_get_display_arg_name	(void);
 
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-/* Used by gtk_input_add_full () */
+#ifndef GDK_DISABLE_DEPRECATED
 gint gdk_input_add_full	  (gint		     source,
 			   GdkInputCondition condition,
 			   GdkInputFunction  function,
 			   gpointer	     data,
 			   GDestroyNotify    destroy);
-#endif /* !GDK_DISABLE_DEPRECATED || GTK_COMPILATION */
-#ifndef GDK_DISABLE_DEPRECATED
 gint gdk_input_add	  (gint		     source,
 			   GdkInputCondition condition,
 			   GdkInputFunction  function,
diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
index b363d49..6fe83b1 100644
--- a/gdk/gdkdrawable.h
+++ b/gdk/gdkdrawable.h
@@ -255,14 +255,14 @@ void	        gdk_drawable_set_colormap (GdkDrawable	  *drawable,
 GdkColormap*    gdk_drawable_get_colormap (GdkDrawable	  *drawable);
 gint            gdk_drawable_get_depth    (GdkDrawable	  *drawable);
 
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
+#if !defined (GDK_DISABLE_DEPRECATED)
 void            gdk_drawable_get_size     (GdkDrawable	  *drawable,
 					   gint	          *width,
 					   gint  	  *height);
 GdkVisual*      gdk_drawable_get_visual   (GdkDrawable	  *drawable);
 GdkScreen*	gdk_drawable_get_screen   (GdkDrawable    *drawable);
 GdkDisplay*	gdk_drawable_get_display  (GdkDrawable    *drawable);
-#endif /* GDK_DISABLE_DEPRECATED || GTK_COMPILATION */
+#endif /* GDK_DISABLE_DEPRECATED */
 
 #ifndef GDK_DISABLE_DEPRECATED
 GdkDrawable*    gdk_drawable_ref          (GdkDrawable    *drawable);
diff --git a/gdk/gdkfont.h b/gdk/gdkfont.h
index a48a5c4..fe2e264 100644
--- a/gdk/gdkfont.h
+++ b/gdk/gdkfont.h
@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#if !defined(GDK_DISABLE_DEPRECATED) || defined(GDK_COMPILATION) || defined(GTK_COMPILATION)
+#if !defined(GDK_DISABLE_DEPRECATED) || defined(GDK_COMPILATION)
 
 #ifndef __GDK_FONT_H__
 #define __GDK_FONT_H__
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 49be330..4f65ac9 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -577,7 +577,7 @@ void       gdk_window_coords_from_parent (GdkWindow       *window,
                                           gdouble         *x,
                                           gdouble         *y);
 
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION) || defined (GDK_COMPILATION)
+#if !defined (GDK_DISABLE_DEPRECATED) || defined (GDK_COMPILATION)
 /* Used by gtk_handle_box_button_changed () */
 gboolean      gdk_window_get_deskrelative_origin (GdkWindow	  *window,
 					  gint		  *x,