wxToolTip part II

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

diff --git a/include/wx/intl.h b/include/wx/intl.h
index 193c4cc0e27d7ade4c46ee6bcfb466d4a01a8391..3edc2edb9a31c2bc963324f5855699bc81143c58 100644 (file)
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -36,7 +36,9 @@ typedef unsigned long size_t32;
 // ----------------------------------------------------------------------------
 
 // gettext() style macro
 // ----------------------------------------------------------------------------
 
 // gettext() style macro

+#ifndef WXINTL_NO_GETTEXT_MACRO

 #define   _(str)  wxGetTranslation(str)
 #define   _(str)  wxGetTranslation(str)

+#endif

 
 // ----------------------------------------------------------------------------
 // forward decls
 
 // ----------------------------------------------------------------------------
 // forward decls


@@ -76,9 +78,18 @@ public:
   // returns locale name
   const char *GetLocale() const { return m_strLocale; }
 
   // 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 
   // 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);
   //
   // Returns 'true' if it was successfully loaded
   bool AddCatalog(const char *szDomain);


@@ -99,7 +110,9 @@ public:
   const char *GetString(const char *szOrigString, 
                         const char *szDomain = (const char *) NULL) const;
 
   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;
 
   // find catalog by name in a linked list, return NULL if !found
   wxMsgCatalog  *FindCatalog(const char *szDomain) const;
 


@@ -115,10 +128,10 @@ private:
 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------

-wxLocale* WXDLLEXPORT wxGetLocale();
+WXDLLEXPORT wxLocale* wxGetLocale();

 
 // get the translation of the string in the current locale  
 
 // get the translation of the string in the current locale  

-inline WXDLLEXPORT const char *wxGetTranslation(const char *sz)
+inline const char *wxGetTranslation(const char *sz)

 {
   wxLocale *pLoc = wxGetLocale();
   return pLoc == (wxLocale *) NULL ? sz : pLoc->GetString(sz);
 {
   wxLocale *pLoc = wxGetLocale();
   return pLoc == (wxLocale *) NULL ? sz : pLoc->GetString(sz);