don't crash, even if used incorrectly

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index 8422433e81fd9f7f0c7daf8ffd6802771c135857..b4e88adf639374b3417bd43b4d2c548f19f509c5 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -157,7 +157,7 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
                     m_Table[128 + i] = (wchar_t)(128 + i);
 #else
                     m_Table[128 + i] = (char)(128 + i);
                     m_Table[128 + i] = (wchar_t)(128 + i);
 #else
                     m_Table[128 + i] = (char)(128 + i);

-#endif                                 
+#endif

             }
 
             delete[] rev;
             }
 
             delete[] rev;


@@ -182,7 +182,7 @@ void wxEncodingConverter::Convert(const char* input, char* output)
         return;
     }
 
         return;
     }
 

-    wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+    wxCHECK_RET(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));

 
     for (i = input, o = output; *i != 0;)
         *(o++) = (char)(m_Table[(wxUint8)*(i++)]);
 
     for (i = input, o = output; *i != 0;)
         *(o++) = (char)(m_Table[(wxUint8)*(i++)]);


@@ -208,7 +208,7 @@ void wxEncodingConverter::Convert(const char* input, wchar_t* output)
         return;
     }
 
         return;
     }
 

-    wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+    wxCHECK_RET(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));

 
     for (i = input, o = output; *i != 0;)
         *(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]);
 
     for (i = input, o = output; *i != 0;)
         *(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]);


@@ -233,7 +233,7 @@ void wxEncodingConverter::Convert(const wchar_t* input, char* output)
         return;
     }
 
         return;
     }
 

-    wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+    wxCHECK_RET(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));

 
     for (i = input, o = output; *i != 0;)
         *(o++) = (char)(m_Table[(wxUint16)*(i++)]);
 
     for (i = input, o = output; *i != 0;)
         *(o++) = (char)(m_Table[(wxUint16)*(i++)]);


@@ -259,7 +259,7 @@ void wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output)
         return;
     }
 
         return;
     }
 

-    wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+    wxCHECK_RET(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));

 
     for (i = input, o = output; *i != 0;)
         *(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]);
 
     for (i = input, o = output; *i != 0;)
         *(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]);


@@ -276,14 +276,19 @@ wxString wxEncodingConverter::Convert(const wxString& input)
     wxString s;
     const wxChar *i;
 
     wxString s;
     const wxChar *i;
 

-    wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+    wxCHECK_RET(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));

 
     if (m_UnicodeInput)
 
     if (m_UnicodeInput)

+    {

         for (i = input.c_str(); *i != 0; i++)
             s << (wxChar)(m_Table[(wxUint16)*i]);
         for (i = input.c_str(); *i != 0; i++)
             s << (wxChar)(m_Table[(wxUint16)*i]);

+    }

     else
     else

+    {

         for (i = input.c_str(); *i != 0; i++)
             s << (wxChar)(m_Table[(wxUint8)*i]);
         for (i = input.c_str(); *i != 0; i++)
             s << (wxChar)(m_Table[(wxUint8)*i]);

+    }
+

     return s;
 }
 
     return s;
 }