Merge branch 'master' into lpcm_encoder

[vlc] / modules / gui / skins2 / macosx / macosx_window.hpp

diff --git a/modules/gui/skins2/macosx/macosx_window.hpp b/modules/gui/skins2/macosx/macosx_window.hpp
index ed0ff28aa42969c9cf8ba794b506560e5f5c9ad5..f47746f7197a975db5ee7179d44633ef1d4347e7 100644 (file)
--- a/modules/gui/skins2/macosx/macosx_window.hpp
+++ b/modules/gui/skins2/macosx/macosx_window.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * macosx_window.hpp
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
+ * Copyright (C) 2003 the VideoLAN team
  * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
@@ -16,15 +16,16 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * 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.
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef MACOSX_WINDOW_HPP
 #define MACOSX_WINDOW_HPP
 
 #include "../src/os_window.hpp"
+#include <Carbon/Carbon.h>
 
 class MacOSXDisplay;
 class MacOSXDragDrop;
@@ -33,37 +34,42 @@ class MacOSXDragDrop;
 /// MacOSX implementation of OSWindow
 class MacOSXWindow: public OSWindow
 {
-    public:
-        MacOSXWindow( intf_thread_t *pIntf, GenericWindow &rWindow,
-                      bool dragDrop, bool playOnDrop,
-                      MacOSXWindow *pParentWindow );
+public:
+    MacOSXWindow( intf_thread_t *pIntf, GenericWindow &rWindow,
+                  bool dragDrop, bool playOnDrop,
+                  MacOSXWindow *pParentWindow );
 
-        virtual ~MacOSXWindow();
+    virtual ~MacOSXWindow();
 
-        // Show the window
-        virtual void show( int left, int top ) const;
+    // Show the window
+    virtual void show( int left, int top ) const;
 
-        // Hide the window
-        virtual void hide() const;
+    // Hide the window
+    virtual void hide() const;
 
-        /// Move the window
-        virtual void moveResize( int left, int top,
-                                 int width, int height ) const;
+    /// Move the window
+    virtual void moveResize( int left, int top,
+                             int width, int height ) const;
 
-        /// Bring the window on top
-        virtual void raise() const;
+    /// Bring the window on top
+    virtual void raise() const;
 
-        /// Set the opacity of the window (0 = transparent, 255 = opaque)
-        virtual void setOpacity( uint8_t value ) const;
+    /// Set the opacity of the window (0 = transparent, 255 = opaque)
+    virtual void setOpacity( uint8_t value ) const;
 
-        /// Toggle the window on top
-        virtual void toggleOnTop( bool onTop ) const;
+    /// Toggle the window on top
+    virtual void toggleOnTop( bool onTop ) const;
 
-    private:
-        /// Parent window
-        MacOSXWindow *m_pParent;
-        /// Indicates whether the window handles drag&drop events
-        bool m_dragDrop;
+    /// Get the Carbon window handle
+    WindowRef getWindowRef() const { return m_win; };
+
+private:
+    /// Parent window
+    MacOSXWindow *m_pParent;
+    /// Indicates whether the window handles drag&drop events
+    bool m_dragDrop;
+    /// Carbon Window object
+    WindowRef m_win;
 };