X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d4a724d4075418ccaea166925c33242a338249c7..6d020baf20b068d21dd694145a66fdb4407d889d:/include/wx/intl.h

diff --git a/include/wx/intl.h b/include/wx/intl.h
index 1518905484..5d16e3a3e9 100644
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -16,6 +16,16 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 
+// Make wxLayoutDirection enum available without need for wxUSE_INTL so wxWindow, wxApp
+// and other classes are not distrubed by wxUSE_INTL
+
+enum wxLayoutDirection
+{
+    wxLayout_Default,
+    wxLayout_LeftToRight,
+    wxLayout_RightToLeft
+};
+
 #if wxUSE_INTL
 
 #include "wx/fontenc.h"
@@ -316,6 +326,7 @@ struct WXDLLIMPEXP_BASE wxLanguageInfo
              WinSublang;
 #endif // __WIN32__
     wxString Description;           // human-readable name of the language
+    wxLayoutDirection LayoutDirection;
 };
 
 // ----------------------------------------------------------------------------
@@ -455,6 +466,9 @@ public:
     bool AddCatalog(const wxChar *szDomain,
                     wxLanguage msgIdLanguage, const wxChar *msgIdCharset);
 
+    // check if the given locale is provided by OS and C run time
+    static bool IsAvailable(int lang);
+
     // check if the given catalog is loaded
     bool IsLoaded(const wxChar *szDomain) const;
 
@@ -578,9 +592,11 @@ inline const wxChar *wxGetTranslation(const wxChar *sz1, const wxChar *sz2,
 
 #define wxTRANSLATE(str) _T(str)
 
-// Note: use of 'inline' here can cause this symbol not to be found when compiled with gcc
-//const wxChar *wxGetTranslation(const wxChar *sz);
-#define wxGetTranslation(sz) (sz)
+inline const wxChar *wxGetTranslation(const wxChar *sz,
+                                      const wxChar *WXUNUSED(domain) = NULL)
+{
+    return sz;
+}
 
 #endif // wxUSE_INTL/!wxUSE_INTL
 
@@ -596,4 +612,3 @@ inline const wxChar *wxGetTranslation(const wxChar *sz1, const wxChar *sz2,
 #endif
 
 #endif // _WX_INTL_H_
-