1. wxMotif fixes for compilation in "no compatible" mode

[wxWidgets.git] / include / wx / intl.h

diff --git a/include/wx/intl.h b/include/wx/intl.h
index 8b7acb076bf1326be642e81a8a277768982735cb..3edc2edb9a31c2bc963324f5855699bc81143c58 100644 (file)
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -78,9 +78,18 @@ public:
   // returns locale name
   const char *GetLocale() const { return m_strLocale; }
 
+  // add a prefix to the catalog lookup path: the message catalog files will be
+  // looked up under prefix/<lang>/LC_MESSAGES, prefix/LC_MESSAGES and prefix
+  // (in this order).
+  //
+  // This only applies to subsequent invocations of AddCatalog()!
+  static void AddCatalogLookupPathPrefix(const wxString& prefix);
+  
   // add a catalog: it's searched for in standard places (current directory 
-  // first, system one after). It will be used for message lookup by
-  // GetString().
+  // first, system one after), but the you may prepend additional directories to
+  // the search path with AddCatalogLookupPathPrefix().
+  //
+  // The loaded catalog will be used for message lookup by GetString().
   //
   // Returns 'true' if it was successfully loaded
   bool AddCatalog(const char *szDomain);
@@ -101,7 +110,9 @@ public:
   const char *GetString(const char *szOrigString, 
                         const char *szDomain = (const char *) NULL) const;
 
-private:
+  // Returns the current short name for the locale
+  wxString const &GetName() const { return m_strShort; }
+ private:
   // find catalog by name in a linked list, return NULL if !found
   wxMsgCatalog  *FindCatalog(const char *szDomain) const;