From 3502a2a25941c4c8541d7f735cd2dab35868db48 Mon Sep 17 00:00:00 2001 From: "J. Ali Harlow" Date: Wed, 10 Aug 2005 11:02:29 +0000 Subject: [PATCH] Make the last change compile. 2005-08-10 J. Ali Harlow * gdk/win32/gdkfont-win32.c (gdk_font_from_description_for_display): Make the last change compile. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/win32/gdkfont-win32.c | 5 +++-- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fcb022ed05..3ea7dd734e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-10 J. Ali Harlow + + * gdk/win32/gdkfont-win32.c (gdk_font_from_description_for_display): Make + the last change compile. + 2005-08-10 Matthias Clasen * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_deleted) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fcb022ed05..3ea7dd734e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-08-10 J. Ali Harlow + + * gdk/win32/gdkfont-win32.c (gdk_font_from_description_for_display): Make + the last change compile. + 2005-08-10 Matthias Clasen * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_deleted) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fcb022ed05..3ea7dd734e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-08-10 J. Ali Harlow + + * gdk/win32/gdkfont-win32.c (gdk_font_from_description_for_display): Make + the last change compile. + 2005-08-10 Matthias Clasen * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_deleted) diff --git a/gdk/win32/gdkfont-win32.c b/gdk/win32/gdkfont-win32.c index 3b3934f135..77551c1f12 100644 --- a/gdk/win32/gdkfont-win32.c +++ b/gdk/win32/gdkfont-win32.c @@ -1237,7 +1237,6 @@ GdkFont* gdk_font_from_description_for_display (GdkDisplay *display, PangoFontDescription *font_desc) { - GdkFont *result = NULL; LOGFONT logfont; int size; @@ -1246,7 +1245,9 @@ gdk_font_from_description_for_display (GdkDisplay *display, size = PANGO_PIXELS (pango_font_description_get_size (font_desc)); - logfont.lfHeight = - MulDiv (PointSize, GetDeviceCaps (hDC, LOGPIXELSY), 72); + logfont.lfHeight = - MulDiv (size, + GetDeviceCaps (_gdk_display_hdc, LOGPIXELSY), + 72); logfont.lfWidth = 0; logfont.lfEscapement = 0; logfont.lfOrientation = 0;