Commit ac4dea24 authored by Christophe Mutricy's avatar Christophe Mutricy

Forgot to change a few variable names (refs #80)

parent 5938dd60
/***************************************************************************** /*****************************************************************************
* dialogs.cpp : wxWindows plugin for vlc * dialogs.cpp : wxWidgets plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2004 the VideoLAN team * Copyright (C) 2000-2004 the VideoLAN team
* $Id$ * $Id$
...@@ -165,7 +165,7 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf, wxWindow *p_parent ) ...@@ -165,7 +165,7 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf, wxWindow *p_parent )
/* Check if user wants to show the bookmarks dialog by default */ /* Check if user wants to show the bookmarks dialog by default */
wxCommandEvent dummy_event; wxCommandEvent dummy_event;
if( config_GetInt( p_intf, "wxwin-bookmarks" ) ) if( config_GetInt( p_intf, "wx-bookmarks" ) )
OnBookmarks( dummy_event ); OnBookmarks( dummy_event );
/* Intercept all menu events in our custom event handler */ /* Intercept all menu events in our custom event handler */
......
...@@ -255,7 +255,7 @@ Interface::Interface( intf_thread_t *_p_intf, long style ): ...@@ -255,7 +255,7 @@ Interface::Interface( intf_thread_t *_p_intf, long style ):
#ifdef wxHAS_TASK_BAR_ICON #ifdef wxHAS_TASK_BAR_ICON
/* Systray integration */ /* Systray integration */
p_systray = NULL; p_systray = NULL;
if ( config_GetInt( p_intf, "wxwin-systray" ) ) if ( config_GetInt( p_intf, "wx-systray" ) )
{ {
p_systray = new Systray(this, p_intf); p_systray = new Systray(this, p_intf);
p_systray->SetIcon( wxIcon( vlc16x16_xpm ), wxT("VLC media player") ); p_systray->SetIcon( wxIcon( vlc16x16_xpm ), wxT("VLC media player") );
...@@ -287,7 +287,7 @@ Interface::Interface( intf_thread_t *_p_intf, long style ): ...@@ -287,7 +287,7 @@ Interface::Interface( intf_thread_t *_p_intf, long style ):
/* Video window */ /* Video window */
video_window = 0; video_window = 0;
if( config_GetInt( p_intf, "wxwin-embed" ) ) if( config_GetInt( p_intf, "wx-embed" ) )
{ {
video_window = CreateVideoWindow( p_intf, this ); video_window = CreateVideoWindow( p_intf, this );
frame_sizer->Add( p_intf->p_sys->p_video_sizer, 1, wxEXPAND, 0 ); frame_sizer->Add( p_intf->p_sys->p_video_sizer, 1, wxEXPAND, 0 );
...@@ -393,7 +393,7 @@ void Interface::OnControlEvent( wxCommandEvent& event ) ...@@ -393,7 +393,7 @@ void Interface::OnControlEvent( wxCommandEvent& event )
*****************************************************************************/ *****************************************************************************/
void Interface::CreateOurMenuBar() void Interface::CreateOurMenuBar()
{ {
int minimal = config_GetInt( p_intf, "wxwin-minimal" ); int minimal = config_GetInt( p_intf, "wx-minimal" );
/* Create the "File" menu */ /* Create the "File" menu */
wxMenu *file_menu = new wxMenu; wxMenu *file_menu = new wxMenu;
...@@ -493,7 +493,7 @@ void Interface::CreateOurToolBar() ...@@ -493,7 +493,7 @@ void Interface::CreateOurToolBar()
#define HELP_SLOW N_("Play slower") #define HELP_SLOW N_("Play slower")
#define HELP_FAST N_("Play faster") #define HELP_FAST N_("Play faster")
int minimal = config_GetInt( p_intf, "wxwin-minimal" ); int minimal = config_GetInt( p_intf, "wx-minimal" );
wxLogNull LogDummy; /* Hack to suppress annoying log message on the win32 wxLogNull LogDummy; /* Hack to suppress annoying log message on the win32
* version because we don't include wx.rc */ * version because we don't include wx.rc */
...@@ -1544,7 +1544,7 @@ void Systray::OnStopStream( wxCommandEvent& event ) ...@@ -1544,7 +1544,7 @@ void Systray::OnStopStream( wxCommandEvent& event )
/* Systray popup menu */ /* Systray popup menu */
wxMenu* Systray::CreatePopupMenu() wxMenu* Systray::CreatePopupMenu()
{ {
int minimal = config_GetInt( p_intf, "wxwin-minimal" ); int minimal = config_GetInt( p_intf, "wx-minimal" );
wxMenu* systray_menu = new wxMenu; wxMenu* systray_menu = new wxMenu;
systray_menu->Append( Exit_Event, wxU(_("Quit VLC")) ); systray_menu->Append( Exit_Event, wxU(_("Quit VLC")) );
......
/***************************************************************************** /*****************************************************************************
* menus.cpp : wxWindows plugin for vlc * menus.cpp : wxWidgets plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2004 the VideoLAN team * Copyright (C) 2000-2004 the VideoLAN team
* $Id$ * $Id$
...@@ -148,7 +148,7 @@ void PopupMenu( intf_thread_t *p_intf, wxWindow *p_parent, ...@@ -148,7 +148,7 @@ void PopupMenu( intf_thread_t *p_intf, wxWindow *p_parent,
{ {
#define MAX_POPUP_ITEMS 45 #define MAX_POPUP_ITEMS 45
int minimal = config_GetInt( p_intf, "wxwin-minimal" ); int minimal = config_GetInt( p_intf, "wx-minimal" );
vlc_object_t *p_object, *p_input; vlc_object_t *p_object, *p_input;
char *ppsz_varnames[MAX_POPUP_ITEMS]; char *ppsz_varnames[MAX_POPUP_ITEMS];
......
/***************************************************************************** /*****************************************************************************
* video.cpp : wxWindows plugin for vlc * video.cpp : wxWidgets plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2004, 2003 the VideoLAN team * Copyright (C) 2000-2004, 2003 the VideoLAN team
* $Id$ * $Id$
...@@ -125,7 +125,7 @@ VideoWindow::VideoWindow( intf_thread_t *_p_intf, wxWindow *_p_parent ): ...@@ -125,7 +125,7 @@ VideoWindow::VideoWindow( intf_thread_t *_p_intf, wxWindow *_p_parent ):
vlc_mutex_init( p_intf, &lock ); vlc_mutex_init( p_intf, &lock );
b_auto_size = config_GetInt( p_intf, "wxwin-autosize" ); b_auto_size = config_GetInt( p_intf, "wx-autosize" );
p_vout = NULL; p_vout = NULL;
i_creation_date = 0; i_creation_date = 0;
......
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