* all: fixed member initialization order

diff --git a/modules/gui/skins2/controls/ctrl_slider.cpp b/modules/gui/skins2/controls/ctrl_slider.cpp
index a0fcc411643b386f86a89cb2745998b5a8be4a68..ce543a22349f74067e376cd5b9907d414aa5740e 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_slider.cpp
+++ b/modules/gui/skins2/controls/ctrl_slider.cpp
@@ -53,7 +53,6 @@ CtrlSliderCursor::CtrlSliderCursor( intf_thread_t *pIntf,
     m_cmdOverDown( pIntf, this ), m_cmdDownOver( pIntf, this ),
     m_cmdOverUp( pIntf, this ), m_cmdUpOver( pIntf, this ),
     m_cmdMove( pIntf, this ), m_cmdScroll( pIntf, this ),
-
     m_lastPercentage( 0 ), m_xOffset( 0 ), m_yOffset( 0 ),
     m_pEvt( NULL ), m_rCurve( rCurve )
 {

diff --git a/modules/gui/skins2/controls/ctrl_slider.hpp b/modules/gui/skins2/controls/ctrl_slider.hpp
index 70fbc1d22fd4f5bfd87b36f48fb6991c208cfb68..5b082eef28f7798332c5106a521bf78bda713028 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_slider.hpp
+++ b/modules/gui/skins2/controls/ctrl_slider.hpp
@@ -77,6 +77,13 @@ class CtrlSliderCursor: public CtrlGeneric, public Observer<VarPercent>
         int m_width, m_height;
         /// Position of the cursor
         int m_xPosition, m_yPosition;
+        /// Callback objects
+        DEFINE_CALLBACK( CtrlSliderCursor, OverDown )
+        DEFINE_CALLBACK( CtrlSliderCursor, DownOver )
+        DEFINE_CALLBACK( CtrlSliderCursor, OverUp )
+        DEFINE_CALLBACK( CtrlSliderCursor, UpOver )
+        DEFINE_CALLBACK( CtrlSliderCursor, Move )
+        DEFINE_CALLBACK( CtrlSliderCursor, Scroll )
         /// Last saved position of the cursor (stored as a percentage)
         float m_lastPercentage;
         /// Offset between the mouse pointer and the center of the cursor
@@ -90,14 +97,6 @@ class CtrlSliderCursor: public CtrlGeneric, public Observer<VarPercent>
         /// Bezier curve of the slider
         const Bezier &m_rCurve;
 
-        /// Callback objects
-        DEFINE_CALLBACK( CtrlSliderCursor, OverDown )
-        DEFINE_CALLBACK( CtrlSliderCursor, DownOver )
-        DEFINE_CALLBACK( CtrlSliderCursor, OverUp )
-        DEFINE_CALLBACK( CtrlSliderCursor, UpOver )
-        DEFINE_CALLBACK( CtrlSliderCursor, Move )
-        DEFINE_CALLBACK( CtrlSliderCursor, Scroll )
-
         /// Method called when the position variable is modified
         virtual void onUpdate( Subject<VarPercent> &rVariable );
 

diff --git a/modules/gui/skins2/controls/ctrl_text.hpp b/modules/gui/skins2/controls/ctrl_text.hpp
index e290e33e8c969d389c5015682d3bd8bce47e72da..da6956cf44fdffe5cb7042fe10bb7d6c7ddee30b 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_text.hpp
+++ b/modules/gui/skins2/controls/ctrl_text.hpp
@@ -68,6 +68,11 @@ class CtrlText: public CtrlGeneric, public Observer<VarText>
         FSM m_fsm;
         /// Variable associated to the control
         VarText &m_rVariable;
+        /// Callback objects
+        DEFINE_CALLBACK( CtrlText, ToManual )
+        DEFINE_CALLBACK( CtrlText, ManualMoving )
+        DEFINE_CALLBACK( CtrlText, ManualStill )
+        DEFINE_CALLBACK( CtrlText, Move )
         /// The last received event
         EvtGeneric *m_pEvt;
         /// Font used to render the text
@@ -89,12 +94,6 @@ class CtrlText: public CtrlGeneric, public Observer<VarText>
          /// Timer to move the text
         OSTimer *m_pTimer;
 
-        /// Callback objects
-        DEFINE_CALLBACK( CtrlText, ToManual )
-        DEFINE_CALLBACK( CtrlText, ManualMoving )
-        DEFINE_CALLBACK( CtrlText, ManualStill )
-        DEFINE_CALLBACK( CtrlText, Move )
-
         /// Callback for the timer
         static void updateText( SkinObject *pCtrl );