Updated list of subprojects.

[wxWidgets.git] / src / common / encconv.cpp

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index 9e06d0df43749e26441bdc1cb4187860e83a6cc9..15509c9cbc2c93128c10d775faa804bdad813f3b 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -50,7 +50,7 @@
     #include "wx/msw/wince/missing.h"       // for bsearch()
 #endif
 
     #include "wx/msw/wince/missing.h"       // for bsearch()
 #endif
 

-static wxUint16* GetEncTable(wxFontEncoding enc)
+static const wxUint16* GetEncTable(wxFontEncoding enc)

 {
 #ifdef __WXMAC__
     if( enc >= wxFONTENCODING_MACMIN && enc <= wxFONTENCODING_MACMAX )
 {
 #ifdef __WXMAC__
     if( enc >= wxFONTENCODING_MACMIN && enc <= wxFONTENCODING_MACMAX )


@@ -98,7 +98,7 @@ CompareCharsetItems(const void *i1, const void *i2)
 }
 
 
 }
 
 

-static CharsetItem* BuildReverseTable(wxUint16 *tbl)
+static CharsetItem* BuildReverseTable(const wxUint16 *tbl)

 {
     CharsetItem *rev = new CharsetItem[128];
 
 {
     CharsetItem *rev = new CharsetItem[128];
 


@@ -124,7 +124,8 @@ wxEncodingConverter::wxEncodingConverter()
 bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_enc, int method)
 {
     unsigned i;
 bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_enc, int method)
 {
     unsigned i;

-    wxUint16 *in_tbl, *out_tbl = NULL;
+    const wxUint16 *in_tbl;
+    const wxUint16 *out_tbl = NULL;

 
     if (m_Table) {delete[] m_Table; m_Table = NULL;}
 
 
     if (m_Table) {delete[] m_Table; m_Table = NULL;}
 


@@ -375,11 +376,9 @@ wxString wxEncodingConverter::Convert(const wxString& input) const
 
 #define NUM_OF_PLATFORMS  4 /*must conform to enum wxPLATFORM_XXXX !!!*/
 #define ENC_PER_PLATFORM  3
 
 #define NUM_OF_PLATFORMS  4 /*must conform to enum wxPLATFORM_XXXX !!!*/
 #define ENC_PER_PLATFORM  3

-           // max no. of encodings for one language used on one platform
-           // Anybody thinks 5 is not enough? ;-)
-
-           // It is too much. Using maximum of everything at the current moment to not
-           // make the library larger than necessary. Make larger only if necessary - MR
+           // max no. of encodings for one language used on one platform.
+           // Using maximum of everything at the current moment to not make the
+           // library larger than necessary. Make larger only if necessary - MR

 
 static const wxFontEncoding
     EquivalentEncodings[][NUM_OF_PLATFORMS][ENC_PER_PLATFORM+1] = {
 
 static const wxFontEncoding
     EquivalentEncodings[][NUM_OF_PLATFORMS][ENC_PER_PLATFORM+1] = {