From 25a8a7e745b7a84eb167f75d74744c00b85b25c0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 20 Apr 2014 12:44:57 +0000 Subject: [PATCH] Handle wxLANGUAGE_CAMBODIAN correctly in the generation script. Fix wxLANGUAGE_CAMBODIAN definition in autogenerated code, this was already done manually in r76368 but these changes would have been lost after the next generation, so update the script itself to generate them. Closes #16183. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/language.h | 1 + interface/wx/language.h | 9 +++++---- misc/languages/genlang.py | 9 +++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/wx/language.h b/include/wx/language.h index 1a5aebc2b5..5d788abcc2 100644 --- a/include/wx/language.h +++ b/include/wx/language.h @@ -274,6 +274,7 @@ enum wxLanguage /// For custom, user-defined languages. wxLANGUAGE_USER_DEFINED, + /// Obsolete synonym. wxLANGUAGE_CAMBODIAN = wxLANGUAGE_KHMER }; diff --git a/interface/wx/language.h b/interface/wx/language.h index a20be83da3..7ad4df159a 100644 --- a/interface/wx/language.h +++ b/interface/wx/language.h @@ -256,11 +256,12 @@ enum wxLanguage wxLANGUAGE_ZHUANG, wxLANGUAGE_ZULU, - /// Obsolete synonym. - wxLANGUAGE_CAMBODIAN = wxLANGUAGE_KHMER, - /// For custom, user-defined languages. - wxLANGUAGE_USER_DEFINED + wxLANGUAGE_USER_DEFINED, + + + /// Obsolete synonym. + wxLANGUAGE_CAMBODIAN = wxLANGUAGE_KHMER }; // --- --- --- generated code ends here --- --- --- diff --git a/misc/languages/genlang.py b/misc/languages/genlang.py index 216408bbb5..3665ade4d0 100755 --- a/misc/languages/genlang.py +++ b/misc/languages/genlang.py @@ -48,11 +48,12 @@ enum wxLanguage f.write(' %s,\n' % i[0]) knownLangs.append(i[0]) f.write(""" - /// Obsolete synonym. - wxLANGUAGE_CAMBODIAN = wxLANGUAGE_KHMER, - /// For custom, user-defined languages. - wxLANGUAGE_USER_DEFINED + wxLANGUAGE_USER_DEFINED, + + + /// Obsolete synonym. + wxLANGUAGE_CAMBODIAN = wxLANGUAGE_KHMER }; """)