Make the last change compile.

2005-08-10  J. Ali Harlow  <ali@juiblex.co.uk>

        * gdk/win32/gdkfont-win32.c (gdk_font_from_description_for_display): Make
	the last change compile.

diff --git a/ChangeLog b/ChangeLog
index fcb022ed05ccf9942e7cfe5375b16f2748655a28..3ea7dd734ed557b6a53b894b2383eebec707c5f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-10  J. Ali Harlow  <ali@juiblex.co.uk>
+
+       * gdk/win32/gdkfont-win32.c (gdk_font_from_description_for_display): Make
+       the last change compile.
+
 2005-08-10  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_deleted) 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fcb022ed05ccf9942e7cfe5375b16f2748655a28..3ea7dd734ed557b6a53b894b2383eebec707c5f8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-08-10  J. Ali Harlow  <ali@juiblex.co.uk>
+
+       * gdk/win32/gdkfont-win32.c (gdk_font_from_description_for_display): Make
+       the last change compile.
+
 2005-08-10  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_deleted) 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fcb022ed05ccf9942e7cfe5375b16f2748655a28..3ea7dd734ed557b6a53b894b2383eebec707c5f8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-08-10  J. Ali Harlow  <ali@juiblex.co.uk>
+
+       * gdk/win32/gdkfont-win32.c (gdk_font_from_description_for_display): Make
+       the last change compile.
+
 2005-08-10  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_deleted) 

diff --git a/gdk/win32/gdkfont-win32.c b/gdk/win32/gdkfont-win32.c
index 3b3934f1359eb946d34b888c21bbec4e6fb0e2ff..77551c1f12a13a993f3333316946a0f2dcdcf254 100644 (file)
--- 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;