Skip to content

C
core
Kaydet (Commit) a4053378 authored tarafından Fridrich Štrba's avatar Fridrich Štrba
Dosyalara gözat
Seçenekler

Solve scope issues with older gtk 

Change-Id: Icceb9586b4051009a8843b4672b79daf22e07830
üst a2020262
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
Dosyayı görüntüle @ a4053378
...@@ -4028,9 +4028,14 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) ...@@ -4028,9 +4028,14 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
static cairo_font_options_t* (*gdk_screen_get_font_options)(GdkScreen*) = 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" ); (cairo_font_options_t*(*)(GdkScreen*))osl_getAsciiFunctionSymbol( GetSalData()->m_pPlugin, "gdk_screen_get_font_options" );
if( gdk_screen_get_font_options != NULL ) if( gdk_screen_get_font_options != NULL )
#endif {
const cairo_font_options_t* pNewOptions = gdk_screen_get_font_options( pScreen ); 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 ); aStyleSet.SetCairoFontOptions( pNewOptions );
#endif
// finally update the collected settings // finally update the collected settings
rSettings.SetStyleSettings( aStyleSet ); rSettings.SetStyleSettings( aStyleSet );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment