Commit d523d1af authored by Gildas Bazin's avatar Gildas Bazin

* modules/gui/wxwindows/*: proper characters encoding conversions.
   Override the popup menu only for the main interface.
parent 3512590a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* interface.cpp : wxWindows plugin for vlc * interface.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: interface.cpp,v 1.48 2003/07/18 11:39:39 gbazin Exp $ * $Id: interface.cpp,v 1.49 2003/07/19 16:33:55 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -539,6 +539,13 @@ void Interface::OnMenuOpen(wxMenuEvent& event) ...@@ -539,6 +539,13 @@ void Interface::OnMenuOpen(wxMenuEvent& event)
#if defined( __WXMSW__ ) || defined( __WXMAC__ ) #if defined( __WXMSW__ ) || defined( __WXMAC__ )
void Interface::OnContextMenu2(wxContextMenuEvent& event) void Interface::OnContextMenu2(wxContextMenuEvent& event)
{ {
/* Only show the context menu for the main interface */
if( GetId() != event.GetId() )
{
event.Skip();
return;
}
if( p_intf->p_sys->pf_show_dialog ) if( p_intf->p_sys->pf_show_dialog )
p_intf->p_sys->pf_show_dialog( p_intf, INTF_DIALOG_POPUPMENU, 0 ); p_intf->p_sys->pf_show_dialog( p_intf, INTF_DIALOG_POPUPMENU, 0 );
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* wxwindows.cpp : wxWindows plugin for vlc * wxwindows.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: wxwindows.cpp,v 1.21 2003/07/18 14:18:08 gbazin Exp $ * $Id: wxwindows.cpp,v 1.22 2003/07/19 16:33:55 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -34,6 +34,11 @@ ...@@ -34,6 +34,11 @@
#ifdef WIN32 /* mingw32 hack */ #ifdef WIN32 /* mingw32 hack */
#undef Yield #undef Yield
#undef CreateDialog #undef CreateDialog
extern int wxEntry( HINSTANCE hInstance,
HINSTANCE hPrevInstance = NULL,
char *pCmdLine = NULL,
int nCmdShow = SW_NORMAL );
#endif #endif
/* Let vlc take care of the i18n stuff */ /* Let vlc take care of the i18n stuff */
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* wxwindows.h: private wxWindows interface description * wxwindows.h: private wxWindows interface description
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: wxwindows.h,v 1.45 2003/07/18 11:39:39 gbazin Exp $ * $Id: wxwindows.h,v 1.46 2003/07/19 16:33:55 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -47,13 +47,24 @@ class FileInfo; ...@@ -47,13 +47,24 @@ class FileInfo;
#define SLIDER_MAX_POS 10000 #define SLIDER_MAX_POS 10000
/* wxU is used to convert ansi strings to unicode strings (wchar_t) */ /* wxU is used to convert ansi/utf8 strings to unicode strings (wchar_t) */
#if defined( ENABLE_NLS ) && defined( HAVE_GETTEXT ) && \
defined( WIN32 ) && !defined( HAVE_INCLUDED_GETTEXT )
#if wxUSE_UNICODE
# define wxU(utf8) wxString(utf8, wxConvUTF8)
#else
# define wxU(ut8 ) wxString(wxConvUTF8.cMB2WC(ut8), *wxConvCurrent)
#endif
#else // ENABLE_NLS && HAVE_GETTEXT && WIN32 && !HAVE_INCLUDED_GETTEXT
#if wxUSE_UNICODE #if wxUSE_UNICODE
# define wxU(ansi) wxString(ansi, *wxConvCurrent) # define wxU(ansi) wxString(ansi, *wxConvCurrent)
#else #else
# define wxU(ansi) ansi # define wxU(ansi) ansi
#endif #endif
#endif
#if !defined(MODULE_NAME_IS_skins) #if !defined(MODULE_NAME_IS_skins)
/***************************************************************************** /*****************************************************************************
* intf_sys_t: description and status of wxwindows interface * intf_sys_t: description and status of wxwindows interface
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment