Revert wrongly commited files in previous commit

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

diff --git a/modules/gui/wxwindows/wxwindows.h b/modules/gui/wxwindows/wxwindows.h
index 50a66cb4b6ca365042398be4a115b36e1f22381a..fcb5460fe9eeb22e0641044818cd4659e3532520 100644 (file)
--- a/modules/gui/wxwindows/wxwindows.h
+++ b/modules/gui/wxwindows/wxwindows.h
@@ -154,6 +154,7 @@ struct intf_sys_t
  *****************************************************************************/
 wxArrayString SeparateEntries( wxString );
 wxWindow *CreateVideoWindow( intf_thread_t *p_intf, wxWindow *p_parent );
+void UpdateVideoWindow( intf_thread_t *p_intf, wxWindow *p_window );
 wxWindow *BookmarksDialog( intf_thread_t *p_intf, wxWindow *p_parent );
 wxWindow *CreateDialogsProvider( intf_thread_t *p_intf, wxWindow *p_parent );
 
@@ -232,7 +233,10 @@ private:
 
     wxCheckBox *eq_2p_chkbox;
 
+    wxButton *eq_restoredefaults_button;
+
     wxSlider *smooth_slider;
+    wxStaticText *smooth_text;
 
     wxSlider *preamp_slider;
     wxStaticText * preamp_text;
@@ -420,7 +424,8 @@ private:
     Timer *timer;
     intf_thread_t *p_intf;
 
-private:
+    wxWindow *video_window;
+
     int i_old_playing_status;
 
     /* For auto-generated menus */
@@ -858,9 +863,12 @@ public:
 
 private:
     void RemoveItem( int );
+    void DeleteTreeItem( wxTreeItemId );
     void DeleteItem( int item );
     void DeleteNode( playlist_item_t *node );
 
+    void RecursiveDeleteSelection( wxTreeItemId );
+
     /* Event handlers (these functions should _not_ be virtual) */
 
     /* Menu Handlers */
@@ -870,18 +878,14 @@ private:
     void OnMenuClose( wxCommandEvent& event );
     void OnClose( wxCloseEvent& WXUNUSED(event) );
 
-    void OnEnableSelection( wxCommandEvent& event );
-    void OnDisableSelection( wxCommandEvent& event );
-    void OnInvertSelection( wxCommandEvent& event );
     void OnDeleteSelection( wxCommandEvent& event );
-    void OnSelectAll( wxCommandEvent& event );
 
     void OnOpen( wxCommandEvent& event );
     void OnSave( wxCommandEvent& event );
 
     /* Search (user) */
     void OnSearch( wxCommandEvent& event );
-    void OnSearchTextChange( wxCommandEvent& event );
+    /*void OnSearchTextChange( wxCommandEvent& event );*/
     wxTextCtrl *search_text;
     wxButton *search_button;
     wxTreeItemId search_current;