src/video_output/video_output.c: Fixed double free in filter removal

[vlc] / modules / gui / skins2 / controls / ctrl_move.hpp

diff --git a/modules/gui/skins2/controls/ctrl_move.hpp b/modules/gui/skins2/controls/ctrl_move.hpp
index 7da7fc07ba6d98fc8f52b5d246873212fadd9246..422decb4e2d4ec0f4f93e48da689583bcc22bfa6 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_move.hpp
+++ b/modules/gui/skins2/controls/ctrl_move.hpp
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * ctrl_move.hpp
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
+ * Copyright (C) 2003 the VideoLAN team
  * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
- *          Olivier Teulière <ipkiss@via.ecp.fr>
+ *          Olivier Teulière <ipkiss@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,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 CTRL_MOVE_HPP
@@ -58,9 +58,11 @@ class CtrlMove: public CtrlFlat
         /// Get the position of the decorated control in the layout, if any
         virtual const Position *getPosition() const;
 
-        static void transMovingMoving( SkinObject *pCtrl );
-        static void transStillMoving( SkinObject *pCtrl );
-        static void transMovingStill( SkinObject *pCtrl );
+        /// Method called when the control is resized
+        virtual void onResize();
+
+        /// Get the type of control (custom RTTI)
+        virtual string getType() const { return m_rCtrl.getType(); }
 
     private:
         FSM m_fsm;
@@ -74,10 +76,11 @@ class CtrlMove: public CtrlFlat
         EvtGeneric *m_pEvt;
         /// Position of the click that started the move
         int m_xPos, m_yPos;
-        /// Callbacks
-        Callback m_cmdMovingMoving;
-        Callback m_cmdStillMoving;
-        Callback m_cmdMovingStill;
-};
+
+        /// Callback objects
+        DEFINE_CALLBACK( CtrlMove, MovingMoving )
+        DEFINE_CALLBACK( CtrlMove, StillMoving )
+        DEFINE_CALLBACK( CtrlMove, MovingStill )
+ };
 
 #endif