X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bddd7a8d8953cf4c09e56c13e1bfcc594ba0267e..2a039701a8aebaf8eb7e7cbc408dbb994661975f:/include/wx/encconv.h diff --git a/include/wx/encconv.h b/include/wx/encconv.h index c4b19562bb..d99eaea5e2 100644 --- a/include/wx/encconv.h +++ b/include/wx/encconv.h @@ -10,7 +10,7 @@ #ifndef _WX_ENCCONV_H_ #define _WX_ENCCONV_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "encconv.h" #endif @@ -93,15 +93,15 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject // Convert input string according to settings passed to Init. // Note that you must call Init before using Convert! - void Convert(const char* input, char* output); - void Convert(char* str) { Convert(str, str); } - wxString Convert(const wxString& input); + void Convert(const char* input, char* output) const; + void Convert(char* str) const { Convert(str, str); } + wxString Convert(const wxString& input) const; #if wxUSE_WCHAR_T - void Convert(const char* input, wchar_t* output); - void Convert(const wchar_t* input, char* output); - void Convert(const wchar_t* input, wchar_t* output); - void Convert(wchar_t* str) { Convert(str, str); } + void Convert(const char* input, wchar_t* output) const; + void Convert(const wchar_t* input, char* output) const; + void Convert(const wchar_t* input, wchar_t* output) const; + void Convert(wchar_t* str) const { Convert(str, str); } #endif // Return equivalent(s) for given font that are used // under given platform. wxPLATFORM_CURRENT means the plaform @@ -138,6 +138,17 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject // equivalent encodings, regardless the platform, including itself. static wxFontEncodingArray GetAllEquivalents(wxFontEncoding enc); + // Return true if [any text in] one multibyte encoding can be + // converted to another one losslessly. + // + // Do not call this with wxFONTENCODING_UNICODE, it doesn't make + // sense (always works in one sense and always depends on the text + // to convert in the other) + static bool CanConvert(wxFontEncoding encIn, wxFontEncoding encOut) + { + return GetAllEquivalents(encIn).Index(encOut) != wxNOT_FOUND; + } + private: #if wxUSE_WCHAR_T