~bratsche/ubuntu/maverick/gtk+2.0/menu-activation-fix

« back to all changes in this revision

Viewing changes to gdk/x11/gdkx.h

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2009-09-05 07:16:24 UTC
  • mfrom: (1.3.2 upstream)
  • mto: This revision was merged to the branch mainline in revision 127.
  • Revision ID: james.westby@ubuntu.com-20090905071624-ehjbg50t3hvthzlm
Tags: upstream-2.17.11
Import upstream version 2.17.11

Show diffs side-by-side

added added

removed removed

Lines of Context:
40
40
 
41
41
Display *gdk_x11_drawable_get_xdisplay    (GdkDrawable *drawable);
42
42
XID      gdk_x11_drawable_get_xid         (GdkDrawable *drawable);
 
43
GdkDrawable *gdk_x11_window_get_drawable_impl (GdkWindow *window);
 
44
GdkDrawable *gdk_x11_pixmap_get_drawable_impl (GdkPixmap *pixmap);
43
45
Display *gdk_x11_image_get_xdisplay       (GdkImage    *image);
44
46
XImage  *gdk_x11_image_get_ximage         (GdkImage    *image);
45
47
Display *gdk_x11_colormap_get_xdisplay    (GdkColormap *colormap);
105
107
 
106
108
#define GDK_DISPLAY_XDISPLAY(display) (gdk_x11_display_get_xdisplay (display))
107
109
 
108
 
#define GDK_WINDOW_XDISPLAY(win)      (gdk_x11_drawable_get_xdisplay (((GdkWindowObject *)win)->impl))
 
110
#define GDK_WINDOW_XDISPLAY(win)      (gdk_x11_drawable_get_xdisplay (gdk_x11_window_get_drawable_impl (win)))
109
111
#define GDK_WINDOW_XID(win)           (gdk_x11_drawable_get_xid (win))
110
112
#define GDK_WINDOW_XWINDOW(win)       (gdk_x11_drawable_get_xid (win))
111
 
#define GDK_PIXMAP_XDISPLAY(win)      (gdk_x11_drawable_get_xdisplay (((GdkPixmapObject *)win)->impl))
 
113
#define GDK_PIXMAP_XDISPLAY(win)      (gdk_x11_drawable_get_xdisplay (gdk_x11_pixmap_get_drawable_impl (win)))
112
114
#define GDK_PIXMAP_XID(win)           (gdk_x11_drawable_get_xid (win))
113
115
#define GDK_DRAWABLE_XDISPLAY(win)    (gdk_x11_drawable_get_xdisplay (win))
114
116
#define GDK_DRAWABLE_XID(win)         (gdk_x11_drawable_get_xid (win))