Refactor "SpinField" & "SpinButton" - use RenderContext

Change-Id: I589f49179b446ae24037546075070641de5cb927

include/vcl/spin.h

@@ -20,16 +20,14 @@
 #ifndef INCLUDED_VCL_SPIN_H
 #define INCLUDED_VCL_SPIN_H
 
+#include <vcl/window.hxx>
+
 class Rectangle;
-class OutputDevice;
 
-void ImplDrawSpinButton( OutputDevice* pOutDev,
-                         const Rectangle& rUpperRect,
-                         const Rectangle& rLowerRect,
-                         bool bUpperIn, bool bLowerIn,
-                         bool bUpperEnabled = sal_True,
-                         bool bLowerEnabled = sal_True,
-                         bool bHorz = sal_False, bool bMirrorHorz = sal_False );
+void ImplDrawSpinButton(vcl::RenderContext& rRenderContext, vcl::Window* pWindow,
+                        const Rectangle& rUpperRect, const Rectangle& rLowerRect,
+                        bool bUpperIn, bool bLowerIn, bool bUpperEnabled = true, bool bLowerEnabled = true,
+                        bool bHorz = false, bool bMirrorHorz = false);
 
 #endif // INCLUDED_VCL_SPIN_H
 

vcl/source/control/spinbtn.cxx

@@ -157,23 +157,23 @@ void SpinButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
     aUpperRect += aPos;
     aLowerRect += aPos;
 
-    ImplDrawSpinButton( pDev, aUpperRect, aLowerRect, false, false,
-                        IsEnabled() && ImplIsUpperEnabled(),
-                        IsEnabled() && ImplIsLowerEnabled(), mbHorz, true );
+    ImplDrawSpinButton(*pDev, this, aUpperRect, aLowerRect, false, false,
+                       IsEnabled() && ImplIsUpperEnabled(),
+                       IsEnabled() && ImplIsLowerEnabled(), mbHorz, true);
     pDev->Pop();
 }
 
-void SpinButton::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
+void SpinButton::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/)
 {
     HideFocus();
 
     bool bEnable = IsEnabled();
-    ImplDrawSpinButton( this, maUpperRect, maLowerRect, mbUpperIn, mbLowerIn,
-                        bEnable && ImplIsUpperEnabled(),
-                        bEnable && ImplIsLowerEnabled(), mbHorz, true );
+    ImplDrawSpinButton(rRenderContext, this, maUpperRect, maLowerRect, mbUpperIn, mbLowerIn,
+                       bEnable && ImplIsUpperEnabled(),
+                       bEnable && ImplIsLowerEnabled(), mbHorz, true);
 
-    if ( HasFocus() )
-        ShowFocus( maFocusRect );
+    if (HasFocus())
+        ShowFocus(maFocusRect);
 }
 
 void SpinButton::MouseButtonDown( const MouseEvent& rMEvt )

vcl/source/window/toolbox.cxx

@@ -2848,7 +2848,7 @@ void ToolBox::ImplDrawSpin(vcl::RenderContext& rRenderContext, bool bUpperIn, bo
         bTmpLower = false;
     }
 
-    ImplDrawSpinButton(&rRenderContext, maUpperRect, maLowerRect,
+    ImplDrawSpinButton(rRenderContext, this, maUpperRect, maLowerRect,
                        bUpperIn, bLowerIn, bTmpUpper, bTmpLower, !mbHorz);
 }