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

Always fall back on wxPLATFORM_UNIX in wxEncodingConverter.

Browse Source 
We could have ended up using (invalid) wxPLATFORM_CURRENT as an index into an
array if neither __WINDOWS__, nor __WXMAC__, nor __WXGTK__ nor __WXMOTIF__
were defined (which would be the case in e.g. wxX11 or wxQt ports). Fix this
by always falling back on wxPLATFORM_UNIX.
This commit is contained in:
Vadim Zeitlin
2015-05-24 01:35:22 +02:00
parent 231b78a0d7
commit 4a58ef843a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/encconv.cpp
View File

@@ -438,10 +438,10 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e
{ {
#if defined(__WINDOWS__) #if defined(__WINDOWS__)
platform = wxPLATFORM_WINDOWS; platform = wxPLATFORM_WINDOWS;
#elif defined(__WXGTK__) || defined(__WXMOTIF__)
platform = wxPLATFORM_UNIX;
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
platform = wxPLATFORM_MAC; platform = wxPLATFORM_MAC;
#else
platform = wxPLATFORM_UNIX;
#endif #endif
} }