Eliminated some warnings under Windows; wxGetHomeDir problem in wxFile;

[wxWidgets.git] / src / gtk1 / utilsgtk.cpp

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index cd18250aaaad390e8cf594f4d396542af13b63db..25210a4e0be987fb228923005a59120a9cf1e458 100644 (file)
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -80,20 +80,16 @@ int wxDisplayDepth(void)
 // user and home routines
 //------------------------------------------------------------------------
 
-char* wxGetHomeDir( char *dest )
+const char* wxGetHomeDir( wxString *home  )
 {
-  wxString tmp = wxGetUserHome( wxString() );
-  if (tmp.IsNull())
-    strcpy( wxBuffer, "/" );
-  else
-    strcpy( wxBuffer, tmp );
-  if (dest) strcpy( dest, WXSTRINGCAST tmp );
-  return wxBuffer;
+  *home = wxGetUserHome( wxString() );
+  if (home->IsNull()) *home = "/";
+  return *home;
 };
 
 char *wxGetUserHome( const wxString &user )
 {
-  struct passwd *who = NULL;
+  struct passwd *who = (struct passwd *) NULL;
 
   if (user.IsNull() || (user== "")) 
   {
@@ -375,11 +371,13 @@ static void GTK_EndProcessDetector(gpointer data, gint source,
 
   pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);
 
-  /* wait4 is not standard, use at own risk */
+  /* wait4 is not part of any standard, use at own risk 
+   * not sure what wait4 does, but wait3 seems to be closest, whats a digit ;-)
+   * --- offer@sgi.com */
 #if !defined(__sgi)
   wait4(proc_data->pid, NULL, 0, NULL);
 #else
-  wait3(NULL, 0, NULL);
+  wait3((int *) NULL, 0, (rusage *) NULL);
 #endif
 
   close(source);
@@ -442,7 +440,7 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
     if (!sync) {
       data->process = process;
     } else {
-      data->process = NULL;
+      data->process = (wxProcess *) NULL;
       data->pid = -(data->pid);
 
       while (data->pid != 0)
@@ -466,7 +464,7 @@ long wxExecute( const wxString& command, bool sync, wxProcess *process )
     strncpy (tmp, command, sizeof(tmp) / sizeof(char) - 1);
     tmp[sizeof (tmp) / sizeof (char) - 1] = '\0';
     argv[argc++] = strtok (tmp, IFS);
-    while ((argv[argc++] = strtok(NULL, IFS)) != NULL)
+    while ((argv[argc++] = strtok((char *) NULL, IFS)) != NULL)
        /* loop */ ;
     return wxExecute(argv, sync, process);
 };