X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/323af1967c43efbddc3c3b5f3aaa95f691acf8fc..0bdfa38835fa13d142bbe56595123989c798bf31:/misc/languages/genlang.py

diff --git a/misc/languages/genlang.py b/misc/languages/genlang.py
index e6b15875f8..878dfd37da 100755
--- a/misc/languages/genlang.py
+++ b/misc/languages/genlang.py
@@ -12,7 +12,7 @@ def ReadTable():
     f = open('langtabl.txt')
     for i in f.readlines():
         ispl = i.split()
-        table.append((ispl[0], ispl[1], ispl[2], ispl[3], string.join(ispl[4:])))
+        table.append((ispl[0], ispl[1], ispl[2], ispl[3], ispl[4], string.join(ispl[5:])))
     f.close()
     return table
 
@@ -33,8 +33,11 @@ enum wxLanguage
     wxLANGUAGE_UNKNOWN, 
     
 """);
+   knownLangs = []
    for i in table:
-       f.write('    %s,\n' % i[0])
+       if i[0] not in knownLangs:
+          f.write('    %s,\n' % i[0])
+          knownLangs.append(i[0])
    f.write("""
     // for custom, user-defined languages:
     wxLANGUAGE_USER_DEFINED
@@ -54,16 +57,17 @@ def GenDocs(table):
 
 %% This enum is generated by misc/languages/genlang.py
 %% When making changes, please put them into misc/languages/langtabl.txt
-\\begin{itemize}\\itemsep=0pt
-\\item wxLANGUAGE_DEFAULT -- user's default language as obtained from the operating system 
-\\item wxLANGUAGE_UNKNOWN -- returned by \\helpref{GetSystemLanguage}{wxlocalegetsystemlanguage}
-if it fails to detect the default language 
-\\item wxLANGUAGE_USER_DEFINED -- user defined languages' integer identifiers should start from
-this
+\\begin{twocollist}\\itemsep=0pt
+\\twocolitem{wxLANGUAGE\\_DEFAULT}{user's default language as obtained from the operating system}
+\\twocolitem{wxLANGUAGE\\_UNKNOWN}{returned by \\helpref{GetSystemLanguage}{wxlocalegetsystemlanguage} if it fails to detect the default language}
+\\twocolitem{wxLANGUAGE\\_USER\\_DEFINED}{user defined languages' integer identifiers should start from this}
 """);
+   knownLangs = []
    for i in table:
-       f.write('\\item %s\n' % (i[0].replace('_','\\_')))
-   f.write("""\\end{itemize}
+       if i[0] not in knownLangs:
+          f.write('\\twocolitem{%s}{}\n' % (i[0].replace('_','\\_')))
+          knownLangs.append(i[0])
+   f.write("""\\end{twocollist}\itemsep=0pt
 
 %% --- --- --- generated code ends here --- --- ---
 
@@ -87,8 +91,14 @@ def GenTable(table):
        if ilang == '-': ilang = '0'
        isublang = i[3]
        if isublang == '-': isublang = '0'
-       lngtable += '   LNG(%-38s %-7s, %-15s, %-34s, %s)\n' % \
-                     ((i[0]+','), ican, ilang, isublang, i[4])
+       if (i[4] == "LTR") :
+           ilayout = "wxLayout_LeftToRight"
+       elif (i[4] == "RTL"):
+           ilayout = "wxLayout_RightToLeft"
+       else:
+           print "ERROR: Invalid value for the layout direction";
+       lngtable += '   LNG(%-38s %-7s, %-15s, %-34s, %s, %s)\n' % \
+                     ((i[0]+','), ican, ilang, isublang, ilayout, i[5])
        if ilang not in all_langs: all_langs.append(ilang)
        if isublang not in all_sublangs: all_sublangs.append(isublang)
 
@@ -106,7 +116,7 @@ def GenTable(table):
 // This table is generated by misc/languages/genlang.py
 // When making changes, please put them into misc/languages/langtabl.txt
 
-#ifndef __WIN32__
+#if !defined(__WIN32__) || defined(__WXMICROWIN__)
 
 #define SETWINLANG(info,lang,sublang)
 
@@ -119,10 +129,11 @@ def GenTable(table):
 
 #endif // __WIN32__
 
-#define LNG(wxlang, canonical, winlang, winsublang, desc) \\
+#define LNG(wxlang, canonical, winlang, winsublang, layout, desc) \\
     info.Language = wxlang;                               \\
     info.CanonicalName = wxT(canonical);                  \\
-    info.Description = desc;                              \\
+    info.LayoutDirection = layout;                        \\
+    info.Description = wxT(desc);                         \\
     SETWINLANG(info, winlang, winsublang)                 \\
     AddLanguage(info);
 
@@ -131,8 +142,8 @@ void wxLocale::InitLanguagesDB()
    wxLanguageInfo info;
    wxStringTokenizer tkn;
 
-   %s   
-};
+%s
+}
 #undef LNG
 
 // --- --- --- generated code ends here --- --- ---