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 eae2d4ef5c71f1259b1b9d1afc6b2b1f8ffce710..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
 
@@ -91,7 +91,7 @@ DECLARE_LOCAL_EVENT_TYPE( wxEVT_INTF, 1 );
  * a wxString.
  *
  * Note that if you want to use non-ANSI code page characters on Windows,
- * you MUST build WxWidgets in “Unicode” mode.
+ * you MUST build WxWidgets in “Unicode” mode. wxConvUTF8
  */
 static inline char *wxFromLocale (const wxString& string)
 {
@@ -100,8 +100,8 @@ static inline char *wxFromLocale (const wxString& string)
     return FromWide ((const wchar_t *)string.c_str());
 #  define wxLocaleFree free
 # else
-    return FromLocale (string.mb_str());
-#  define wxLocaleFree LocaleFree
+    return FromLocaleDup (string.mb_str());
+#  define wxLocaleFree free
 # endif
 #else
 # warning Please use WxWidgets with Unicode.