encconv.cpp: Remove comment about 5 being big enough value for ENC_PER_PLATFORM ...

necessary instead.
fmapbase.cpp: Slightly reduce the size of an array - it should be reduced further (we only have one item with the
size of 9, rest are not over 6)

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

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index f43d0687e4ff610bfe6d53ec20de10378bde3617..15509c9cbc2c93128c10d775faa804bdad813f3b 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -376,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] = {

diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp
index 85981bc1f1da33208c3216cf6321bb1d576fa5bb..f148a5cd210ab6884654515f7b3431a24eaa98dc 100644 (file)
--- a/src/common/fmapbase.cpp
+++ b/src/common/fmapbase.cpp
@@ -155,7 +155,7 @@ static const wxChar* gs_encodingDescs[] =
 };
 
 // and the internal names (these are not translated on purpose!)
 };
 
 // and the internal names (these are not translated on purpose!)

-static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][10] =
+static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][9] =

 {
     // names from the columns correspond to these OS:
     //      Linux        Solaris and IRIX       HP-UX             AIX
 {
     // names from the columns correspond to these OS:
     //      Linux        Solaris and IRIX       HP-UX             AIX