wxMenuItem::GetLabelFromText() added/documented, bug in wxMenu::FindItem() fixed

[wxWidgets.git] / src / unix / utilsunx.cpp

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index e721318d5b18b4aedddd6c8cb5a8a331038c2ddf..2efc806bd1a2a9c7be983f008a78915fa4c541aa 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -23,6 +23,7 @@
 
 #include "wx/utils.h"
 #include "wx/process.h"
 
 #include "wx/utils.h"
 #include "wx/process.h"

+#include "wx/thread.h"

 
 #include "wx/unix/execute.h"
 
 
 #include "wx/unix/execute.h"
 


@@ -40,9 +41,7 @@
 #include <fcntl.h>          // for O_WRONLY and friends
 #include <time.h>           // nanosleep() and/or usleep()
 #include <ctype.h>          // isspace()
 #include <fcntl.h>          // for O_WRONLY and friends
 #include <time.h>           // nanosleep() and/or usleep()
 #include <ctype.h>          // isspace()

-
-// JACS: needed for FD_SETSIZE
-#include <sys/time.h>
+#include <sys/time.h>       // needed for FD_SETSIZE

 
 #ifdef HAVE_UNAME
     #include <sys/utsname.h> // for uname()
 
 #ifdef HAVE_UNAME
     #include <sys/utsname.h> // for uname()


@@ -64,20 +63,21 @@
         #ifdef __SUN__
             int usleep(unsigned int usec);
         #else // !Sun
         #ifdef __SUN__
             int usleep(unsigned int usec);
         #else // !Sun

-        #ifdef __EMX__
-            /* I copied this from the XFree86 diffs. AV. */
-            #define INCL_DOSPROCESS
-            #include <os2.h>
-            void usleep(unsigned long delay)
-            {
-                DosSleep(delay ? (delay/1000l) : 1l);
-            }
-        #else
-            void usleep(unsigned long usec);
-        #endif
+            #ifdef __EMX__
+                /* I copied this from the XFree86 diffs. AV. */
+                #define INCL_DOSPROCESS
+                #include <os2.h>
+                inline void usleep(unsigned long delay)
+                {
+                    DosSleep(delay ? (delay/1000l) : 1l);
+                }
+            #else // !Sun && !EMX
+                void usleep(unsigned long usec);
+            #endif

         #endif // Sun/EMX/Something else
     };
         #endif // Sun/EMX/Something else
     };

-#define HAVE_USLEEP 1
+
+    #define HAVE_USLEEP 1

 #endif // Unices without usleep()
 
 // ============================================================================
 #endif // Unices without usleep()
 
 // ============================================================================


@@ -95,14 +95,14 @@ void wxSleep(int nSecs)
 
 void wxUsleep(unsigned long milliseconds)
 {
 
 void wxUsleep(unsigned long milliseconds)
 {

-#ifdef HAVE_NANOSLEEP
+#if defined(HAVE_NANOSLEEP)

     timespec tmReq;
     timespec tmReq;

-    tmReq.tv_sec = milliseconds / 1000;
+    tmReq.tv_sec = (time_t)(milliseconds / 1000);

     tmReq.tv_nsec = (milliseconds % 1000) * 1000 * 1000;
 
     // we're not interested in remaining time nor in return value
     (void)nanosleep(&tmReq, (timespec *)NULL);
     tmReq.tv_nsec = (milliseconds % 1000) * 1000 * 1000;
 
     // we're not interested in remaining time nor in return value
     (void)nanosleep(&tmReq, (timespec *)NULL);

-#elif defined( HAVE_USLEEP )
+#elif defined(HAVE_USLEEP)

     // uncomment this if you feel brave or if you are sure that your version
     // of Solaris has a safe usleep() function but please notice that usleep()
     // is known to lead to crashes in MT programs in Solaris 2.[67] and is not
     // uncomment this if you feel brave or if you are sure that your version
     // of Solaris has a safe usleep() function but please notice that usleep()
     // is known to lead to crashes in MT programs in Solaris 2.[67] and is not


@@ -112,6 +112,9 @@ void wxUsleep(unsigned long milliseconds)
     #endif // Sun
 
     usleep(milliseconds * 1000); // usleep(3) wants microseconds
     #endif // Sun
 
     usleep(milliseconds * 1000); // usleep(3) wants microseconds

+#elif defined(HAVE_SLEEP)
+    // under BeOS sleep() takes seconds (what about other platforms, if any?)
+    sleep(milliseconds * 1000);

 #else // !sleep function
     #error "usleep() or nanosleep() function required for wxUsleep"
 #endif // sleep function
 #else // !sleep function
     #error "usleep() or nanosleep() function required for wxUsleep"
 #endif // sleep function


@@ -123,7 +126,7 @@ void wxUsleep(unsigned long milliseconds)
 
 int wxKill(long pid, wxSignal sig)
 {
 
 int wxKill(long pid, wxSignal sig)
 {

-    return kill(pid, (int)sig);
+    return kill((pid_t)pid, (int)sig);

 }
 
 #define WXEXECUTE_NARGS   127
 }
 
 #define WXEXECUTE_NARGS   127


@@ -217,9 +220,24 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data)
     // systems wait() might be used instead in a loop (until the right pid
     // terminates)
     int status = 0;
     // systems wait() might be used instead in a loop (until the right pid
     // terminates)
     int status = 0;

-    if ( waitpid(pid, &status, 0) == -1 || !WIFEXITED(status) )
+    int rc;
+
+    // wait for child termination and if waitpid() was interrupted, try again
+    do
+    {
+       rc = waitpid(pid, &status, 0);
+    }
+    while ( rc == -1 && errno == EINTR );
+
+
+    if( rc == -1 || ! (WIFEXITED(status) || WIFSIGNALED(status)) )

     {
     {

-        wxLogSysError(_("Waiting for subprocess termination failed"));
+       wxLogSysError(_("Waiting for subprocess termination failed"));
+       /* AFAIK, this can only happen if something went wrong within
+          wxGTK, i.e. due to a race condition or some serious bug.
+          After having fixed the order of statements in
+          GTK_EndProcessDetector(). (KB)
+       */

     }
     else
     {
     }
     else
     {


@@ -229,19 +247,18 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data)
             proc_data->process->OnTerminate(proc_data->pid,
                                             WEXITSTATUS(status));
         }
             proc_data->process->OnTerminate(proc_data->pid,
                                             WEXITSTATUS(status));
         }

