do only what is necessary in SetScrollbars(), let the base class do the rest

[wxWidgets.git] / misc / languages / genlang.py

diff --git a/misc/languages/genlang.py b/misc/languages/genlang.py
index e6b15875f86a4b544074102ee539e10c17afc27e..54617a8c42761eb0a9e7456b4ef9704887b2e816 100755 (executable)
--- 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
 
@@ -23,20 +23,28 @@ def GenEnum(table):
 
 // --- --- --- generated code begins here --- --- ---
 
-// This enum is generated by misc/languages/genlang.py
-// When making changes, please put them into misc/languages/langtabl.txt
+/**
+    The languages supported by wxLocale.
+
+    This enum is generated by misc/languages/genlang.py
+    When making changes, please put them into misc/languages/langtabl.txt
+*/
 enum wxLanguage
 {
-    // user's default/preffered language as got from OS:
-    wxLANGUAGE_DEFAULT, 
-    // unknown language, if wxLocale::GetSystemLanguage fails:
-    wxLANGUAGE_UNKNOWN, 
-    
+    /// User's default/preffered language as got from OS.
+    wxLANGUAGE_DEFAULT,
+
+    /// Unknown language, returned if wxLocale::GetSystemLanguage fails.
+    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:
+    /// For custom, user-defined languages.
     wxLANGUAGE_USER_DEFINED
 };
 
@@ -46,40 +54,13 @@ enum wxLanguage
    f.close()
 
 
-def GenDocs(table):
-   f = open('_wxlang.tex', 'wt')
-   f.write("""
-
-%% --- --- --- generated code begins here --- --- ---
-
-%% 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
-""");
-   for i in table:
-       f.write('\\item %s\n' % (i[0].replace('_','\\_')))
-   f.write("""\\end{itemize}
-
-%% --- --- --- generated code ends here --- --- ---
-
-""")
-   f.close()
-
-
-
-
 def GenTable(table):
    all_langs = []
    all_sublangs = []
-   
+
    lngtable = ''
-   ifdefs = '' 
-       
+   ifdefs = ''
+
    for i in table:
        ican = '"%s"' % i[1]
        if ican == '"-"': ican = '""'
@@ -87,8 +68,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)
 
@@ -96,7 +83,7 @@ def GenTable(table):
        if s != '0':
            ifdefs += '#ifndef %s\n#define %s (0)\n#endif\n' % (s, s)
    for s in all_sublangs:
-       if s != '0' and s != 'SUBLANG_DEFAULT': 
+       if s != '0' and s != 'SUBLANG_DEFAULT':
            ifdefs += '#ifndef %s\n#define %s SUBLANG_DEFAULT\n#endif\n' % (s, s)
 
    f = open('_wxlang.cpp', 'wt')
@@ -106,7 +93,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 +106,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 +119,8 @@ void wxLocale::InitLanguagesDB()
    wxLanguageInfo info;
    wxStringTokenizer tkn;
 
-   %s   
-};
+%s
+}
 #undef LNG
 
 // --- --- --- generated code ends here --- --- ---
@@ -145,6 +133,5 @@ void wxLocale::InitLanguagesDB()
 
 
 table = ReadTable()
-GenEnum(table)
+GenEnum(table)          # the enum is used also (thanks to doxygen) in the docs
 GenTable(table)
-GenDocs(table)