adapt defines for ctrl/command key

[wxWidgets.git] / src / common / unictabl.inc

diff --git a/src/common/unictabl.inc b/src/common/unictabl.inc
index 8810bb78c38cb6fed384e2b7adfb12f9d9055007..5bb0e1d311688716d9daae1f3ee9b5cd70d5c474 100644 (file)
--- a/src/common/unictabl.inc
+++ b/src/common/unictabl.inc
@@ -561,6 +561,31 @@ static const wxUint16 encoding_table__CP1257[128] = {
  };
 
 
+/*
+ * CP866 to Unicode recoding table
+ * based on file mappings/CP866.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__CP866[128] = {
+    0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
+    0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
+    0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
+    0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
+    0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
+    0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
+    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
+    0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
+    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+    0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
+    0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+    0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
+    0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F,
+    0x0401, 0x0451, 0x0404, 0x0454, 0x0407, 0x0457, 0x040E, 0x045E,
+    0x00B0, 0x2219, 0x00B7, 0x221A, 0x2116, 0x00A4, 0x25A0, 0x00A0
+ };
+
+
 /*
  * KOI8 to Unicode recoding table
  * based on file mappings/KOI8-R.TXT by Unicode Consortium
@@ -621,7 +646,7 @@ static const wxUint16 encoding_table__KOI8_U[128] = {
  *
  */
 
-static struct {
+static const struct {
     wxUint16 c  /*code*/;
     wxUint8  s /*inaccurate substitution*/;
 } encoding_unicode_fallback[] = {
@@ -829,7 +854,7 @@ static struct {
     {0, 0}
  };
 
-static unsigned encoding_unicode_fallback_count =  200;
+static const unsigned encoding_unicode_fallback_count =  200;
 
 
 
@@ -840,7 +865,7 @@ static unsigned encoding_unicode_fallback_count =  200;
  *
  */
 
-static struct {
+static const struct {
     wxFontEncoding encoding; // encoding identifier
     const wxUint16 *table;         // 8bit to unicode table
 } encodings_list[] = {
@@ -868,5 +893,6 @@ static struct {
     { wxFONTENCODING_CP1257, encoding_table__CP1257},
     { wxFONTENCODING_KOI8, encoding_table__KOI8},
     { wxFONTENCODING_KOI8_U, encoding_table__KOI8_U},
+    { wxFONTENCODING_CP866, encoding_table__CP866},
     {wxFONTENCODING_MAX /*anything*/, NULL}
  };