Fix type mismatch in wxLogTrace() call in wxSocket.

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 74525871e4005c0a238cfeb9c18e173b718de37f..fefda2bd809223ea5f20c7d8b5876c72c6315382 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -27,7 +27,12 @@
 #include "wx/evtloop.h"
 
 #include <gtk/gtk.h>
+#ifdef GDK_WINDOWING_WIN32
+#include <gdk/gdkwin32.h>
+#endif
+#ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
+#endif
 
 #if wxDEBUG_LEVEL
     #include "wx/gtk/assertdlg_gtk.h"
@@ -40,8 +45,9 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/wait.h>   // for WNOHANG
+#ifdef __UNIX__
 #include <unistd.h>
+#endif
 
 #if wxUSE_DETECT_SM
     #include <X11/SM/SMlib.h>
@@ -90,7 +96,7 @@ void wxDisplaySizeMM( int *width, int *height )
 
 void wxGetMousePosition( int* x, int* y )
 {
-    gdk_window_get_pointer( NULL, x, y, NULL );
+    gdk_window_get_pointer(gtk_widget_get_root_window(wxGetRootWindow()), x, y, NULL);
 }
 
 bool wxColourDisplay()
@@ -203,8 +209,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);
 }
 
 
@@ -295,25 +304,11 @@ protected:
     virtual void OnStackFrame(const wxStackFrame& frame)
     {
         wxString fncname = frame.GetName();
-        wxString fncargs = fncname;
-
-        size_t n = fncname.find(wxT('('));
-        if (n != wxString::npos)
-        {
-            // remove arguments from function name
-            fncname.erase(n);
-
-            // remove function name and brackets from arguments
-            fncargs = fncargs.substr(n+1, fncargs.length()-n-2);
-        }
-        else
-            fncargs = wxEmptyString;
 
         // append this stack frame's info in the dialog
         if (!frame.GetFileName().empty() || !fncname.empty())
             gtk_assert_dialog_append_stack_frame(m_dlg,
                                                 fncname.mb_str(),
-                                                fncargs.mb_str(),
                                                 frame.GetFileName().mb_str(),
                                                 frame.GetLine());
     }
@@ -463,11 +458,11 @@ wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
     {
         // since GTK>=2.6, we can use the glib_check_version() symbol...
 
-        // check whether GLib version is greater than 2.6 but also lower than 2.19
+        // check whether GLib version is greater than 2.6 but also lower than 2.31
         // because, as we use the undocumented _GOptionGroup struct, we don't want
-        // to run this code with future versions which might change it (2.19 is the
+        // to run this code with future versions which might change it (2.30 is the
         // latest one at the time of this writing)
-        if (!glib_check_version(2,6,0) && glib_check_version(2,20,0))
+        if (glib_check_version(2,6,0) == NULL && glib_check_version(2,31,0))
         {
             usage << _("The following standard GTK+ options are also supported:\n");