AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-12 21:40:19 +00:00
Code Issues Projects Releases Wiki Activity

Handle PS_ALTERNATE, too.

Browse Source 
2005-07-27  Tor Lillqvist  <tml@novell.com>

	* 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)
This commit is contained in:
Tor Lillqvist 2005-07-27 06:28:20 +00:00 committed by Tor Lillqvist
parent 23cbc3a65b
commit 23d233d937
4 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2005-07-27 Tor Lillqvist <tml@novell.com>
* 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-26 Owen Taylor <otaylor@redhat.com> 2005-07-26 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_page_allocate): Fix to be * gtk/gtknotebook.c (gtk_notebook_page_allocate): Fix to be

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
2005-07-27 Tor Lillqvist <tml@novell.com>
* 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-26 Owen Taylor <otaylor@redhat.com> 2005-07-26 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_page_allocate): Fix to be * gtk/gtknotebook.c (gtk_notebook_page_allocate): Fix to be

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
2005-07-27 Tor Lillqvist <tml@novell.com>
* 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-26 Owen Taylor <otaylor@redhat.com> 2005-07-26 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_page_allocate): Fix to be * gtk/gtknotebook.c (gtk_notebook_page_allocate): Fix to be

15
gdk/win32/gdkmain-win32.c
View File

@ -186,13 +186,13 @@ gdk_screen_get_height (GdkScreen *screen)
gint gint
gdk_screen_get_width_mm (GdkScreen *screen) 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 gint
gdk_screen_get_height_mm (GdkScreen *screen) 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 void
@ -621,14 +621,15 @@ _gdk_win32_psstyle_to_string (DWORD pen_style)
switch (pen_style & PS_STYLE_MASK) switch (pen_style & PS_STYLE_MASK)
{ {
#define CASE(x) case PS_##x: return #x #define CASE(x) case PS_##x: return #x
CASE (ALTERNATE);
CASE (SOLID);
CASE (DASH); CASE (DASH);
CASE (DOT);
CASE (DASHDOT); CASE (DASHDOT);
CASE (DASHDOTDOT); CASE (DASHDOTDOT);
CASE (DOT);
CASE (INSIDEFRAME);
CASE (NULL); CASE (NULL);
CASE (SOLID);
CASE (USERSTYLE); CASE (USERSTYLE);
CASE (INSIDEFRAME);
#undef CASE #undef CASE
default: return static_printf ("illegal_%d", pen_style & PS_STYLE_MASK); default: return static_printf ("illegal_%d", pen_style & PS_STYLE_MASK);
} }
@ -642,9 +643,9 @@ _gdk_win32_psendcap_to_string (DWORD pen_style)
switch (pen_style & PS_ENDCAP_MASK) switch (pen_style & PS_ENDCAP_MASK)
{ {
#define CASE(x) case PS_ENDCAP_##x: return #x #define CASE(x) case PS_ENDCAP_##x: return #x
CASE (FLAT);
CASE (ROUND); CASE (ROUND);
CASE (SQUARE); CASE (SQUARE);
CASE (FLAT);
#undef CASE #undef CASE
default: return static_printf ("illegal_%d", pen_style & PS_ENDCAP_MASK); default: return static_printf ("illegal_%d", pen_style & PS_ENDCAP_MASK);
} }
@ -658,9 +659,9 @@ _gdk_win32_psjoin_to_string (DWORD pen_style)
switch (pen_style & PS_JOIN_MASK) switch (pen_style & PS_JOIN_MASK)
{ {
#define CASE(x) case PS_JOIN_##x: return #x #define CASE(x) case PS_JOIN_##x: return #x
CASE (ROUND);
CASE (BEVEL); CASE (BEVEL);
CASE (MITER); CASE (MITER);
CASE (ROUND);
#undef CASE #undef CASE
default: return static_printf ("illegal_%d", pen_style & PS_JOIN_MASK); default: return static_printf ("illegal_%d", pen_style & PS_JOIN_MASK);
} }