"const" added to wxAceelTable ctor

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

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index d0d75b07a93e227a4cd232333f40194918f76554..050d1718ced2f06ddfc7ab2f754557130aaed673 100644 (file)
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -57,6 +57,25 @@ void wxDisplaySize( int *width, int *height )
   if (height) *height = gdk_screen_height();
 }
 
   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
 //------------------------------------------------------------------------
 //------------------------------------------------------------------------
 // user and home routines
 //------------------------------------------------------------------------


@@ -74,7 +93,7 @@ char* wxGetHomeDir( char *dest )
 
 char *wxGetUserHome( const wxString &user )
 {
 
 char *wxGetUserHome( const wxString &user )
 {

-  struct passwd *who = NULL;
+  struct passwd *who = (struct passwd *) NULL;

 
   if (user.IsNull() || (user== "")) 
   {
 
   if (user.IsNull() || (user== "")) 
   {


@@ -349,14 +368,21 @@ typedef struct {
 } wxEndProcessData;
 
 static void GTK_EndProcessDetector(gpointer data, gint source,
 } 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);
 
 {
   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);
   wait4(proc_data->pid, NULL, 0, NULL);

+#else
+  wait3((int *) NULL, 0, (rusage *) NULL);
+#endif

 
   close(source);
   gdk_input_remove(proc_data->tag);
 
   close(source);
   gdk_input_remove(proc_data->tag);


@@ -418,7 +444,7 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
     if (!sync) {
       data->process = process;
     } else {
     if (!sync) {
       data->process = process;
     } else {

-      data->process = NULL;
+      data->process = (wxProcess *) NULL;

       data->pid = -(data->pid);
 
       while (data->pid != 0)
       data->pid = -(data->pid);
 
       while (data->pid != 0)


@@ -442,7 +468,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);
     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);
 };
        /* loop */ ;
     return wxExecute(argv, sync, process);
 };