Skins2: Cosmetic.

diff --git a/modules/gui/skins2/controls/ctrl_image.cpp b/modules/gui/skins2/controls/ctrl_image.cpp
index 18bc2af637be78b91785ca884d8927d291dd5376..854fab67bf55008404b5c2dfc85ed9e5f694f419 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_image.cpp
+++ b/modules/gui/skins2/controls/ctrl_image.cpp
@@ -47,7 +47,7 @@ CtrlImage::CtrlImage( intf_thread_t *pIntf, const GenericBitmap &rBitmap,
 
 CtrlImage::~CtrlImage()
 {
-    SKINS_DELETE( m_pImage );
+    delete m_pImage;
 }
 
 
@@ -108,7 +108,7 @@ void CtrlImage::draw( OSGraphics &rImage, int xDest, int yDest )
                     OSFactory *pOsFactory = OSFactory::instance( getIntf() );
                     // Rescale the image with the actual size of the control
                     ScaledBitmap bmp( getIntf(), m_rBitmap, width, height );
-                    SKINS_DELETE( m_pImage );
+                    delete m_pImage;
                     m_pImage = pOsFactory->createOSGraphics( width, height );
                     m_pImage->drawBitmap( bmp, 0, 0 );
                 }

diff --git a/modules/gui/skins2/controls/ctrl_radialslider.cpp b/modules/gui/skins2/controls/ctrl_radialslider.cpp
index b12a51da99ce3debc69ec3427d86f588d6217573..de0eeec823958de9d4d0921c260075c256c670a1 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_radialslider.cpp
+++ b/modules/gui/skins2/controls/ctrl_radialslider.cpp
@@ -72,7 +72,7 @@ CtrlRadialSlider::CtrlRadialSlider( intf_thread_t *pIntf,
 CtrlRadialSlider::~CtrlRadialSlider()
 {
     m_rVariable.delObserver( this );
-    SKINS_DELETE( m_pImgSeq );
+    delete m_pImgSeq;
 }
 
 

diff --git a/modules/gui/skins2/controls/ctrl_slider.cpp b/modules/gui/skins2/controls/ctrl_slider.cpp
index b7c982926e454b61db8b8c819fa185da7bbe3946..6b1883b91ce61998c6c7c43c60b4f216c960dc94 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_slider.cpp
+++ b/modules/gui/skins2/controls/ctrl_slider.cpp
@@ -99,9 +99,9 @@ CtrlSliderCursor::CtrlSliderCursor( intf_thread_t *pIntf,
 CtrlSliderCursor::~CtrlSliderCursor()
 {
     m_rVariable.delObserver( this );
-    SKINS_DELETE( m_pImgUp );
-    SKINS_DELETE( m_pImgDown );
-    SKINS_DELETE( m_pImgOver );
+    delete m_pImgUp;
+    delete m_pImgDown;
+    delete m_pImgOver;
 }
 
 

diff --git a/modules/gui/skins2/src/skin_common.hpp b/modules/gui/skins2/src/skin_common.hpp
index 9c92e441635c5c25ede19d92f9802158fa1f3992..a8030b081bf9941c4de5eb30ee9dff2e4c7557bb 100644 (file)
--- a/modules/gui/skins2/src/skin_common.hpp
+++ b/modules/gui/skins2/src/skin_common.hpp
@@ -59,18 +59,6 @@ class ThemeRepository;
 #pragma warning ( disable:4786 )
 #endif
 
-// Useful macros
-#define SKINS_DELETE( p ) \
-   if( p ) \
-   { \
-       delete p; \
-   } \
-   else \
-   { \
-       msg_Err( getIntf(), "delete NULL pointer in %s at line %d", \
-                __FILE__, __LINE__ ); \
-   }
-
 
 /// Wrapper around FromLocale, to avoid the need to call LocaleFree()
 static inline string sFromLocale( const string &rLocale )

diff --git a/modules/gui/skins2/src/tooltip.cpp b/modules/gui/skins2/src/tooltip.cpp
index a0798b82f8b91bd1d0cea05d0a76b15ad973e4d5..644ef7950d14590bff8bdbbbfad0249e37149810 100644 (file)
--- a/modules/gui/skins2/src/tooltip.cpp
+++ b/modules/gui/skins2/src/tooltip.cpp
@@ -49,8 +49,8 @@ Tooltip::Tooltip( intf_thread_t *pIntf, const GenericFont &rFont, int delay ):
 Tooltip::~Tooltip()
 {
     VarManager::instance( getIntf() )->getTooltipText().delObserver( this );
-    SKINS_DELETE( m_pTimer );
-    SKINS_DELETE( m_pOsTooltip );
+    delete m_pTimer;
+    delete m_pOsTooltip;
     delete m_pImage;
 }
 

diff --git a/modules/gui/skins2/win32/win32_window.cpp b/modules/gui/skins2/win32/win32_window.cpp
index f0fff071d64f5c11ac6ed42dbfded88607522307..7102f96b1bbc31af2fbf5f23254caa1a90591ed2 100644 (file)
--- a/modules/gui/skins2/win32/win32_window.cpp
+++ b/modules/gui/skins2/win32/win32_window.cpp
@@ -193,18 +193,8 @@ void Win32Window::setOpacity( uint8_t value ) const
 
 void Win32Window::toggleOnTop( bool onTop ) const
 {
-    if( onTop )
-    {
-        // Set the window on top
-        SetWindowPos( m_hWnd, HWND_TOPMOST, 0, 0, 0, 0,
-                      SWP_NOSIZE | SWP_NOMOVE );
-    }
-    else
-    {
-        // Set the window not on top
-        SetWindowPos( m_hWnd, HWND_NOTOPMOST, 0, 0, 0, 0,
-                      SWP_NOSIZE | SWP_NOMOVE );
-    }
+    SetWindowPos( m_hWnd, onTop ? HWND_TOPMOST : HWND_NOTOPMOST,
+                  0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE );
 }