From a4053378b7a98d8a18415ba5acd8b69ba28793a2 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Tue, 13 Nov 2012 14:04:58 +0100 Subject: Solve scope issues with older gtk Change-Id: Icceb9586b4051009a8843b4672b79daf22e07830 --- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'vcl/unx/gtk') diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index c1bdf3c2b779..d8c1f69b41af 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -4028,9 +4028,14 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) static cairo_font_options_t* (*gdk_screen_get_font_options)(GdkScreen*) = (cairo_font_options_t*(*)(GdkScreen*))osl_getAsciiFunctionSymbol( GetSalData()->m_pPlugin, "gdk_screen_get_font_options" ); if( gdk_screen_get_font_options != NULL ) -#endif + { const cairo_font_options_t* pNewOptions = gdk_screen_get_font_options( pScreen ); + aStyleSet.SetCairoFontOptions( pNewOptions ); + } +#else + const cairo_font_options_t* pNewOptions = gdk_screen_get_font_options( pScreen ); aStyleSet.SetCairoFontOptions( pNewOptions ); +#endif // finally update the collected settings rSettings.SetStyleSettings( aStyleSet ); -- cgit v1.2.3