GDK W32: move GdkWin32MonitorDpiType to a different header

https://bugzilla.gnome.org/show_bug.cgi?id=773299

diff --git a/gdk/win32/gdkdisplay-win32.h b/gdk/win32/gdkdisplay-win32.h
index 71bb5e0499628257d9632a9bc895af544e81512d..3a46f8157bec54fbef05cf8e93bcf6e0f814fb6e 100644 (file)
--- 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 1d22ade85f37b7fb862fcea444caf61dcb7ddcba..c451a310dfe21d4b3e2afb90709d84a8345de341 100644 (file)
--- 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 */