Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

General tidy-up (mainly typecasts) to allow the use of the SGI native

Browse Source 
compilers (tested on Irix 6.5 with -mips3 -n32).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Unknown (RO)
1998-08-23 03:22:56 +00:00
parent cb6780ff01
commit c67daf8777
215 changed files with 1654 additions and 1458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/intl.h
View File

@@ -61,14 +61,14 @@ public:
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,
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();
@@ -97,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
@@ -121,7 +121,7 @@ WXDLLEXPORT wxLocale* wxGetLocale();
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