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/common/utilscmn.cpp
View File

@@ -172,14 +172,14 @@ void
StringToFloat (char *s, float *number)
{
if (s && *s && number)
*number = (float) strtod (s, NULL);
*number = (float) strtod (s, (char **) NULL);
}
void
StringToDouble (char *s, double *number)
{
if (s && *s && number)
*number = strtod (s, NULL);
*number = strtod (s, (char **) NULL);
}
char *
@@ -205,14 +205,14 @@ void
StringToInt (char *s, int *number)
{
if (s && *s && number)
*number = (int) strtol (s, NULL, 10);
*number = (int) strtol (s, (char **) NULL, 10);
}
void
StringToLong (char *s, long *number)
{
if (s && *s && number)
*number = strtol (s, NULL, 10);
*number = strtol (s, (char **) NULL, 10);
}
char *
@@ -309,7 +309,7 @@ StringMatch (char *str1, char *str2, bool subString, bool exact)
// [volatile]
wxString wxNow( void )
{
time_t now = time(NULL);
time_t now = time((time_t *) NULL);
char *date = ctime(&now);
date[24] = '\0';
return wxString(date);
@@ -344,7 +344,7 @@ wxGetEmailAddress (char *address, int maxSize)
char *wxStripMenuCodes (char *in, char *out)
{
if (!in)
return NULL;
return (char *) NULL;
if (!out)
out = copystring(in);
@@ -408,7 +408,7 @@ wxFindWindowByLabel (const wxString& title, wxWindow * parent)
} // for()
}
return NULL;
return (wxWindow *) NULL;
}
// Recursive
@@ -433,7 +433,7 @@ wxFindWindowByLabel1 (const wxString& title, wxWindow * parent)
}
return NULL; // Not found
return (wxWindow *) NULL; // Not found
}
@@ -489,7 +489,7 @@ wxFindWindowByName1 (const wxString& title, wxWindow * parent)
}
return NULL; // Not found
return (wxWindow *) NULL; // Not found
}