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

diff --git a/modules/gui/wxwidgets/dialogs.cpp b/modules/gui/wxwidgets/dialogs.cpp
index 4374f7407614ae53eac14d91289254e393cf04cc..e33d5243041151772018dba4900784f907ccc963 100644 (file)
--- a/modules/gui/wxwidgets/dialogs.cpp
+++ b/modules/gui/wxwidgets/dialogs.cpp
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * dialogs.cpp : wxWindows plugin for vlc
+ * dialogs.cpp : wxWidgets plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2004 the VideoLAN team
  * $Id$
@@ -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 */
     wxCommandEvent dummy_event;
-    if( config_GetInt( p_intf, "wxwin-bookmarks" ) )
+    if( config_GetInt( p_intf, "wx-bookmarks" ) )
         OnBookmarks( dummy_event );
 
     /* Intercept all menu events in our custom event handler */

diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index a5db43c3699520008748abb1b6316a70536af5c1..2bc3c53fead7d6e7a17897339bedeb4e7136c2d6 100644 (file)
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -255,7 +255,7 @@ Interface::Interface( intf_thread_t *_p_intf, long style ):
 #ifdef wxHAS_TASK_BAR_ICON
     /* Systray integration */
     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->SetIcon( wxIcon( vlc16x16_xpm ), wxT("VLC media player") );
@@ -287,7 +287,7 @@ Interface::Interface( intf_thread_t *_p_intf, long style ):
 
     /* Video window */
     video_window = 0;
-    if( config_GetInt( p_intf, "wxwin-embed" ) )
+    if( config_GetInt( p_intf, "wx-embed" ) )
     {
         video_window = CreateVideoWindow( p_intf, this );
         frame_sizer->Add( p_intf->p_sys->p_video_sizer, 1, wxEXPAND, 0 );
@@ -393,7 +393,7 @@ void Interface::OnControlEvent( wxCommandEvent& event )
  *****************************************************************************/
 void Interface::CreateOurMenuBar()
 {
-    int minimal = config_GetInt( p_intf, "wxwin-minimal" );
+    int minimal = config_GetInt( p_intf, "wx-minimal" );
 
     /* Create the "File" menu */
     wxMenu *file_menu = new wxMenu;
@@ -493,7 +493,7 @@ void Interface::CreateOurToolBar()
 #define HELP_SLOW N_("Play slower")
 #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
                          * version because we don't include wx.rc */
@@ -1544,7 +1544,7 @@ void Systray::OnStopStream( wxCommandEvent& event )
 /* Systray popup menu */
 wxMenu* Systray::CreatePopupMenu()
 {
-    int minimal = config_GetInt( p_intf, "wxwin-minimal" );
+    int minimal = config_GetInt( p_intf, "wx-minimal" );
 
     wxMenu* systray_menu = new wxMenu;
     systray_menu->Append( Exit_Event, wxU(_("Quit VLC")) );

diff --git a/modules/gui/wxwidgets/menus.cpp b/modules/gui/wxwidgets/menus.cpp
index 65e2d8b415ea29bf571541279ae29625cae1da5e..b5ffdfca708840cf196f689045386cc05b1d8d0a 100644 (file)
--- a/modules/gui/wxwidgets/menus.cpp
+++ b/modules/gui/wxwidgets/menus.cpp
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * menus.cpp : wxWindows plugin for vlc
+ * menus.cpp : wxWidgets plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2004 the VideoLAN team
  * $Id$
@@ -148,7 +148,7 @@ void PopupMenu( intf_thread_t *p_intf, wxWindow *p_parent,
 {
 #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;
     char *ppsz_varnames[MAX_POPUP_ITEMS];

diff --git a/modules/gui/wxwidgets/video.cpp b/modules/gui/wxwidgets/video.cpp
index c93f8f144c3fd20825394f401e5674af0ded7aac..b31e8f80c348050e4da80eaf22ea274b1a0d678d 100644 (file)
--- a/modules/gui/wxwidgets/video.cpp
+++ b/modules/gui/wxwidgets/video.cpp
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * video.cpp : wxWindows plugin for vlc
+ * video.cpp : wxWidgets plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2004, 2003 the VideoLAN team
  * $Id$
@@ -125,7 +125,7 @@ VideoWindow::VideoWindow( intf_thread_t *_p_intf, wxWindow *_p_parent ):
 
     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;
     i_creation_date = 0;