Dnd constant name changes because names like Copy can be #defined by other

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

diff --git a/include/wx/intl.h b/include/wx/intl.h
index dce70d0c7bada3f5dcabd4ec82b7b6cb3328a42d..193c4cc0e27d7ade4c46ee6bcfb466d4a01a8391 100644 (file)
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -28,8 +28,8 @@
 // ----------------------------------------------------------------------------
 
 // # adjust if necessary
-typedef unsigned char uint8;
-typedef unsigned long uint32;
+typedef unsigned char size_t8;
+typedef unsigned long size_t32;
 
 // ----------------------------------------------------------------------------
 // macros
@@ -57,11 +57,19 @@ class WXDLLEXPORT wxLocale
 {
 public:
   // ctor & dtor
+    // call Init() if you use this ctor
+  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)
-           bool bLoadDefault = TRUE);       // preload wxstd.mo?
+           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,
+            const char *szShort = (const char *) NULL,
+            const char *szLocale = (const char *) NULL,
+            bool bLoadDefault = TRUE);
     // restores old locale
  ~wxLocale();
 
@@ -89,7 +97,7 @@ 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, 
-                        const char *szDomain = NULL) const;
+                        const char *szDomain = (const char *) NULL) const;
 
 private:
   // find catalog by name in a linked list, return NULL if !found
@@ -107,14 +115,14 @@ private:
 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------
-inline WXDLLEXPORT wxLocale* wxGetLocale() { return g_pLocale; }
+wxLocale* WXDLLEXPORT wxGetLocale();
 
 // get the translation of the string in the current locale  
 inline WXDLLEXPORT const char *wxGetTranslation(const char *sz)
 {
   wxLocale *pLoc = wxGetLocale();
-  return pLoc == NULL ? sz : pLoc->GetString(sz);
+  return pLoc == (wxLocale *) NULL ? sz : pLoc->GetString(sz);
 }
 
 #endif
-       // __INTLH__
+       // _WX_INTLH__