From 943632ba1aede5a4d47683fdff227f2d3f82384f Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 27 Jul 2005 06:13:49 +0000 Subject: [PATCH] Handle PS_ALTERNATE, too. 2005-07-27 Tor Lillqvist * gdk/win32/gdkmain-win32.c (_gdk_win32_psstyle_to_string): Handle PS_ALTERNATE, too. * gdk/win32/gdkmain-win32.c (gdk_screen_get_height_mm): Fix for multi-monitor cases. (#311677, Tim Evans) --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gdk/win32/gdkmain-win32.c | 15 ++++++++------- 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3cd87839d6..3dd1091185 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-07-27 Tor Lillqvist + + * gdk/win32/gdkmain-win32.c (_gdk_win32_psstyle_to_string): Handle + PS_ALTERNATE, too. + + * gdk/win32/gdkmain-win32.c (gdk_screen_get_height_mm): Fix for + multi-monitor cases. (#311677, Tim Evans) + 2005-07-23 Matthias Clasen * NEWS: Updates diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3cd87839d6..3dd1091185 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2005-07-27 Tor Lillqvist + + * gdk/win32/gdkmain-win32.c (_gdk_win32_psstyle_to_string): Handle + PS_ALTERNATE, too. + + * gdk/win32/gdkmain-win32.c (gdk_screen_get_height_mm): Fix for + multi-monitor cases. (#311677, Tim Evans) + 2005-07-23 Matthias Clasen * NEWS: Updates diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3cd87839d6..3dd1091185 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2005-07-27 Tor Lillqvist + + * gdk/win32/gdkmain-win32.c (_gdk_win32_psstyle_to_string): Handle + PS_ALTERNATE, too. + + * gdk/win32/gdkmain-win32.c (gdk_screen_get_height_mm): Fix for + multi-monitor cases. (#311677, Tim Evans) + 2005-07-23 Matthias Clasen * NEWS: Updates diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c index 2dd4f2b59e..eabbaab00d 100644 --- a/gdk/win32/gdkmain-win32.c +++ b/gdk/win32/gdkmain-win32.c @@ -187,13 +187,13 @@ gdk_screen_get_height (GdkScreen *screen) gint gdk_screen_get_width_mm (GdkScreen *screen) { - return (double) GetDeviceCaps (_gdk_display_hdc, HORZRES) / GetDeviceCaps (_gdk_display_hdc, LOGPIXELSX) * 25.4; + return (double) gdk_screen_get_width (screen) / GetDeviceCaps (_gdk_display_hdc, LOGPIXELSX) * 25.4; } gint gdk_screen_get_height_mm (GdkScreen *screen) { - return (double) GetDeviceCaps (_gdk_display_hdc, VERTRES) / GetDeviceCaps (_gdk_display_hdc, LOGPIXELSY) * 25.4; + return (double) gdk_screen_get_height (screen) / GetDeviceCaps (_gdk_display_hdc, LOGPIXELSY) * 25.4; } void @@ -622,14 +622,15 @@ _gdk_win32_psstyle_to_string (DWORD pen_style) switch (pen_style & PS_STYLE_MASK) { #define CASE(x) case PS_##x: return #x + CASE (ALTERNATE); + CASE (SOLID); CASE (DASH); + CASE (DOT); CASE (DASHDOT); CASE (DASHDOTDOT); - CASE (DOT); - CASE (INSIDEFRAME); CASE (NULL); - CASE (SOLID); CASE (USERSTYLE); + CASE (INSIDEFRAME); #undef CASE default: return static_printf ("illegal_%d", pen_style & PS_STYLE_MASK); } @@ -643,9 +644,9 @@ _gdk_win32_psendcap_to_string (DWORD pen_style) switch (pen_style & PS_ENDCAP_MASK) { #define CASE(x) case PS_ENDCAP_##x: return #x - CASE (FLAT); CASE (ROUND); CASE (SQUARE); + CASE (FLAT); #undef CASE default: return static_printf ("illegal_%d", pen_style & PS_ENDCAP_MASK); } @@ -659,9 +660,9 @@ _gdk_win32_psjoin_to_string (DWORD pen_style) switch (pen_style & PS_JOIN_MASK) { #define CASE(x) case PS_JOIN_##x: return #x + CASE (ROUND); CASE (BEVEL); CASE (MITER); - CASE (ROUND); #undef CASE default: return static_printf ("illegal_%d", pen_style & PS_JOIN_MASK); }