Applied patch [ 858324 ] Calling EndModal inside an EVT_INIT_DIALOG event handler

[wxWidgets.git] / include / wx / encconv.h

diff --git a/include/wx/encconv.h b/include/wx/encconv.h
index 249a514c2ac34793d53635c5019102963fd072e9..d99eaea5e2b34ba899920d8ddb3127f943960e2e 100644 (file)
--- a/include/wx/encconv.h
+++ b/include/wx/encconv.h
@@ -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!
 
             // 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
 
 #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
 #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);
 
             // 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
     private:
 
 #if wxUSE_WCHAR_T