* modules/gui/wxwindows/wxwindows.h: forgot to remove useless variable.

[vlc] / modules / gui / wxwindows / wxwindows.h

diff --git a/modules/gui/wxwindows/wxwindows.h b/modules/gui/wxwindows/wxwindows.h
index bf24bb6e1929a61835abd9b5ad01dc63a0ed6389..1b13f2fd7b2164f2cfc00139195c14299d963197 100644 (file)
--- a/modules/gui/wxwindows/wxwindows.h
+++ b/modules/gui/wxwindows/wxwindows.h
@@ -4,7 +4,7 @@
  * Copyright (C) 1999-2004 VideoLAN
  * $Id$
  *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
+ * Authors: Gildas Bazin <gbazin@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -52,12 +52,6 @@
 DECLARE_LOCAL_EVENT_TYPE( wxEVT_DIALOG, 0 );
 DECLARE_LOCAL_EVENT_TYPE( wxEVT_INTF, 1 );
 
-class OpenDialog;
-class Playlist;
-class Messages;
-class FileInfo;
-class VideoWindow;
-
 #define SLIDER_MAX_POS 10000
 
 /* wxU is used to convert ansi/utf8 strings to unicode strings (wchar_t) */
@@ -97,7 +91,9 @@ class VideoWindow;
 #define MODE_AUTHOR 2
 #define MODE_TITLE 3
 
-wxArrayString SeparateEntries( wxString );
+class PrefsTreeCtrl;
+class AutoBuiltPanel;
+class VideoWindow;
 
 /*****************************************************************************
  * intf_sys_t: description and status of wxwindows interface
@@ -139,12 +135,28 @@ struct intf_sys_t
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
+wxArrayString SeparateEntries( wxString );
+wxWindow *VideoWindow( intf_thread_t *p_intf, wxWindow *p_parent );
+wxWindow *BookmarksDialog( intf_thread_t *p_intf, wxWindow *p_parent );
+
+namespace wxvlc
+{
+class Interface;
+class OpenDialog;
+class V4LDialog;
+class SoutDialog;
+class SubsFileDialog;
+class Playlist;
+class Messages;
+class FileInfo;
+class StreamDialog;
+class ItemInfoDialog;
+class NewGroup;
+class ExportPlaylist;
 
 /*****************************************************************************
  * Classes declarations.
  *****************************************************************************/
-class Interface;
-
 /* Timer */
 class Timer: public wxTimer
 {
@@ -171,14 +183,12 @@ public:
     virtual ~Interface();
     void TogglePlayButton( int i_playing_status );
 
-//    wxFlexGridSizer *frame_sizer;
     wxBoxSizer  *frame_sizer;
     wxStatusBar *statusbar;
 
     wxSlider    *slider;
     wxWindow    *slider_frame;
     wxWindow    *extra_frame;
-    wxStaticBox *slider_box;
 
     vlc_bool_t b_extra;
 
@@ -261,9 +271,6 @@ private:
     vlc_bool_t b_navig_menu;
 };
 
-class StreamDialog;
-class BookmarksDialog;
-
 /* Dialogs Provider */
 class DialogsProvider: public wxFrame
 {
@@ -310,16 +317,12 @@ public:
     FileInfo            *p_fileinfo_dialog;
     StreamDialog        *p_streamwizard_dialog;
     wxFrame             *p_prefs_dialog;
-    BookmarksDialog     *p_bookmarks_dialog;
+    wxWindow            *p_bookmarks_dialog;
     wxFileDialog        *p_file_generic_dialog;
 };
 
 /* Open Dialog */
-class AutoBuiltPanel;
 WX_DEFINE_ARRAY(AutoBuiltPanel *, ArrayOfAutoBuiltPanel);
-class V4LDialog;
-class SoutDialog;
-class SubsFileDialog;
 class OpenDialog: public wxFrame
 {
 public:
@@ -700,7 +703,6 @@ private:
 
 
 /* Preferences Dialog */
-class PrefsTreeCtrl;
 class PrefsDialog: public wxFrame
 {
 public:
@@ -756,9 +758,6 @@ private:
 };
 
 /* Playlist */
-class ItemInfoDialog;
-class NewGroup;
-class ExportPlaylist;
 class Playlist: public wxFrame
 {
 public:
@@ -838,7 +837,6 @@ private:
     int i_duration_sorted;
 };
 
-
 class NewGroup: public wxDialog
 {
 public:
@@ -948,6 +946,7 @@ private:
     vlc_bool_t b_enqueue;
 };
 #endif
+} // end of wxvlc namespace
 
 /* Menus */
 void PopupMenu( intf_thread_t *_p_intf, wxWindow *p_parent,
@@ -957,6 +956,8 @@ wxMenu *AudioMenu( intf_thread_t *_p_intf, wxWindow *p_parent );
 wxMenu *VideoMenu( intf_thread_t *_p_intf, wxWindow *p_parent );
 wxMenu *NavigMenu( intf_thread_t *_p_intf, wxWindow *p_parent );
 
+namespace wxvlc
+{
 class MenuEvtHandler : public wxEvtHandler
 {
 public:
@@ -999,36 +1000,8 @@ private:
     int  i_item_id;
 };
 
-wxWindow *VideoWindow( intf_thread_t *p_intf, wxWindow *p_parent );
-
-class BookmarksDialog: public wxFrame
-{
-public:
-    /* Constructor */
-    BookmarksDialog( intf_thread_t *p_intf, wxWindow *p_parent );
-    virtual ~BookmarksDialog();
-
-    bool Show( bool );
-
-private:
-
-    void Update();
-
-    /* Event handlers (these functions should _not_ be virtual) */
-    void OnClose( wxCommandEvent& event );
-    void OnAdd( wxCommandEvent& event );
-    void OnDel( wxCommandEvent& event );
-    void OnClear( wxCommandEvent& event );
-    void OnActivateItem( wxListEvent& event );
-    void OnUpdate( wxCommandEvent &event );
-
-    DECLARE_EVENT_TABLE();
-
-    intf_thread_t *p_intf;
-    wxWindow *p_parent;
-
-    wxListView *list_ctrl;
-};
+} // end of wxvlc namespace
+using namespace wxvlc;
 
 static inline int ConvertHotkeyModifiers( int i_hotkey )
 {