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 1c33a3ab4e3a267a36e484aebaf86c32f65ac0b9..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


@@ -61,14 +63,14 @@ public:
   wxLocale();
     // the ctor has a side effect of changing current locale
   wxLocale(const char *szName,              // name (for messages)
   wxLocale();
     // the ctor has a side effect of changing current locale
   wxLocale(const char *szName,              // name (for messages)

-           const char *szShort = NULL,      // dir prefix (for msg files)
-           const char *szLocale = NULL,     // locale (for setlocale)
+           const char *szShort = (const char *) NULL,      // dir prefix (for msg files)
+           const char *szLocale = (const char *) NULL,     // locale (for setlocale)

            bool bLoadDefault = TRUE)        // preload wxstd.mo?
     { Init(szName, szShort, szLocale, bLoadDefault); }
     // the same as a function (returns TRUE on success)
   bool Init(const char *szName,
            bool bLoadDefault = TRUE)        // preload wxstd.mo?
     { Init(szName, szShort, szLocale, bLoadDefault); }
     // the same as a function (returns TRUE on success)
   bool Init(const char *szName,

-            const char *szShort = NULL,
-            const char *szLocale = NULL,
+            const char *szShort = (const char *) NULL,
+            const char *szLocale = (const char *) NULL,

             bool bLoadDefault = TRUE);
     // restores old locale
  ~wxLocale();
             bool bLoadDefault = TRUE);
     // restores old locale
  ~wxLocale();


@@ -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);


@@ -97,9 +108,11 @@ public:
   // domains are searched in the last to first order, i.e. catalogs
   // added later override those added before.
   const char *GetString(const char *szOrigString, 
   // domains are searched in the last to first order, i.e. catalogs
   // added later override those added before.
   const char *GetString(const char *szOrigString, 

-                        const char *szDomain = NULL) const;
+                        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;
 


@@ -118,10 +131,10 @@ private:
 WXDLLEXPORT wxLocale* wxGetLocale();
 
 // get the translation of the string in the current locale  
 WXDLLEXPORT wxLocale* wxGetLocale();
 
 // 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();
 {
   wxLocale *pLoc = wxGetLocale();

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

 }
 
 #endif
 }
 
 #endif