More Motif stuff, minor stubs correction

[wxWidgets.git] / src / common / utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 235b5c146028a1fe3854c41d6dd4a3f59e3e96e6..37d62161f62d5f1e944ef33db5c01f0d1e483bdd 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -109,7 +109,7 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar)
 }
 #endif
 
 }
 #endif
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 
 #ifndef __GNUWIN32__
 #define strcasecmp stricmp
 
 #ifndef __GNUWIN32__
 #define strcasecmp stricmp


@@ -172,14 +172,14 @@ void
 StringToFloat (char *s, float *number)
 {
   if (s && *s && number)
 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)
 }
 
 void 
 StringToDouble (char *s, double *number)
 {
   if (s && *s && number)

-    *number = strtod (s, NULL);
+    *number = strtod (s, (char **) NULL);

 }
 
 char *
 }
 
 char *


@@ -205,14 +205,14 @@ void
 StringToInt (char *s, int *number)
 {
   if (s && *s && number)
 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)
 }
 
 void 
 StringToLong (char *s, long *number)
 {
   if (s && *s && number)

-    *number = strtol (s, NULL, 10);
+    *number = strtol (s, (char **) NULL, 10);

 }
 
 char *
 }
 
 char *


@@ -309,7 +309,7 @@ StringMatch (char *str1, char *str2, bool subString, bool exact)
 // [volatile]
 wxString wxNow( void )
 {
 // [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);
   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)
 char *wxStripMenuCodes (char *in, char *out)
 {
   if (!in)

-    return NULL;
+    return (char *) NULL;

     
   if (!out)
     out = copystring(in);
     
   if (!out)
     out = copystring(in);


@@ -408,7 +408,7 @@ wxFindWindowByLabel (const wxString& title, wxWindow * parent)
        }                       // for()
 
     }
        }                       // for()
 
     }

-  return NULL;
+  return (wxWindow *) NULL;

 }
 
 // Recursive
 }
 
 // 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

 
 }
 
 
 }