X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/978af864269a739e77d9431c8465435e3f8f7407..c12bf40663e0b35d138cc5a48b711a9e23bc08af:/misc/languages/genlang.py?ds=sidebyside

diff --git a/misc/languages/genlang.py b/misc/languages/genlang.py
index c2765d10d2..878dfd37da 100755
--- a/misc/languages/genlang.py
+++ b/misc/languages/genlang.py
@@ -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 --- --- ---
 
@@ -112,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)
 
@@ -138,8 +142,8 @@ void wxLocale::InitLanguagesDB()
    wxLanguageInfo info;
    wxStringTokenizer tkn;
 
-   %s   
-};
+%s
+}
 #undef LNG
 
 // --- --- --- generated code ends here --- --- ---