X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b886fae6484edbb3a2fdbe8be74b3a840e9c84ee..c079af66c8fb4a2f68f33c6d3940b8ad8ec98f27:/src/x11/utils.cpp

diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp
index df9d4f9da5..665d4a2ec9 100644
--- a/src/x11/utils.cpp
+++ b/src/x11/utils.cpp
@@ -34,6 +34,7 @@
 #endif
 
 #include "wx/apptrait.h"
+#include "wx/generic/private/timer.h"
 
 #include <ctype.h>
 #include <stdarg.h>
@@ -110,6 +111,7 @@ void wxCheckForFinishedChildren()
       // Map empty, delete it.
       delete gs_procmap;
       gs_procmap = NULL;
+      return;
     }
     for (it = gs_procmap->begin();it != gs_procmap->end(); ++it)
     {
@@ -168,7 +170,6 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
     return wxPORT_X11;
 }
 
-
 // ----------------------------------------------------------------------------
 // display info
 // ----------------------------------------------------------------------------
@@ -272,8 +273,11 @@ void wxCloseDisplay()
 
 bool wxSetDisplay(const wxString& displayName)
 {
-    Display *
-        dpy = XOpenDisplay(displayName.empty() ? NULL : displayName.mb_str());
+    Display *dpy = XOpenDisplay
+                   (
+                    displayName.empty() ? NULL
+                                        : (const char *)displayName.mb_str()
+                   );
 
     if ( !dpy )
     {