diff options
author | Matthias Clasen <mclasen@redhat.com> | 2017-11-17 13:46:45 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2017-11-17 13:47:15 -0500 |
commit | 0f2d7d41f1fedef588f111bd107410aa09265966 (patch) | |
tree | 6577d34eb2a92b424218109b1fef51b0d6376354 | |
parent | d24ae9c032c09b76012e33c18debc5bf36b0fab4 (diff) | |
download | gtk+-0f2d7d41f1fedef588f111bd107410aa09265966.tar.gz |
win32: Remove remaining uses of GdkScreen
-rw-r--r-- | gdk/win32/gdkdisplay-win32.h | 3 | ||||
-rw-r--r-- | gdk/win32/gdkprivate-win32.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gdk/win32/gdkdisplay-win32.h b/gdk/win32/gdkdisplay-win32.h index ea3e2dff57..fa1eb19122 100644 --- a/gdk/win32/gdkdisplay-win32.h +++ b/gdk/win32/gdkdisplay-win32.h @@ -18,6 +18,7 @@ */ #include "gdkdisplayprivate.h" +#include "gdkscreen-win32.h" #ifndef __GDK_DISPLAY__WIN32_H__ #define __GDK_DISPLAY__WIN32_H__ @@ -59,7 +60,7 @@ struct _GdkWin32Display { GdkDisplay display; - GdkScreen *screen; + GdkWin32Screen *screen; Win32CursorTheme *cursor_theme; gchar *cursor_theme_name; diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h index b917d65274..b40c5b4157 100644 --- a/gdk/win32/gdkprivate-win32.h +++ b/gdk/win32/gdkprivate-win32.h @@ -121,7 +121,7 @@ #define GDK_DEBUG_EVENTS_OR_INPUT (GDK_DEBUG_EVENTS|GDK_DEBUG_INPUT) #define GDK_DEBUG_MISC_OR_EVENTS (GDK_DEBUG_MISC|GDK_DEBUG_EVENTS) -GdkScreen *GDK_WINDOW_SCREEN(GObject *win); +GdkWin32Screen *GDK_WINDOW_SCREEN(GObject *win); #define GDK_WINDOW_IS_WIN32(win) (GDK_IS_WINDOW_IMPL_WIN32 (win->impl)) @@ -499,7 +499,7 @@ void _gdk_win32_window_delete_property (GdkWindow *window, GdkAtom property); /* Stray GdkWin32Screen members */ gboolean _gdk_win32_get_setting (const gchar *name, GValue *value); void _gdk_win32_screen_on_displaychange_event (GdkWin32Screen *screen); -GdkWindow *gdk_win32_screen_get_root_window (GdkScreen *screen); +GdkWindow *gdk_win32_screen_get_root_window (GdkWin32Screen *screen); GdkWindow *gdk_win32_display_get_root_window (GdkDisplay *display); /* Distributed display manager implementation */ |