Add missing shortnames.

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

diff --git a/modules/gui/wxwidgets/wxwidgets.hpp b/modules/gui/wxwidgets/wxwidgets.hpp
index 3fef5ce125e1c08f2518824152c1ca0f863964e9..58fd5270209db8cd081c7baef1684a22fb6ef7bf 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$
@@ -21,6 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #ifndef _WXVLC_WIDGETS_H_
 #define _WXVLC_WIDGETS_H_
 
@@ -37,10 +41,10 @@
 /* Let vlc take care of the i18n stuff */
 #define WXINTL_NO_GETTEXT_MACRO
 
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include "charset.h"
-
+#include <vlc_common.h>
+#include <vlc_interface.h>
+#include "vlc_charset.h"
+#include <vlc_playlist.h>
 #include <wx/wx.h>
 #define SLIDER_MAX_POS 10000
 
@@ -88,24 +92,28 @@ 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.
  *
- * Unicode needs to be enabled to catch non-ANSI characters on Windows
- * through wxString::wc_str(); they are lost when using mb_str().
+ * 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 */
 #if defined( wxUSE_UNICODE ) && !defined( WIN32 )
 static inline char *wxDnDFromLocale( const wxChar *stupid )
@@ -134,10 +142,10 @@ static inline char *wxDnDFromLocale( const wxChar *stupid )
 
     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
@@ -171,8 +179,8 @@ struct intf_sys_t
     WindowSettings      *p_window_settings;
 
     /* special actions */
-    vlc_bool_t          b_playing;
-    vlc_bool_t          b_intf_show;                /* interface to be shown */
+    bool          b_playing;
+    bool          b_intf_show;                /* interface to be shown */
 
     /* The input thread */
     input_thread_t *    p_input;
@@ -198,7 +206,7 @@ struct intf_sys_t
     /* Embedded vout */
     VideoWindow         *p_video_window;
     wxBoxSizer          *p_video_sizer;
-    vlc_bool_t          b_video_autosize;
+    bool          b_video_autosize;
 
     /* Aout */
     aout_instance_t     *p_aout;
@@ -217,13 +225,13 @@ wxWindow *CreateDialogsProvider( intf_thread_t *p_intf, wxWindow *p_parent );
 inline void LockPlaylist( intf_sys_t *p_sys, playlist_t *p_pl )
 {
     if( p_sys->i_playlist_usage++ == 0)
-        vlc_mutex_lock( &p_pl->object_lock );
+        playlist_lock( p_pl );
 }
 
 inline void UnlockPlaylist( intf_sys_t *p_sys, playlist_t *p_pl )
 {
     if( --p_sys->i_playlist_usage == 0)
-        vlc_mutex_unlock( &p_pl->object_lock );
+        playlist_Unlock( p_pl );
 }
 
 #endif