Revert [17287].

What the heck? can't you pay attention to SVN warnings about CONFLICTS?
Thanks for introducing a memory leak on top of that.

modules/gui/wxwidgets/wxwidgets.hpp

@@ -122,29 +122,26 @@ static inline char *wxDnDFromLocale( const wxChar *stupid )
      * UTF-8 but also Windows-1252(!) and ISO-8859-15(!) or any
      * non-western encoding, it obviously fails.
      */
+    size_t i = 0;
+    while (stupid[i])
+        i++;
 
-    wxString str(stupid);
-    int i;
+    char psz_local[i + 1];
+    if ((i >= 1) && (stupid[i - 1] == '\n'))
+        i--;
 
-    size_t n = str.Len();
-
-    char psz_local[n+1];
-
-    for(i=0;i<n;i++)
+    do
         psz_local[i] = stupid[i];
-    psz_local[n] = '\0';
-
-    if( psz_local[n-1] == '\n' )
-        psz_local[n-1] = '\0';
+    while (i--);
 
     return FromLocaleDup( psz_local );
 }
+#   define wxDnDLocaleFree( string ) free( string )
 #else
 #   define wxDnDFromLocale( string ) wxFromLocale( string )
+#   define wxDnDLocaleFree( string ) wxLocaleFree( string )
 #endif
 
-#define wxDnDLocaleFree( string ) wxLocaleFree( string )
-
 #define WRAPCOUNT 80
 
 #define OPEN_NORMAL 0