X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd5ab30d6a896e961a42fbfabd42c6415a1f388a..a624c97f0a5dbc07111ffa8e3c86ca029a837155:/src/gtk/utilsgtk.cpp

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 8e36cc40b7..0850010f6e 100644
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -40,14 +40,11 @@
 #include <sys/wait.h>   // for WNOHANG
 #include <unistd.h>
 
-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "gdk/gdkx.h"
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
 
 #if wxUSE_DETECT_SM
-    #include "X11/Xlib.h"
-    #include "X11/SM/SMlib.h"
+    #include <X11/SM/SMlib.h>
 
     #include "wx/unix/utilsx11.h"
 #endif
@@ -116,12 +113,6 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 WXDLLIMPEXP_CORE wxCharBuffer
 wxConvertToGTK(const wxString& s, wxFontEncoding enc)
 {
-    // Passing an empty string to cMB2WC() returns an invalid buffer, i.e. a
-    // buffer whose data is NULL and this can result in passing NULL to a GTK+
-    // function and a crash, so handle this case specially to avoid this.
-    if ( s.empty() )
-        return wxCharBuffer("");
-
     wxWCharBuffer wbuf;
     if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT )
     {