diff options
| author | Hans Breuer <hans@breuer.org> | 2001-11-23 16:05:39 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2001-11-23 16:05:39 +0000 |
| commit | 36ddd7d958bf6bb8a72635877d2fbff9df79df7f (patch) | |
| tree | 477b0cb4e955e641c8876be5b7a6c71458e840a1 /gdk/win32/gdkfont-win32.c | |
| parent | a259f181fb3fd5aef2e8f402adf76132dd03a484 (diff) | |
| download | gdk-pixbuf-36ddd7d958bf6bb8a72635877d2fbff9df79df7f.tar.gz | |
reflect Pango API change
2001-11-23 Hans Breuer <hans@breuer.org>
* gdk/win32/gdkfont-win32.c (gdk_font_from_description) :
reflect Pango API change
* gtk/gtk.def : updated externals
* gtk/gtkfixed.c (gtk_fixed_get_has_window) : use
g_return_val_if_fail() to avoid 'function must return a value'
* gtk/gtkrc.c : added spaces to fix small coding style issues
* gtk/gtkwidget.c : ... and linebreaks. Also a static for
'static correctness'
* gtk/makefile.msc.in : temporary(?) disable gtk<plug|socket>
because they only can be build on win32 after applying my patch
Diffstat (limited to 'gdk/win32/gdkfont-win32.c')
| -rw-r--r-- | gdk/win32/gdkfont-win32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gdk/win32/gdkfont-win32.c b/gdk/win32/gdkfont-win32.c index a03634011..1dd5ae1b8 100644 --- a/gdk/win32/gdkfont-win32.c +++ b/gdk/win32/gdkfont-win32.c @@ -31,6 +31,7 @@ #include <pango/pangowin32.h> #include "gdkfont.h" +#include "gdkpango.h" /* gdk_pango_context_get() */ #include "gdkprivate-win32.h" static GHashTable *font_name_hash = NULL; @@ -1578,7 +1579,7 @@ gdk_font_from_description (PangoFontDescription *font_desc) g_return_val_if_fail (font_desc != NULL, NULL); font_map = pango_win32_font_map_for_display (); - font = pango_font_map_load_font (font_map, font_desc); + font = pango_font_map_load_font (font_map, gdk_pango_context_get (), font_desc); if (font) { |