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

18
src/gtk1/utilsres.cpp
View File

@@ -83,7 +83,7 @@ static char *GetResourcePath(char *buf, char *name, bool create)
// the Real User, then determine the Real home dir.
static char *GetIniFile(char *dest, const char *filename)
{
char *home = NULL;
char *home = (char *) NULL;
if (filename && wxIsAbsolutePath(filename))
{
strcpy(dest, filename);
@@ -133,7 +133,7 @@ static void wxXMergeDatabases(void)
if (XResourceManagerString(GDK_DISPLAY()) != NULL) {
serverDB = XrmGetStringDatabase(XResourceManagerString(GDK_DISPLAY()));
} else {
(void)GetIniFile(filename, NULL);
(void)GetIniFile(filename, (char *) NULL);
serverDB = XrmGetFileDatabase(filename);
}
if (serverDB)
@@ -144,7 +144,7 @@ static void wxXMergeDatabases(void)
if ((environment = getenv("XENVIRONMENT")) == NULL) {
size_t len;
environment = GetIniFile(filename, NULL);
environment = GetIniFile(filename, (const char *) NULL);
len = strlen(environment);
#if !defined(SVR4) || defined(__sgi)
(void)gethostname(environment + len, 1024 - len);
@@ -291,10 +291,10 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file )
{
char *s = NULL;
char *s = (char *) NULL;
bool succ = wxGetResource(section, entry, &s, file);
if (succ) {
*value = (float)strtod(s, NULL);
*value = (float)strtod(s, (char **) NULL);
delete[]s;
return TRUE;
} else
@@ -303,10 +303,10 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file )
{
char *s = NULL;
char *s = (char *) NULL;
bool succ = wxGetResource(section, entry, &s, file);
if (succ) {
*value = strtol(s, NULL, 10);
*value = strtol(s, (char **) NULL, 10);
delete[]s;
return TRUE;
} else
@@ -315,7 +315,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file )
{
char *s = NULL;
char *s = (char *) NULL;
bool succ = wxGetResource(section, entry, &s, file);
if (succ) {
// Handle True, False here
@@ -327,7 +327,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
*value = FALSE;
// Handle as Integer
else
*value = (int)strtol(s, NULL, 10);
*value = (int)strtol(s, (char **) NULL, 10);
delete[]s;
return TRUE;
} else