Compile fix

[vlc] / modules / gui / wxwidgets / interface.hpp

diff --git a/modules/gui/wxwidgets/interface.hpp b/modules/gui/wxwidgets/interface.hpp
index 64e877bde532278822c4fb2630eaaee5439b8f8e..fa558809d6d983441dd596ff4644549c93c25ade 100644 (file)
--- a/modules/gui/wxwidgets/interface.hpp
+++ b/modules/gui/wxwidgets/interface.hpp
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef _WXVLC_INTERFACE_H_
@@ -54,6 +54,8 @@ namespace wxvlc
 #endif
 
     /* Systray integration */
+/* wxCocoa pretends to support this, but at least 2.6.x doesn't */
+#ifndef __APPLE__
 #ifdef wxHAS_TASK_BAR_ICON
    class Systray: public wxTaskBarIcon
    {
@@ -75,6 +77,7 @@ namespace wxvlc
         intf_thread_t *p_intf;
         DECLARE_EVENT_TABLE()
     };
+#endif
 #endif
 
     /* Main Interface */
@@ -104,8 +107,11 @@ namespace wxvlc
 
         wxControl  *volctrl;
 
+    /* wxCocoa pretends to support this, but at least 2.6.x doesn't */
+    #ifndef __APPLE__
     #ifdef wxHAS_TASK_BAR_ICON
         Systray     *p_systray;
+    #endif
     #endif
 
         wxWindow *video_window;
@@ -122,6 +128,8 @@ namespace wxvlc
         /* Event handlers (these functions should _not_ be virtual) */
         void OnExit( wxCommandEvent& event );
         void OnAbout( wxCommandEvent& event );
+        void OnWebLink( wxCommandEvent& event );
+        void OnWebHelp( wxCommandEvent& event );
 
         void OnOpenFileSimple( wxCommandEvent& event );
         void OnOpenDir( wxCommandEvent& event );
@@ -142,6 +150,8 @@ namespace wxvlc
         void OnSlowStream( wxCommandEvent& event );
         void OnFastStream( wxCommandEvent& event );
 
+        void OnInteraction( wxCommandEvent& event );
+
         void OnMenuOpen( wxMenuEvent& event );
 
     #if defined( __WXMSW__ ) || defined( __WXMAC__ )
@@ -156,6 +166,7 @@ namespace wxvlc
         Timer *timer;
         intf_thread_t *p_intf;
 
+        unsigned int i_update_counter;
         int i_old_playing_status;
 
         /* For auto-generated menus */
@@ -169,12 +180,10 @@ namespace wxvlc
         wxPanel     *extra_frame;
 
         /* Playlist panel */
-        vlc_bool_t  b_playlist_manager;
         wxPanel     *playlist_manager;
 
         /* Utility dimensions */
         wxSize main_min_size;
-        wxSize playlist_min_size;
         wxSize ext_min_size;
     };
 
@@ -193,6 +202,7 @@ namespace wxvlc
             ID_FILE_INFO,
             ID_BOOKMARKS,
             ID_VIDEO,
+            ID_SMALL_PLAYLIST,
             ID_MAX,
         };
 
@@ -232,6 +242,9 @@ namespace wxvlc
 };
 
 void PopupMenu( intf_thread_t *, wxWindow *, const wxPoint& );
+void AudioPopupMenu( intf_thread_t *, wxWindow *, const wxPoint& );
+void VideoPopupMenu( intf_thread_t *, wxWindow *, const wxPoint& );
+void MiscPopupMenu( intf_thread_t *, wxWindow *, const wxPoint& );
 wxMenu *SettingsMenu( intf_thread_t *, wxWindow *, wxMenu * = NULL );
 wxMenu *AudioMenu( intf_thread_t *, wxWindow *, wxMenu * = NULL );
 wxMenu *VideoMenu( intf_thread_t *, wxWindow *, wxMenu * = NULL );