add wxGenericStaticText (#9656)

[wxWidgets.git] / src / common / intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 53e36b28921ef0668d545717beacee81114e88ed..1fd767a47ffdd7101a7602d391ad0ec346d45460 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -73,9 +73,9 @@
 #include "wx/filesys.h"
 
 #if defined(__DARWIN__)
 #include "wx/filesys.h"
 
 #if defined(__DARWIN__)

-    #include "wx/mac/corefoundation/cfref.h"
+    #include "wx/osx/core/cfref.h"

     #include <CoreFoundation/CFLocale.h>
     #include <CoreFoundation/CFLocale.h>

-    #include "wx/mac/corefoundation/cfstring.h"
+    #include "wx/osx/core/cfstring.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -1263,6 +1263,8 @@ bool wxMsgCatalogFile::Load(const wxString& szDirPrefix, const wxString& szName,
   // read the whole file in memory
   if ( fileMsg.Read(m_data.GetWriteBuf(nSize), nSize) != lenFile )
     return false;
   // read the whole file in memory
   if ( fileMsg.Read(m_data.GetWriteBuf(nSize), nSize) != lenFile )
     return false;

+
+  m_data.UngetWriteBuf(nSize);

 #endif // wxUSE_FILESYSTEM/!wxUSE_FILESYSTEM
 
 
 #endif // wxUSE_FILESYSTEM/!wxUSE_FILESYSTEM
 
 


@@ -2953,6 +2955,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxLocaleModule, wxModule)
 #ifndef LANG_RUSSIAN
 #define LANG_RUSSIAN (0)
 #endif
 #ifndef LANG_RUSSIAN
 #define LANG_RUSSIAN (0)
 #endif

+#ifndef LANG_SAMI
+#define LANG_SAMI (0)
+#endif

 #ifndef LANG_SANSKRIT
 #define LANG_SANSKRIT (0)
 #endif
 #ifndef LANG_SANSKRIT
 #define LANG_SANSKRIT (0)
 #endif


@@ -3444,6 +3449,7 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_ROMANIAN,                   "ro_RO", LANG_ROMANIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Romanian")
    LNG(wxLANGUAGE_RUSSIAN,                    "ru_RU", LANG_RUSSIAN   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Russian")
    LNG(wxLANGUAGE_RUSSIAN_UKRAINE,            "ru_UA", 0              , 0                                 , wxLayout_LeftToRight, "Russian (Ukraine)")
    LNG(wxLANGUAGE_ROMANIAN,                   "ro_RO", LANG_ROMANIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Romanian")
    LNG(wxLANGUAGE_RUSSIAN,                    "ru_RU", LANG_RUSSIAN   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Russian")
    LNG(wxLANGUAGE_RUSSIAN_UKRAINE,            "ru_UA", 0              , 0                                 , wxLayout_LeftToRight, "Russian (Ukraine)")

+   LNG(wxLANGUAGE_SAMI,                       "se_NO", LANG_SAMI      , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Northern Sami")

    LNG(wxLANGUAGE_SAMOAN,                     "sm"   , 0              , 0                                 , wxLayout_LeftToRight, "Samoan")
    LNG(wxLANGUAGE_SANGHO,                     "sg"   , 0              , 0                                 , wxLayout_LeftToRight, "Sangho")
    LNG(wxLANGUAGE_SANSKRIT,                   "sa"   , LANG_SANSKRIT  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Sanskrit")
    LNG(wxLANGUAGE_SAMOAN,                     "sm"   , 0              , 0                                 , wxLayout_LeftToRight, "Samoan")
    LNG(wxLANGUAGE_SANGHO,                     "sg"   , 0              , 0                                 , wxLayout_LeftToRight, "Sangho")
    LNG(wxLANGUAGE_SANSKRIT,                   "sa"   , LANG_SANSKRIT  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Sanskrit")