]> git.sesse.net Git - vlc/blobdiff - modules/gui/wxwindows/wxwindows.h
Revert wrongly commited files in previous commit
[vlc] / modules / gui / wxwindows / wxwindows.h
index 59cc5dfe313f0c19ad6118b4a5e33ff3cc581042..fcb5460fe9eeb22e0641044818cd4659e3532520 100644 (file)
@@ -44,7 +44,6 @@
 #include <wx/wizard.h>
 #include <wx/taskbar.h>
 #include "vlc_keys.h"
-#include "vlc_interaction.h"
 
 #if (!wxCHECK_VERSION(2,5,0))
 typedef long wxTreeItemIdValue;
@@ -99,8 +98,6 @@ class AutoBuiltPanel;
 class VideoWindow;
 class WindowSettings;
 
-namespace wxvlc { class Interface;};
-
 /*****************************************************************************
  * intf_sys_t: description and status of wxwindows interface
  *****************************************************************************/
@@ -143,9 +140,6 @@ struct intf_sys_t
     int                 i_first_hotkey_event;
     int                 i_hotkeys;
 
-    /* Main interface */
-    wxvlc::Interface   *p_main_interface;
-
     /* Embedded vout */
     VideoWindow         *p_video_window;
     wxBoxSizer          *p_video_sizer;
@@ -377,9 +371,6 @@ public:
     wxTimer m_controls_timer;
     wxTimer m_slider_timer;
 
-    /* Interaction */
-    int Interact( user_interaction_t *, vlc_bool_t );
-
 private:
     void SetupHotkeys();
     void CreateOurMenuBar();