diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-08-26 18:49:52 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-08-26 18:49:52 +0000 |
| commit | b3a757762cea419936be14ce6e814e9cc2511e56 (patch) | |
| tree | 13e4fe1eacd3b729bec386fc97288ad62ad4a5bf /gdk/gdkpango.c | |
| parent | a4df08a6c7e83d26e2ea4aca1c11b29004d7d1c4 (diff) | |
| download | gtk+-b3a757762cea419936be14ce6e814e9cc2511e56.tar.gz | |
Make the GdkScreen font options api public, and add properties
2005-08-26 Matthias Clasen <mclasen@redhat.com>
* gdk/gdk.symbols:
* gdk/gdkscreen.h:
* gdk/gdkscreen.c: Make the GdkScreen font options api
public, and add properties GdkScreen::font-options and
GdkScreen::resolution. (#314004)
* gdk/gdkpango.c:
* gtk/gtksettings.c:
* gtk/gtkwidget.c: Adjust all callers.
* gdk/gdkintl.h: Simplify and use glib/gi18n-lib.h.
* gdk/gdkpango.c: Include gdkintl.h, not gtkintl.h.
* gdk/gdkscreen.c: Include gdkintl.h.
Diffstat (limited to 'gdk/gdkpango.c')
| -rw-r--r-- | gdk/gdkpango.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c index 4adc04ac4e..4ddec897c5 100644 --- a/gdk/gdkpango.c +++ b/gdk/gdkpango.c @@ -30,8 +30,7 @@ #include "gdkscreen.h" #include "gdkalias.h" -/* This is for P_() ... a bit non-kosher, but works fine */ -#include "gtk/gtkintl.h" +#include "gdkintl.h" #define GDK_INFO_KEY "gdk-info" @@ -1384,10 +1383,10 @@ gdk_pango_context_get_for_screen (GdkScreen *screen) context = pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP (fontmap)); - options = gdk_screen_get_font_options_libgtk_only (screen); + options = gdk_screen_get_font_options (screen); pango_cairo_context_set_font_options (context, options); - dpi = gdk_screen_get_resolution_libgtk_only (screen); + dpi = gdk_screen_get_resolution (screen); pango_cairo_context_set_resolution (context, dpi); return context; |