Improve wxMenu docs

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index a87e1c321efa2866f2eb2c2d4d8312daa4260de5..d255eb50e0e92a59f90e7bdee2130f0fe5bb98f2 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -213,50 +213,22 @@ const gchar *wx_pango_version_check (int major, int minor, int micro)
 extern "C" {
 static
 void GTK_EndProcessDetector(gpointer data, gint source,
 extern "C" {
 static
 void GTK_EndProcessDetector(gpointer data, gint source,

-                            GdkInputCondition WXUNUSED(condition) )
+                            GdkInputCondition WXUNUSED(condition))

 {
 {

-   wxEndProcessData *proc_data = (wxEndProcessData *)data;
+    wxEndProcessData * const
+        proc_data = wx_static_cast(wxEndProcessData *, data);

 
 

-   // has the process really terminated? unfortunately GDK (or GLib) seem to
-   // generate G_IO_HUP notification even when it simply tries to read from a
-   // closed fd and hasn't terminated at all
-   int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);
-   int status = 0;
-   int rc = waitpid(pid, &status, WNOHANG);
+    // child exited, end waiting
+    close(source);

 
 

-    if ( rc == 0 )
-    {
-        // This can only happen if the child application closes our dummy
-        // pipe that is used to monitor its lifetime; in that case, our
-        // best bet is to pretend the process did terminate, because
-        // otherwise wxExecute() would hang indefinitely
-        // (OnExceptionWaiting() won't be called again, the descriptor
-        // is closed now).
-        wxLogDebug("Child process (PID %i) still alive, even though notification was received that it terminated.", pid);
-    }
-    else if ( rc == -1 )
-    {
-        // As above, if waitpid() fails, the best we can do is to log the
-        // error and pretend the child terminated:
-        wxLogSysError(_("Failed to check child process' status"));
-    }
-
-   // set exit code to -1 if something bad happened
-   proc_data->exitcode = (rc > 0 && WIFEXITED(status))
-                         ? WEXITSTATUS(status)
-                         : -1;
-
-   // child exited, end waiting
-   close(source);
-
-   // don't call us again!
-   gdk_input_remove(proc_data->tag);
+    // don't call us again!
+    gdk_input_remove(proc_data->tag);

 
 

-   wxHandleProcessTermination(proc_data);
+    wxHandleProcessTermination(proc_data);

 }
 }
 
 }
 }
 

-int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
+int wxGUIAppTraits::AddProcessCallback(wxEndProcessData *proc_data, int fd)

 {
     int tag = gdk_input_add(fd,
                             GDK_INPUT_READ,
 {
     int tag = gdk_input_add(fd,
                             GDK_INPUT_READ,


@@ -552,7 +524,7 @@ wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
             names.push_back(wxGetNameFromGtkOptionEntry(&entries[n]));
 
             const gchar * const entryDesc = entries[n].description;
             names.push_back(wxGetNameFromGtkOptionEntry(&entries[n]));
 
             const gchar * const entryDesc = entries[n].description;

-            desc.push_back(entryDesc ? wxString(entryDesc) : _T(""));
+            desc.push_back(wxString(entryDesc));

         }
 
         g_option_group_free (gtkOpts);
         }
 
         g_option_group_free (gtkOpts);