diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2019-07-22 23:44:33 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2019-07-25 10:51:22 +0800 |
| commit | 47310a9dee07d092142be15a2146fe90ab3ad08a (patch) | |
| tree | 14253d85deb3e33f2fa33e579e3ed5d8af949ca2 | |
| parent | 338495ce613f802b051bca0c32a96c5e3ff759e6 (diff) | |
| download | pango-47310a9dee07d092142be15a2146fe90ab3ad08a.tar.gz | |
PangoWin32: Drop _pango_win32_os_version_info
We don't need this anymore since we need Vista or later to run.
| -rw-r--r-- | pango/pangowin32-fontcache.c | 9 | ||||
| -rw-r--r-- | pango/pangowin32-fontmap.c | 4 | ||||
| -rw-r--r-- | pango/pangowin32-private.h | 1 | ||||
| -rw-r--r-- | pango/pangowin32.c | 6 |
4 files changed, 3 insertions, 17 deletions
diff --git a/pango/pangowin32-fontcache.c b/pango/pangowin32-fontcache.c index b8bc92dc..1a1a1cef 100644 --- a/pango/pangowin32-fontcache.c +++ b/pango/pangowin32-fontcache.c @@ -245,13 +245,8 @@ pango_win32_font_cache_loadw (PangoWin32FontCache *cache, BOOL font_smoothing; lf = *lfp; SystemParametersInfo (SPI_GETFONTSMOOTHING, 0, &font_smoothing, 0); - /* If on XP or better, try to use ClearType if the global system - * settings ask for it. - */ - if (font_smoothing && - (_pango_win32_os_version_info.dwMajorVersion > 5 || - (_pango_win32_os_version_info.dwMajorVersion == 5 && - _pango_win32_os_version_info.dwMinorVersion >= 1))) + /* use ClearType if the global system settings ask for it. */ + if (font_smoothing) { UINT smoothing_type; diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c index 30d3fa77..eb84c164 100644 --- a/pango/pangowin32-fontmap.c +++ b/pango/pangowin32-fontmap.c @@ -209,9 +209,7 @@ pango_win32_enum_proc (LOGFONTW *lfp, PING (("%S: %lu %lx", lfp->lfFaceName, fontType, metrics->ntmFlags)); - if (fontType == TRUETYPE_FONTTYPE || - (_pango_win32_os_version_info.dwMajorVersion >= 5 && - ((metrics->ntmFlags & NTM_PS_OPENTYPE) || (metrics->ntmFlags & NTM_TYPE1)))) + if (fontType == TRUETYPE_FONTTYPE || ((metrics->ntmFlags & NTM_PS_OPENTYPE) || (metrics->ntmFlags & NTM_TYPE1))) { lf = *lfp; diff --git a/pango/pangowin32-private.h b/pango/pangowin32-private.h index 65f9de05..f8d445aa 100644 --- a/pango/pangowin32-private.h +++ b/pango/pangowin32-private.h @@ -285,7 +285,6 @@ _PANGO_EXTERN HFONT _pango_win32_font_get_hfont (PangoFont *font); extern HDC _pango_win32_hdc; -extern OSVERSIONINFO _pango_win32_os_version_info; extern gboolean _pango_win32_debug; #endif /* __PANGOWIN32_PRIVATE_H__ */ diff --git a/pango/pangowin32.c b/pango/pangowin32.c index 86c698d1..8d175760 100644 --- a/pango/pangowin32.c +++ b/pango/pangowin32.c @@ -49,7 +49,6 @@ ((ch) >= 0x2F800 && (ch) <= 0x2FA1F)) HDC _pango_win32_hdc; -OSVERSIONINFO _pango_win32_os_version_info; gboolean _pango_win32_debug = FALSE; static void pango_win32_font_dispose (GObject *object); @@ -156,11 +155,6 @@ pango_win32_get_dc (void) if (g_once_init_enter (&_pango_win32_hdc)) { HDC hdc = CreateDC ("DISPLAY", NULL, NULL, NULL); - memset (&_pango_win32_os_version_info, 0, - sizeof (_pango_win32_os_version_info)); - _pango_win32_os_version_info.dwOSVersionInfoSize = - sizeof (OSVERSIONINFO); - GetVersionEx (&_pango_win32_os_version_info); /* Also do some generic pangowin32 initialisations... this function * is a suitable place for those as it is called from a couple |