Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix use of PANGO_VERSION_CHECK macro

Browse Source 
PANGO_VERSION_CHECK is not available before Pango version 1.16
This commit is contained in:
Paul Cornett
2017-05-30 09:50:03 -07:00
parent d7b616d507
commit 4ffb9d342c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/window.cpp
View File

@@ -61,6 +61,10 @@ typedef guint KeySym;
#define wxGTK_VERSION_REQUIRED_FOR_COMPOSITING 2,12,0 #define wxGTK_VERSION_REQUIRED_FOR_COMPOSITING 2,12,0
#define wxGTK_HAS_COMPOSITING_SUPPORT (GTK_CHECK_VERSION(2,12,0) && wxUSE_CAIRO) #define wxGTK_HAS_COMPOSITING_SUPPORT (GTK_CHECK_VERSION(2,12,0) && wxUSE_CAIRO)
#ifndef PANGO_VERSION_CHECK
#define PANGO_VERSION_CHECK(a,b,c) 0
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// documentation on internals // documentation on internals
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -291,7 +295,6 @@ PangoContext* wxGetPangoContext()
{ {
context = gdk_pango_context_get_for_screen(screen); context = gdk_pango_context_get_for_screen(screen);
} }
#ifdef PANGO_VERSION_CHECK
#if PANGO_VERSION_CHECK(1,22,0) #if PANGO_VERSION_CHECK(1,22,0)
else // No default screen. else // No default screen.
{ {
@@ -306,7 +309,6 @@ PangoContext* wxGetPangoContext()
//else: pango_font_map_create_context() not available //else: pango_font_map_create_context() not available
} }
#endif // Pango 1.22+ #endif // Pango 1.22+
#endif // PANGO_VERSION_CHECK
} }
return context; return context;