-    }
-
-    // clean up
-    if ( proc_data->pid > 0 )
-    {
-        delete proc_data;
-    }
-    else
-    {
-        // wxExecute() will know about it
-        proc_data->exitcode = status;
+        // clean up
+        if ( proc_data->pid > 0 )
+        {
+           delete proc_data;
+        }
+        else
+        {
+           // wxExecute() will know about it
+           proc_data->exitcode = status;

 
 

-        proc_data->pid = 0;
+           proc_data->pid = 0;
+        }

     }
 }
 
     }
 }
 


@@ -345,11 +362,8 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process )
     else
     {
 #if wxUSE_GUI
     else
     {
 #if wxUSE_GUI

-        // we're in parent
-        close(end_proc_detect[1]); // close writing side
-

         wxEndProcessData *data = new wxEndProcessData;
         wxEndProcessData *data = new wxEndProcessData;

-        data->tag = wxAddProcessCallback(data, end_proc_detect[0]);
+

 
         ARGS_CLEANUP;
 
 
         ARGS_CLEANUP;
 


@@ -360,6 +374,9 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process )
 
             // sync execution: indicate it by negating the pid
             data->pid = -pid;
 
             // sync execution: indicate it by negating the pid
             data->pid = -pid;

+            data->tag = wxAddProcessCallback(data, end_proc_detect[0]);
+            // we're in parent
+            close(end_proc_detect[1]); // close writing side

 
             // it will be set to 0 from GTK_EndProcessDetector
             while (data->pid != 0)
 
             // it will be set to 0 from GTK_EndProcessDetector
             while (data->pid != 0)


@@ -374,10 +391,13 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process )
         else
         {
             // async execution, nothing special to do - caller will be
         else
         {
             // async execution, nothing special to do - caller will be

-            // notified about the process terminationif process != NULL, data
+            // notified about the process termination if process != NULL, data

             // will be deleted in GTK_EndProcessDetector
             data->process = process;
             data->pid = pid;
             // will be deleted in GTK_EndProcessDetector
             data->process = process;
             data->pid = pid;

+            data->tag = wxAddProcessCallback(data, end_proc_detect[0]);
+            // we're in parent
+            close(end_proc_detect[1]); // close writing side

 
             return pid;
         }
 
             return pid;
         }


@@ -393,6 +413,7 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process )
         return exitcode;
 #endif // wxUSE_GUI
     }
         return exitcode;
 #endif // wxUSE_GUI
     }

+   return 0;

 
     #undef ARGS_CLEANUP
 }
 
     #undef ARGS_CLEANUP
 }


@@ -546,24 +567,34 @@ bool wxGetUserId(wxChar *buf, int sz)
 bool wxGetUserName(wxChar *buf, int sz)
 {
     struct passwd *who;
 bool wxGetUserName(wxChar *buf, int sz)
 {
     struct passwd *who;

-    char *comma;

 
     *buf = wxT('\0');
 
     *buf = wxT('\0');

-    if ((who = getpwuid (getuid ())) != NULL) {
-#ifndef __VMS__
-       comma = strchr(who->pw_gecos, ',');
+    if ((who = getpwuid (getuid ())) != NULL)
+    {
+        // pw_gecos field in struct passwd is not standard
+#if HAVE_PW_GECOS
+       char *comma = strchr(who->pw_gecos, ',');

        if (comma)
            *comma = '\0'; // cut off non-name comment fields
        wxStrncpy (buf, wxConvertMB2WX(who->pw_gecos), sz - 1);
        if (comma)
            *comma = '\0'; // cut off non-name comment fields
        wxStrncpy (buf, wxConvertMB2WX(who->pw_gecos), sz - 1);

-#else
+#else // !HAVE_PW_GECOS

        wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
        wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);

-#endif
+#endif // HAVE_PW_GECOS/!HAVE_PW_GECOS

        return TRUE;
     }
 
     return FALSE;
 }
 
        return TRUE;
     }
 
     return FALSE;
 }
 

+wxString wxGetOsDescription()
+{
+#ifndef WXWIN_OS_DESCRIPTION
+    #error WXWIN_OS_DESCRIPTION should be defined in config.h by configure
+#else
+    return WXWIN_OS_DESCRIPTION;
+#endif
+}
+

 // ----------------------------------------------------------------------------
 // error and debug output routines (deprecated, use wxLog)
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // error and debug output routines (deprecated, use wxLog)
 // ----------------------------------------------------------------------------