Fixed Get...String functions.

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

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index ccd767f3b6d4176e561d53d7d091260e44d7744f..050d1718ced2f06ddfc7ab2f754557130aaed673 100644 (file)
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -51,6 +51,31 @@ int wxKill(long pid, int sig)
   return kill(pid, sig);
 };
 
+void wxDisplaySize( int *width, int *height )
+{
+  if (width) *width = gdk_screen_width();
+  if (height) *height = gdk_screen_height();
+}
+
+void wxGetMousePosition( int* x, int* y )
+{
+  wxFAIL_MSG( "GetMousePosition not yet implemented" );
+  if (x) *x = 0;
+  if (y) *y = 0;
+};
+
+bool wxColourDisplay(void)
+{
+  wxFAIL_MSG( "wxColourDisplay always returns TRUE" );
+  return TRUE;
+}
+
+int wxDisplayDepth(void)
+{
+  wxFAIL_MSG( "wxDisplayDepth always returns 8" );
+  return 8;
+}
+
 //------------------------------------------------------------------------
 // user and home routines
 //------------------------------------------------------------------------
@@ -68,7 +93,7 @@ char* wxGetHomeDir( char *dest )
 
 char *wxGetUserHome( const wxString &user )
 {
-  struct passwd *who = NULL;
+  struct passwd *who = (struct passwd *) NULL;
 
   if (user.IsNull() || (user== "")) 
   {
@@ -343,14 +368,21 @@ typedef struct {
 } wxEndProcessData;
 
 static void GTK_EndProcessDetector(gpointer data, gint source,
-                                   GdkInputCondition condition)
+                                   GdkInputCondition WXUNUSED(condition) )
 {
   wxEndProcessData *proc_data = (wxEndProcessData *)data;
   int pid;
 
   pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);
 
+  /* 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((int *) NULL, 0, (rusage *) NULL);
+#endif
 
   close(source);
   gdk_input_remove(proc_data->tag);
@@ -364,7 +396,7 @@ static void GTK_EndProcessDetector(gpointer data, gint source,
     proc_data->pid = 0;
 };
 
-long wxExecute( char **argv, bool Async, wxProcess *process )
+long wxExecute( char **argv, bool sync, wxProcess *process )
 {
     wxEndProcessData *data = new wxEndProcessData;
     int end_proc_detect[2];
@@ -409,10 +441,10 @@ long wxExecute( char **argv, bool Async, wxProcess *process )
     data->tag = gdk_input_add(end_proc_detect[0], GDK_INPUT_READ,
                               GTK_EndProcessDetector, (gpointer)data);
     data->pid = pid;
-    if (Async) {
+    if (!sync) {
       data->process = process;
     } else {
-      data->process = NULL;
+      data->process = (wxProcess *) NULL;
       data->pid = -(data->pid);
 
       while (data->pid != 0)
@@ -424,7 +456,7 @@ long wxExecute( char **argv, bool Async, wxProcess *process )
     return pid;
 };
 
-long wxExecute( const wxString& command, bool Async, wxProcess *process )
+long wxExecute( const wxString& command, bool sync, wxProcess *process )
 {
     if (command.IsNull() || command == "") return FALSE;
 
@@ -436,8 +468,9 @@ long wxExecute( const wxString& command, bool Async, 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, Async, process);
+    return wxExecute(argv, sync, process);
 };
 
+