From 35305bfc85cadfa993440c291333735ca587d045 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?utf8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Sat, 24 Mar 2018 12:52:25 +0000 Subject: [PATCH] GDK W32: move GdkWin32MonitorDpiType to a different header https://bugzilla.gnome.org/show_bug.cgi?id=773299 --- gdk/win32/gdkdisplay-win32.h | 9 +++++++++ gdk/win32/gdksurface-win32.h | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gdk/win32/gdkdisplay-win32.h b/gdk/win32/gdkdisplay-win32.h index 71bb5e0499..3a46f8157b 100644 --- a/gdk/win32/gdkdisplay-win32.h +++ b/gdk/win32/gdkdisplay-win32.h @@ -22,6 +22,8 @@ #ifndef __GDK_DISPLAY__WIN32_H__ #define __GDK_DISPLAY__WIN32_H__ +#include "gdkwin32screen.h" + /* Define values used to set DPI-awareness */ typedef enum _GdkWin32ProcessDpiAwareness { PROCESS_DPI_UNAWARE = 0, @@ -29,6 +31,13 @@ typedef enum _GdkWin32ProcessDpiAwareness { PROCESS_PER_MONITOR_DPI_AWARE = 2 } GdkWin32ProcessDpiAwareness; +typedef enum _GdkWin32MonitorDpiType { + MDT_EFFECTIVE_DPI = 0, + MDT_ANGULAR_DPI = 1, + MDT_RAW_DPI = 2, + MDT_DEFAULT = MDT_EFFECTIVE_DPI +} GdkWin32MonitorDpiType; + /* APIs from shcore.dll */ typedef HRESULT (WINAPI *funcSetProcessDpiAwareness) (GdkWin32ProcessDpiAwareness value); typedef HRESULT (WINAPI *funcGetProcessDpiAwareness) (HANDLE handle, GdkWin32ProcessDpiAwareness *awareness); diff --git a/gdk/win32/gdksurface-win32.h b/gdk/win32/gdksurface-win32.h index 1d22ade85f..c451a310df 100644 --- a/gdk/win32/gdksurface-win32.h +++ b/gdk/win32/gdksurface-win32.h @@ -96,14 +96,6 @@ enum _GdkW32WindowDragOp typedef enum _GdkW32WindowDragOp GdkW32WindowDragOp; -typedef enum _GdkWin32MonitorDpiType -{ - MDT_EFFECTIVE_DPI = 0, - MDT_ANGULAR_DPI = 1, - MDT_RAW_DPI = 2, - MDT_DEFAULT = MDT_EFFECTIVE_DPI -} GdkWin32MonitorDpiType; - struct _GdkW32DragMoveResizeContext { /* The window that is being moved/resized */ -- 2.30.2