Make Zorglub less unhappy

[vlc] / modules / gui / skins2 / x11 / x11_factory.hpp

diff --git a/modules/gui/skins2/x11/x11_factory.hpp b/modules/gui/skins2/x11/x11_factory.hpp
index 61e801d609891d9081e8fa44051a656b40218d99..1d944d67bec23a045b46d1c004fd29280120bfd0 100644 (file)
--- a/modules/gui/skins2/x11/x11_factory.hpp
+++ b/modules/gui/skins2/x11/x11_factory.hpp
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * x11_factory.hpp
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
- * $Id: x11_factory.hpp,v 1.1 2004/01/03 23:31:34 asmax Exp $
+ * Copyright (C) 2003 the VideoLAN team
+ * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
  *          Olivier Teulière <ipkiss@via.ecp.fr>
@@ -31,6 +31,7 @@
 #include <map>
 
 class X11Display;
+class X11DragDrop;
 class X11TimerLoop;
 
 
@@ -38,6 +39,11 @@ class X11TimerLoop;
 class X11Factory: public OSFactory
 {
     public:
+        /// Map to find the GenericWindow associated to a X11Window
+        map<Window, GenericWindow*> m_windowMap;
+        /// Map to find the Dnd object associated to a X11Window
+        map<Window, X11DragDrop*> m_dndMap;
+
         X11Factory( intf_thread_t *pIntf );
         virtual ~X11Factory();
 
@@ -56,15 +62,23 @@ class X11Factory: public OSFactory
         /// Instantiate an OSTimer with the given callback
         virtual OSTimer *createOSTimer( const Callback &rCallback );
 
+        ///
+        virtual void minimize();
+
         /// Instantiate an OSWindow object
         virtual OSWindow *createOSWindow( GenericWindow &rWindow,
-                                          bool dragDrop, bool playOnDrop );
+                                          bool dragDrop, bool playOnDrop,
+                                          OSWindow *pParent );
 
         /// Instantiate an object OSTooltip.
         virtual OSTooltip *createOSTooltip();
 
         /// Get the directory separator
-        virtual const string getDirSeparator() const;
+        virtual const string &getDirSeparator() const { return m_dirSep; }
+
+        /// Get the resource path
+        virtual const list<string> &getResourcePath() const
+            { return m_resourcePath; }
 
         /// Get the screen size
         virtual int getScreenWidth() const;
@@ -76,20 +90,24 @@ class X11Factory: public OSFactory
         /// Get the position of the mouse
         virtual void getMousePos( int &rXPos, int &rYPos ) const;
 
+        /// Change the cursor
+        virtual void changeCursor( CursorType_t type ) const { /*TODO*/ }
+
         /// Delete a directory recursively
         virtual void rmDir( const string &rPath );
 
         /// Get the timer loop
         X11TimerLoop *getTimerLoop() const { return m_pTimerLoop; }
 
-        /// Map to find the GenericWindow associated with a X11Window
-        map<Window, GenericWindow*> m_windowMap;
-
     private:
         /// X11 display
         X11Display *m_pDisplay;
         /// Timer loop
         X11TimerLoop *m_pTimerLoop;
+        /// Directory separator
+        const string m_dirSep;
+        /// Resource path
+        list<string> m_resourcePath;
 };
 
 #endif