X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1530845c902cbb3057742822f87feb2ac45e329..de1359180540b5c5e11eddd4c3d08db4e38d59ea:/include/wx/intl.h diff --git a/include/wx/intl.h b/include/wx/intl.h index dce70d0c7b..fd26e1054c 100644 --- 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; } +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(); - return pLoc == NULL ? sz : pLoc->GetString(sz); + return pLoc == (wxLocale *) NULL ? sz : pLoc->GetString(sz); } #endif - // __INTLH__ + // _WX_INTLH__