Fix input deadlocks in macosx gui

[vlc] / modules / gui / wxwidgets / wxwidgets.hpp

diff --git a/modules/gui/wxwidgets/wxwidgets.hpp b/modules/gui/wxwidgets/wxwidgets.hpp
index 2b723023d06acbe5359a1886c72a7568088e153d..8d2b6170e8216b2e34559e9a5c506da322aa640d 100644 (file)
--- a/modules/gui/wxwidgets/wxwidgets.hpp
+++ b/modules/gui/wxwidgets/wxwidgets.hpp
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * wxwidgets.hpp: Common headers for the wxwidges interface
+ * wxwidgets.hpp: Common headers for the wxwidgets interface
  *****************************************************************************
  * Copyright (C) 1999-2005 the VideoLAN team
  * $Id$
@@ -38,9 +38,9 @@
 #define WXINTL_NO_GETTEXT_MACRO
 
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include "charset.h"
-
+#include <vlc_interface.h>
+#include "vlc_charset.h"
+#include <vlc_playlist.h>
 #include <wx/wx.h>
 #define SLIDER_MAX_POS 10000
 
@@ -88,37 +88,33 @@ DECLARE_LOCAL_EVENT_TYPE( wxEVT_INTF, 1 );
 
 /*
  * wxFromLocale() is a replacement for LibVLC FromLocale() that accepts
- * a wxString. It was originally introduced because wxString::mb_str()
- * sucks on Linux with Unicode wxWidgets. It then turned out wxWidgets
- * did not support wc_str() when Unicode was not enabled.
- *
- * But heh, that's wxWidgets; you can't really expect it to actually
- * work, let alone work like its documentation says.
+ * a wxString.
  *
- * Did it work, we would be able to catch non-ANSI characters on Windows
- * through wxString::wc_str(); while they are lost when using mb_str().
- * This would be particularly useful to open files whose names contain
- * non-ACP characters.
+ * Note that if you want to use non-ANSI code page characters on Windows,
+ * you MUST build WxWidgets in “Unicode” mode. wxConvUTF8
  */
-#if wxUSE_UNICODE
-#   define wxFromLocale(wxstring) FromWide(wxstring.wc_str())
-#   define wxLocaleFree(string) free(string)
+static inline char *wxFromLocale (const wxString& string)
+{
+#if defined( wxUSE_UNICODE )
+# if defined( WIN32 )
+    return FromWide ((const wchar_t *)string.c_str());
+#  define wxLocaleFree free
+# else
+    return FromLocaleDup (string.mb_str());
+#  define wxLocaleFree free
+# endif
 #else
-#   define wxFromLocale(wxstring) FromLocale(wxstring.mb_str())
-#   define wxLocaleFree(string) LocaleFree(string)
+# warning Please use WxWidgets with Unicode.
+    return FromLocale (string.c_str());
+# define wxLocaleFree LocaleFree
 #endif
+}
        
 /* From Locale functions to use for File Drop targets ... go figure */
-#ifdef wxUSE_UNICODE
+#if defined( wxUSE_UNICODE ) && !defined( WIN32 )
 static inline char *wxDnDFromLocale( const wxChar *stupid )
 {
     /*
-     * FIXME: this is yet another awful and ugly bug-to-bug work-around
-     * for the painfully broken and brain-dead wxWidgets character
-     * encoding internals. Maybe, one day the wxWidgets team will find out
-     * and we will have to remove (phew) this kludge or autodetect whether
-     * to trigger it (damn).
-     *
      * In Unicode mode, wxWidgets will encode file names in the locale
      * encoding with each **bytes** (rather than characters) represented
      * by a 32 bits unsigned integer. If you are lucky enough to be using
@@ -128,21 +124,24 @@ 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.
      */
-    const wxChar *braindead;
-    for (braindead = stupid; *braindead; braindead++);
+    size_t n = 0;
+    while (stupid[n])
+        n++;
+
+    char psz_local[n + 1];
+    for (size_t i = 0; i <= n; i++)
+        psz_local[i] = stupid[i];
 
-    size_t i = (braindead - stupid);
-    char psz_local[i + 1];
-    do
-        psz_local[i] = (char)stupid[i];
-    while (i--);
+    // Kludge for (broken?) apps that adds a LF at the end of DnD
+    if ((n >= 1) && (strchr ("\n\r", stupid[n - 1]) != NULL))
+        psz_local[n - 1] = '\0';
 
     return FromLocaleDup( psz_local );
 }
-#   define wxDnDLocaleFree( string ) free( string )
+#   define wxDnDLocaleFree free
 #else
-#   define wxDnDFromLocale( string ) wxFromLocale( string )
-#   define wxDnDLocaleFree( string ) wxLocaleFree( string )
+#   define wxDnDFromLocale wxFromLocale
+#   define wxDnDLocaleFree wxLocaleFree
 #endif
 
 #define WRAPCOUNT 80
@@ -163,10 +162,6 @@ namespace wxvlc {
 
 using namespace wxvlc;
 
-class DialogsProvider;
-class PrefsTreeCtrl;
-class AutoBuiltPanel;
-
 /*****************************************************************************
  * intf_sys_t: description and status of wxwindows interface
  *****************************************************************************/