use UTF8-encoded char* strings in UTF8 build instead of wchar_t* if the current locale uses UTF8;
fall back to widechar CRT functions in the locale is not UTF8 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -69,27 +69,27 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
|
||||
wxEmptyString,
|
||||
wxEmptyString,
|
||||
_T("JPEG image (from fallback)"),
|
||||
_T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), NULL),
|
||||
_T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), 0),
|
||||
wxFileTypeInfo(_T("image/gif"),
|
||||
wxEmptyString,
|
||||
wxEmptyString,
|
||||
_T("GIF image (from fallback)"),
|
||||
_T("gif"), _T("GIF"), NULL),
|
||||
_T("gif"), _T("GIF"), 0),
|
||||
wxFileTypeInfo(_T("image/png"),
|
||||
wxEmptyString,
|
||||
wxEmptyString,
|
||||
_T("PNG image (from fallback)"),
|
||||
_T("png"), _T("PNG"), NULL),
|
||||
_T("png"), _T("PNG"), 0),
|
||||
wxFileTypeInfo(_T("image/bmp"),
|
||||
wxEmptyString,
|
||||
wxEmptyString,
|
||||
_T("windows bitmap image (from fallback)"),
|
||||
_T("bmp"), _T("BMP"), NULL),
|
||||
_T("bmp"), _T("BMP"), 0),
|
||||
wxFileTypeInfo(_T("text/html"),
|
||||
wxEmptyString,
|
||||
wxEmptyString,
|
||||
_T("HTML document (from fallback)"),
|
||||
_T("htm"), _T("html"), _T("HTM"), _T("HTML"), NULL),
|
||||
_T("htm"), _T("html"), _T("HTM"), _T("HTML"), 0),
|
||||
// must terminate the table with this!
|
||||
wxFileTypeInfo()
|
||||
};
|
||||
|
Reference in New Issue
Block a user