Correct the addition of wxLANGUAGE_KABYLE.

Repair (too late?) the ABI breakage for all the language constants following
wxLANGUAGE_KABYLE in alphabetical order by adding this enum element at the end
of the enum instead of in the middle.

Also add wxLANGUAGE_KABYLE to langtabl.txt so that it doesn't disappear when
the generated fragments are updated by running misc/languages/genlang.py the
next time.

This corrects/supersedes r75753.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-07-07 17:11:37 +00:00
parent bf19b89735
commit 644af9fa6c
4 changed files with 8 additions and 6 deletions

View File

@@ -149,7 +149,6 @@ enum wxLanguage
wxLANGUAGE_ITALIAN_SWISS, wxLANGUAGE_ITALIAN_SWISS,
wxLANGUAGE_JAPANESE, wxLANGUAGE_JAPANESE,
wxLANGUAGE_JAVANESE, wxLANGUAGE_JAVANESE,
wxLANGUAGE_KABYLE,
wxLANGUAGE_KANNADA, wxLANGUAGE_KANNADA,
wxLANGUAGE_KASHMIRI, wxLANGUAGE_KASHMIRI,
wxLANGUAGE_KASHMIRI_INDIA, wxLANGUAGE_KASHMIRI_INDIA,
@@ -270,6 +269,7 @@ enum wxLanguage
wxLANGUAGE_YORUBA, wxLANGUAGE_YORUBA,
wxLANGUAGE_ZHUANG, wxLANGUAGE_ZHUANG,
wxLANGUAGE_ZULU, wxLANGUAGE_ZULU,
wxLANGUAGE_KABYLE,
/// For custom, user-defined languages. /// For custom, user-defined languages.
wxLANGUAGE_USER_DEFINED wxLANGUAGE_USER_DEFINED

View File

@@ -16,7 +16,7 @@
*/ */
enum wxLanguage enum wxLanguage
{ {
/// User's default/preferred language as got from OS. /// User's default/preffered language as got from OS.
wxLANGUAGE_DEFAULT, wxLANGUAGE_DEFAULT,
/// Unknown language, returned if wxLocale::GetSystemLanguage fails. /// Unknown language, returned if wxLocale::GetSystemLanguage fails.
@@ -254,6 +254,7 @@ enum wxLanguage
wxLANGUAGE_YORUBA, wxLANGUAGE_YORUBA,
wxLANGUAGE_ZHUANG, wxLANGUAGE_ZHUANG,
wxLANGUAGE_ZULU, wxLANGUAGE_ZULU,
wxLANGUAGE_KABYLE,
/// For custom, user-defined languages. /// For custom, user-defined languages.
wxLANGUAGE_USER_DEFINED wxLANGUAGE_USER_DEFINED

View File

@@ -232,3 +232,4 @@ wxLANGUAGE_YIDDISH yi - -
wxLANGUAGE_YORUBA yo - - LTR "Yoruba" wxLANGUAGE_YORUBA yo - - LTR "Yoruba"
wxLANGUAGE_ZHUANG za - - LTR "Zhuang" wxLANGUAGE_ZHUANG za - - LTR "Zhuang"
wxLANGUAGE_ZULU zu - - LTR "Zulu" wxLANGUAGE_ZULU zu - - LTR "Zulu"
wxLANGUAGE_KABYLE kab LANG_KABYLE SUBLANG_DEFAULT LTR "Kabyle"

View File

@@ -151,9 +151,6 @@
#ifndef LANG_JAPANESE #ifndef LANG_JAPANESE
#define LANG_JAPANESE (0) #define LANG_JAPANESE (0)
#endif #endif
#ifndef LANG_KABYLE
#define LANG_KABYLE (0)
#endif
#ifndef LANG_KANNADA #ifndef LANG_KANNADA
#define LANG_KANNADA (0) #define LANG_KANNADA (0)
#endif #endif
@@ -268,6 +265,9 @@
#ifndef LANG_VIETNAMESE #ifndef LANG_VIETNAMESE
#define LANG_VIETNAMESE (0) #define LANG_VIETNAMESE (0)
#endif #endif
#ifndef LANG_KABYLE
#define LANG_KABYLE (0)
#endif
#ifndef SUBLANG_ARABIC_ALGERIA #ifndef SUBLANG_ARABIC_ALGERIA
#define SUBLANG_ARABIC_ALGERIA SUBLANG_DEFAULT #define SUBLANG_ARABIC_ALGERIA SUBLANG_DEFAULT
#endif #endif
@@ -666,7 +666,6 @@ void wxLocale::InitLanguagesDB()
LNG(wxLANGUAGE_ITALIAN_SWISS, "it_CH", LANG_ITALIAN , SUBLANG_ITALIAN_SWISS , wxLayout_LeftToRight, "Italian (Swiss)") LNG(wxLANGUAGE_ITALIAN_SWISS, "it_CH", LANG_ITALIAN , SUBLANG_ITALIAN_SWISS , wxLayout_LeftToRight, "Italian (Swiss)")
LNG(wxLANGUAGE_JAPANESE, "ja_JP", LANG_JAPANESE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Japanese") LNG(wxLANGUAGE_JAPANESE, "ja_JP", LANG_JAPANESE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Japanese")
LNG(wxLANGUAGE_JAVANESE, "jv" , 0 , 0 , wxLayout_LeftToRight, "Javanese") LNG(wxLANGUAGE_JAVANESE, "jv" , 0 , 0 , wxLayout_LeftToRight, "Javanese")
LNG(wxLANGUAGE_KABYLE, "kab" , LANG_KABYLE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kabyle")
LNG(wxLANGUAGE_KANNADA, "kn" , LANG_KANNADA , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kannada") LNG(wxLANGUAGE_KANNADA, "kn" , LANG_KANNADA , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kannada")
LNG(wxLANGUAGE_KASHMIRI, "ks" , LANG_KASHMIRI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kashmiri") LNG(wxLANGUAGE_KASHMIRI, "ks" , LANG_KASHMIRI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kashmiri")
LNG(wxLANGUAGE_KASHMIRI_INDIA, "ks_IN", LANG_KASHMIRI , SUBLANG_KASHMIRI_INDIA , wxLayout_LeftToRight, "Kashmiri (India)") LNG(wxLANGUAGE_KASHMIRI_INDIA, "ks_IN", LANG_KASHMIRI , SUBLANG_KASHMIRI_INDIA , wxLayout_LeftToRight, "Kashmiri (India)")
@@ -789,6 +788,7 @@ void wxLocale::InitLanguagesDB()
LNG(wxLANGUAGE_YORUBA, "yo" , 0 , 0 , wxLayout_LeftToRight, "Yoruba") LNG(wxLANGUAGE_YORUBA, "yo" , 0 , 0 , wxLayout_LeftToRight, "Yoruba")
LNG(wxLANGUAGE_ZHUANG, "za" , 0 , 0 , wxLayout_LeftToRight, "Zhuang") LNG(wxLANGUAGE_ZHUANG, "za" , 0 , 0 , wxLayout_LeftToRight, "Zhuang")
LNG(wxLANGUAGE_ZULU, "zu" , 0 , 0 , wxLayout_LeftToRight, "Zulu") LNG(wxLANGUAGE_ZULU, "zu" , 0 , 0 , wxLayout_LeftToRight, "Zulu")
LNG(wxLANGUAGE_KABYLE, "kab" , LANG_KABYLE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kabyle")
} }
#undef LNG #undef LNG