mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-29 09:09:52 -06:00
wxWidgets3: update to svn r70933
This commit is contained in:
6
Externals/wxWidgets3/include/wx/encinfo.h
vendored
6
Externals/wxWidgets3/include/wx/encinfo.h
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 19.09.2003 (extracted from wx/fontenc.h)
|
||||
// RCS-ID: $Id: encinfo.h 52834 2008-03-26 15:06:00Z FM $
|
||||
// RCS-ID: $Id: encinfo.h 70353 2012-01-15 14:46:41Z VZ $
|
||||
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -35,7 +35,6 @@
|
||||
struct WXDLLIMPEXP_CORE wxNativeEncodingInfo
|
||||
{
|
||||
wxString facename; // may be empty meaning "any"
|
||||
#ifndef __WXPALMOS__
|
||||
wxFontEncoding encoding; // so that we know what this struct represents
|
||||
|
||||
#if defined(__WXMSW__) || \
|
||||
@ -55,12 +54,9 @@ struct WXDLLIMPEXP_CORE wxNativeEncodingInfo
|
||||
xencoding;
|
||||
#elif defined(wxHAS_UTF8_FONTS)
|
||||
// ports using UTF-8 for text don't need encoding information for fonts
|
||||
#elif defined(__WXMGL__)
|
||||
int mglEncoding;
|
||||
#else
|
||||
#error "Unsupported toolkit"
|
||||
#endif
|
||||
#endif // !__WXPALMOS__
|
||||
// this struct is saved in config by wxFontMapper, so it should know to
|
||||
// serialise itself (implemented in platform-specific code)
|
||||
bool FromString(const wxString& s);
|
||||
|
Reference in New Issue
Block a user