diff options
| author | Tor Lillqvist <tml@iki.fi> | 1999-11-21 22:56:37 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 1999-11-21 22:56:37 +0000 |
| commit | 143002cac59eef5e9c72d6994b94cfbf9eca82a6 (patch) | |
| tree | ea228c198c95629f89dac8e85fda8085393087d3 /gdk/win32/gdkwin32.h | |
| parent | 06526532927cd605cae4d51bf1acbd0ff7d35df9 (diff) | |
| download | gtk+-143002cac59eef5e9c72d6994b94cfbf9eca82a6.tar.gz | |
Remove, as this is a file generated by configure (or copied from
1999-11-21 Tor Lillqvist <tml@iki.fi>
* gdk/gdkconfig.h: Remove, as this is a file generated by configure
(or copied from gdkconfig.h.win32 on Win32, sigh).
* gdk/gdkprivate.h: Mark gdk_parent_root for export from DLL.
* gdk/gdkgc.c (gdk_gc_alloc): Remove duplicated line.
Diffstat (limited to 'gdk/win32/gdkwin32.h')
| -rw-r--r-- | gdk/win32/gdkwin32.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gdk/win32/gdkwin32.h b/gdk/win32/gdkwin32.h index 6cc05a7413..3882a15077 100644 --- a/gdk/win32/gdkwin32.h +++ b/gdk/win32/gdkwin32.h @@ -33,17 +33,13 @@ #include <locale.h> #define GDK_ROOT_WINDOW() ((guint32) HWND_DESKTOP) -#define GDK_ROOT_PARENT() ((GdkWindow *) gdk_root_parent) +#define GDK_ROOT_PARENT() ((GdkWindow *) gdk_parent_root) #define GDK_DISPLAY() NULL -#define GDK_DRAWABLE_XDISPLAY(win) NULL #define GDK_DRAWABLE_XID(win) (GDK_DRAWABLE_WIN32DATA(win)->xid) -#define GDK_IMAGE_XDISPLAY(image) NULL -#define GDK_IMAGE_XIMAGE(image) (((GdkImagePrivate*) image)->ximage) -#define GDK_GC_XDISPLAY(gc) NULL -#define GDK_GC_XGC(gc) (((GdkGCPrivate*) gc)->xgc) +#define GDK_IMAGE_XIMAGE(image) (((GdkImagePrivate *) image)->ximage) #define GDK_COLORMAP_XDISPLAY(cmap) NULL -#define GDK_COLORMAP_XCOLORMAP(cmap) (((GdkColormapPrivate*) cmap)->xcolormap) -#define GDK_VISUAL_XVISUAL(vis) (((GdkVisualPrivate*) vis)->xvisual) +#define GDK_COLORMAP_WIN32COLORMAP(cmap)(((GdkColormapPrivateWin32 *) cmap)->xcolormap) +#define GDK_VISUAL_XVISUAL(vis) (((GdkVisualPrivate *) vis)->xvisual) #define GDK_WINDOW_XDISPLAY GDK_DRAWABLE_XDISPLAY #define GDK_WINDOW_XWINDOW GDK_DRAWABLE_XID |