]> git.saurik.com Git - wxWidgets.git/commitdiff
fix conversion of gdk_input_add() to g_io_add_watch() from r67326
authorPaul Cornett <paulcor@bullseye.com>
Tue, 19 Apr 2011 05:17:45 +0000 (05:17 +0000)
committerPaul Cornett <paulcor@bullseye.com>
Tue, 19 Apr 2011 05:17:45 +0000 (05:17 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/gtk/utilsgtk.cpp

index 74525871e4005c0a238cfeb9c18e173b718de37f..e8d6cf9b441964e632d42c748facb99f02094c99 100644 (file)
@@ -203,8 +203,11 @@ static gboolean EndProcessDetector(GIOChannel* source, GIOCondition, void* data)
 
 int wxGUIAppTraits::AddProcessCallback(wxEndProcessData *proc_data, int fd)
 {
-    return g_io_add_watch(
-        g_io_channel_unix_new(fd), G_IO_IN, EndProcessDetector, proc_data);
+    GIOChannel* channel = g_io_channel_unix_new(fd);
+    GIOCondition cond = GIOCondition(G_IO_IN | G_IO_HUP | G_IO_ERR);
+    unsigned id = g_io_add_watch(channel, cond, EndProcessDetector, proc_data);
+    g_io_channel_unref(channel);
+    return int(id);
 }