there's no such thing as LANG_VALENCIAN

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/misc/languages/langtabl.txt b/misc/languages/langtabl.txt
index 94a34cbbc317199bc3f699bfeac788f66bd4a2fb..3150572a4a47c76f4ca107c951d9557e29edcab4 100644 (file)
--- a/misc/languages/langtabl.txt
+++ b/misc/languages/langtabl.txt
@@ -219,7 +219,7 @@ wxLANGUAGE_URDU_PAKISTAN               ur_PK  LANG_URDU        SUBLANG_URDU_PAKI
 wxLANGUAGE_UZBEK                       uz     LANG_UZBEK       SUBLANG_DEFAULT                     LTR    "Uzbek"
 wxLANGUAGE_UZBEK_CYRILLIC              uz     LANG_UZBEK       SUBLANG_UZBEK_CYRILLIC              LTR    "Uzbek (Cyrillic)"
 wxLANGUAGE_UZBEK_LATIN                 uz     LANG_UZBEK       SUBLANG_UZBEK_LATIN                 LTR    "Uzbek (Latin)"
-wxLANGUAGE_VALENCIAN                   ca_ES@valencia  LANG_VALENCIAN SUBLANG_DEFAULT              LTR    "Valencian"
+wxLANGUAGE_VALENCIAN                   ca_ES@valencia -        -                                   LTR    "Valencian"
 wxLANGUAGE_VIETNAMESE                  vi_VN  LANG_VIETNAMESE  SUBLANG_DEFAULT                     LTR    "Vietnamese"
 wxLANGUAGE_VOLAPUK                     vo     -                -                                   LTR    "Volapuk"
 wxLANGUAGE_WELSH                       cy     -                -                                   LTR    "Welsh"

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index bd4a1953e332e6493b66b9bb62a8795db1122fc7..e61703c9c0724057e74c3184ee75fa2e90a28d8f 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -3004,9 +3004,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxLocaleModule, wxModule)
 #ifndef LANG_UZBEK
 #define LANG_UZBEK (0)
 #endif
-#ifndef LANG_VALENCIAN
-#define LANG_VALENCIAN (0)
-#endif
 #ifndef LANG_VIETNAMESE
 #define LANG_VIETNAMESE (0)
 #endif
@@ -3515,7 +3512,7 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_UZBEK,                      "uz"   , LANG_UZBEK     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Uzbek")
    LNG(wxLANGUAGE_UZBEK_CYRILLIC,             "uz"   , LANG_UZBEK     , SUBLANG_UZBEK_CYRILLIC            , wxLayout_LeftToRight, "Uzbek (Cyrillic)")
    LNG(wxLANGUAGE_UZBEK_LATIN,                "uz"   , LANG_UZBEK     , SUBLANG_UZBEK_LATIN               , wxLayout_LeftToRight, "Uzbek (Latin)")
-   LNG(wxLANGUAGE_VALENCIAN,                  "ca_ES@valencia", LANG_VALENCIAN , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Valencian")
+   LNG(wxLANGUAGE_VALENCIAN,                  "ca_ES@valencia", 0     , 0                                 , wxLayout_LeftToRight, "Valencian")
    LNG(wxLANGUAGE_VIETNAMESE,                 "vi_VN", LANG_VIETNAMESE, SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Vietnamese")
    LNG(wxLANGUAGE_VOLAPUK,                    "vo"   , 0              , 0                                 , wxLayout_LeftToRight, "Volapuk")
    LNG(wxLANGUAGE_WELSH,                      "cy"   , 0              , 0                                 , wxLayout_LeftToRight, "Welsh")