Don't try to extract accelerators from menu items which don't have any.

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 8e36cc40b79f559566e94691df98d5033bc6ea37..93b8f02790f29680f0e163f17b9083c6253d6fe7 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -116,12 +116,6 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 WXDLLIMPEXP_CORE wxCharBuffer
 wxConvertToGTK(const wxString& s, wxFontEncoding enc)
 {
 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 )
     {
     wxWCharBuffer wbuf;
     if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT )
     {