AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-17 14:30:15 +00:00
Code Issues Projects Releases Wiki Activity

HAVE_MONITOR_INFO is always defined

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=748156
This commit is contained in:
Jose Rostagno 2015-04-19 21:51:46 -03:00 committed by Matthias Clasen
parent 216e982603
commit 7a6aee1db4
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gdk/win32/gdkdisplay-win32.c
View File

@ -26,13 +26,6 @@
#include "gdkwin32window.h" #include "gdkwin32window.h"
#include "gdkwin32.h" #include "gdkwin32.h"
#define HAVE_MONITOR_INFO
#if defined(_MSC_VER) && (WINVER < 0x500) && (WINVER > 0x0400)
#include <multimon.h>
#elif defined(_MSC_VER) && (WINVER <= 0x0400)
#undef HAVE_MONITOR_INFO
#endif
static gulong static gulong
gdk_win32_display_get_next_serial (GdkDisplay *display) gdk_win32_display_get_next_serial (GdkDisplay *display)
@ -40,7 +33,6 @@ gdk_win32_display_get_next_serial (GdkDisplay *display)
return 0; return 0;
} }
#ifdef HAVE_MONITOR_INFO
static BOOL CALLBACK static BOOL CALLBACK
count_monitor (HMONITOR hmonitor, count_monitor (HMONITOR hmonitor,
HDC hdc, HDC hdc,
@ -116,12 +108,10 @@ enum_monitor (HMONITOR hmonitor,
return TRUE; return TRUE;
} }
#endif /* HAVE_MONITOR_INFO */
void void
_gdk_monitor_init (void) _gdk_monitor_init (void)
{ {
#ifdef HAVE_MONITOR_INFO
gint i, index; gint i, index;
_gdk_num_monitors = 0; _gdk_num_monitors = 0;
@ -156,24 +146,6 @@ _gdk_monitor_init (void)
_gdk_monitors[i].rect.x, _gdk_monitors[i].rect.x,
_gdk_monitors[i].rect.y)); _gdk_monitors[i].rect.y));
} }
#else
HDC hDC;
_gdk_num_monitors = 1;
_gdk_monitors = g_renew (GdkWin32Monitor, _gdk_monitors, 1);
_gdk_monitors[0].name = g_strdup ("DISPLAY");
hDC = GetDC (NULL);
_gdk_monitors[0].width_mm = GetDeviceCaps (hDC, HORZSIZE);
_gdk_monitors[0].height_mm = GetDeviceCaps (hDC, VERTSIZE);
ReleaseDC (NULL, hDC);
_gdk_monitors[0].rect.x = 0;
_gdk_monitors[0].rect.y = 0;
_gdk_monitors[0].rect.width = GetSystemMetrics (SM_CXSCREEN);
_gdk_monitors[0].rect.height = GetSystemMetrics (SM_CYSCREEN);
_gdk_offset_x = 0;
_gdk_offset_y = 0;
#endif
} }
GdkDisplay * GdkDisplay *