AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Add deprecation guards for deprecated grab APIs

Browse Source
This commit is contained in:
Matthias Clasen 2010-12-24 20:01:24 -05:00
parent bde1d072e5
commit 436e75c34c
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/gdkdisplay.h
View File

@ -132,11 +132,13 @@ GdkScreen * gdk_display_get_screen (GdkDisplay *display,
GdkScreen * gdk_display_get_default_screen (GdkDisplay *display);
#ifndef GDK_MULTIDEVICE_SAFE
#ifndef GDK_DISABLE_DEPRECATED
void gdk_display_pointer_ungrab (GdkDisplay *display,
guint32 time_);
void gdk_display_keyboard_ungrab (GdkDisplay *display,
guint32 time_);
gboolean gdk_display_pointer_is_grabbed (GdkDisplay *display);
#endif /* GDK_DISABLE_DEPRECATED */
#endif /* GDK_MULTIDEVICE_SAFE */
gboolean gdk_display_device_is_grabbed (GdkDisplay *display,

9
gdk/gdkmain.h
View File

@ -71,14 +71,16 @@ G_CONST_RETURN gchar *gdk_get_display_arg_name (void);
/**
* gdk_get_display:
*
* Gets the name of the display, which usually comes from the <envar>DISPLAY</envar>
* environment variable or the <option>--display</option> command line option.
* Gets the name of the display, which usually comes from the
* <envar>DISPLAY</envar> environment variable or the
* <option>--display</option> command line option.
*
* Returns: the name of the display.
*/
gchar* gdk_get_display (void);
gchar* gdk_get_display (void);
#ifndef GDK_MULTIDEVICE_SAFE
#ifndef GDK_DISABLE_DEPRECATED
GdkGrabStatus gdk_pointer_grab (GdkWindow *window,
gboolean owner_events,
GdkEventMask event_mask,
@ -88,6 +90,7 @@ GdkGrabStatus gdk_pointer_grab (GdkWindow *window,
GdkGrabStatus gdk_keyboard_grab (GdkWindow *window,
gboolean owner_events,
guint32 time_);
#endif /* GDK_DISABLE_DEPRECATED */
#endif /* GDK_MULTIDEVICE_SAFE */
#ifndef GDK_MULTIHEAD_SAFE