callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdk: Remove GTK_COMPILATION checks from headers

Browse Source 
Now that gtk doesn't compile with GDK_DISABLE_DEPRECATED anymore,
they're not needed.
This commit is contained in:
Benjamin Otte
2011-01-03 19:03:33 +01:00
parent 79b4c34a8f
commit 882db1cf5f
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gdk/gdk.h
View File

@ -96,15 +96,12 @@ gboolean gdk_get_use_xshm (void);
gchar* gdk_get_display (void); gchar* gdk_get_display (void);
G_CONST_RETURN gchar* gdk_get_display_arg_name (void); G_CONST_RETURN gchar* gdk_get_display_arg_name (void);
#if !defined (GDK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION) #ifndef GDK_DISABLE_DEPRECATED
/* Used by gtk_input_add_full () */
gint gdk_input_add_full (gint source, gint gdk_input_add_full (gint source,
GdkInputCondition condition, GdkInputCondition condition,
GdkInputFunction function, GdkInputFunction function,
gpointer data, gpointer data,
GDestroyNotify destroy); GDestroyNotify destroy);
#endif /* !GDK_DISABLE_DEPRECATED || GTK_COMPILATION */
#ifndef GDK_DISABLE_DEPRECATED
gint gdk_input_add (gint source, gint gdk_input_add (gint source,
GdkInputCondition condition, GdkInputCondition condition,
GdkInputFunction function, GdkInputFunction function,

4
gdk/gdkdrawable.h
View File

@ -255,14 +255,14 @@ void gdk_drawable_set_colormap (GdkDrawable *drawable,
GdkColormap* gdk_drawable_get_colormap (GdkDrawable *drawable); GdkColormap* gdk_drawable_get_colormap (GdkDrawable *drawable);
gint gdk_drawable_get_depth (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, void gdk_drawable_get_size (GdkDrawable *drawable,
gint *width, gint *width,
gint *height); gint *height);
GdkVisual* gdk_drawable_get_visual (GdkDrawable *drawable); GdkVisual* gdk_drawable_get_visual (GdkDrawable *drawable);
GdkScreen* gdk_drawable_get_screen (GdkDrawable *drawable); GdkScreen* gdk_drawable_get_screen (GdkDrawable *drawable);
GdkDisplay* gdk_drawable_get_display (GdkDrawable *drawable); GdkDisplay* gdk_drawable_get_display (GdkDrawable *drawable);
#endif /* GDK_DISABLE_DEPRECATED || GTK_COMPILATION */ #endif /* GDK_DISABLE_DEPRECATED */
#ifndef GDK_DISABLE_DEPRECATED #ifndef GDK_DISABLE_DEPRECATED
GdkDrawable* gdk_drawable_ref (GdkDrawable *drawable); GdkDrawable* gdk_drawable_ref (GdkDrawable *drawable);

2
gdk/gdkfont.h
View File

@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/. * 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__ #ifndef __GDK_FONT_H__
#define __GDK_FONT_H__ #define __GDK_FONT_H__

2
gdk/gdkwindow.h
View File

@ -577,7 +577,7 @@ void gdk_window_coords_from_parent (GdkWindow *window,
gdouble *x, gdouble *x,
gdouble *y); 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 () */ /* Used by gtk_handle_box_button_changed () */
gboolean gdk_window_get_deskrelative_origin (GdkWindow *window, gboolean gdk_window_get_deskrelative_origin (GdkWindow *window,
gint *x, gint *x,