mass rewrite Paint(Rect&) to Paint(RenderContext&, Rect&)

Change-Id: Ia1667246064d11827dbd149def15e5bf08b119b8

41 files changed, 60 insertions, 60 deletions

diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index 77a690c75dc0..a82aa82ad92c 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -127,7 +127,7 @@ public:
     virtual void            MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
     virtual void            MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
     virtual void            Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE;
-    virtual void            Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+    virtual void            Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
     virtual void            Activate() SAL_OVERRIDE;
     virtual void            Deactivate() SAL_OVERRIDE;
     virtual void            Resize() SAL_OVERRIDE;
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index c092d292d4ea..bcdb80ba152a 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -43,7 +43,7 @@ private:
 
 protected:
                         DECL_LINK( TimerHdl, Timer* );
-    virtual void        Paint( const Rectangle& ) SAL_OVERRIDE;
+    virtual void        Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) SAL_OVERRIDE;
     virtual void        RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
     virtual OUString    GetText() const SAL_OVERRIDE;
     void                ImplShow();
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index dfab1ad7185b..37a4a4327fee 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -244,7 +244,7 @@ protected:
     virtual void    MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
     virtual void    MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
     virtual void    Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE;
-    virtual void    Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+    virtual void    Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
     virtual void    Resize() SAL_OVERRIDE;
     virtual void    GetFocus() SAL_OVERRIDE;
     virtual void    LoseFocus() SAL_OVERRIDE;
@@ -570,7 +570,7 @@ public:
                     ImplWin( vcl::Window* pParent, WinBits nWinStyle = 0 );
 
     virtual void    MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual void    Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+    virtual void    Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
     virtual void    Resize() SAL_OVERRIDE;
     virtual void    GetFocus() SAL_OVERRIDE;
     virtual void    LoseFocus() SAL_OVERRIDE;
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index a071c9d5cbac..770d1777f26a 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -66,7 +66,7 @@ namespace vcl
             virtual ~PrintPreviewWindow();
             virtual void dispose() SAL_OVERRIDE;
 
-            virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+            virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
             virtual void Command( const CommandEvent& ) SAL_OVERRIDE;
             virtual void Resize() SAL_OVERRIDE;
             virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE;
@@ -90,7 +90,7 @@ namespace vcl
 
             virtual Size GetOptimalSize() const SAL_OVERRIDE;
 
-            virtual void Paint( const Rectangle& ) SAL_OVERRIDE;
+            virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE;
 
             void setValues( int i_nOrderMode, int i_nColumns, int i_nRows )
             {
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 2f52375d1e02..68bb91ed5c7b 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -352,7 +352,7 @@ void HelpTextWindow::ImplShow()
     Update();
 }
 
-void HelpTextWindow::Paint( const Rectangle& )
+void HelpTextWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     // paint native background
     bool bNativeOK = false;
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index bf23b10fb9d4..bbe85b894735 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1326,7 +1326,7 @@ void PushButton::FillLayoutData() const
     const_cast<PushButton*>(this)->ImplDrawPushButton( true );
 }
 
-void PushButton::Paint( const Rectangle& )
+void PushButton::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     ImplDrawPushButton();
 }
@@ -2412,7 +2412,7 @@ void RadioButton::FillLayoutData() const
     const_cast<RadioButton*>(this)->ImplDrawRadioButton( true );
 }
 
-void RadioButton::Paint( const Rectangle& )
+void RadioButton::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     ImplDrawRadioButton();
 }
@@ -3294,7 +3294,7 @@ void CheckBox::FillLayoutData() const
     const_cast<CheckBox*>(this)->ImplDrawCheckBox( true );
 }
 
-void CheckBox::Paint( const Rectangle& )
+void CheckBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     ImplDrawCheckBox();
 }
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 6efac8a766b7..85bbbeb46e99 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1761,7 +1761,7 @@ void Edit::FillLayoutData() const
     const_cast<Edit*>(this)->ImplRepaint(true);
 }
 
-void Edit::Paint( const Rectangle& )
+void Edit::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     if ( !mpSubEdit )
         ImplRepaint();
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 69922de6df07..e4858f163c3d 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -234,7 +234,7 @@ void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
     );
 }
 
-void FixedText::Paint( const Rectangle& )
+void FixedText::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     ImplDraw( this, 0, Point(), GetOutputSizePixel() );
 }
@@ -641,7 +641,7 @@ void  FixedLine::FillLayoutData() const
     const_cast<FixedLine*>(this)->ImplDraw( true );
 }
 
-void FixedLine::Paint( const Rectangle& )
+void FixedLine::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     ImplDraw();
 }
@@ -773,7 +773,7 @@ void FixedBitmap::ImplDraw( OutputDevice* pDev, sal_uLong /* nDrawFlags */,
     }
 }
 
-void FixedBitmap::Paint( const Rectangle& )
+void FixedBitmap::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     ImplDraw( this, 0, Point(), GetOutputSizePixel() );
 }
@@ -943,7 +943,7 @@ void FixedImage::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
     }
 }
 
-void FixedImage::Paint( const Rectangle& )
+void FixedImage::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     ImplDraw( this, 0, Point(), GetOutputSizePixel() );
 }
diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx
index 209bd14d9a9b..77cd1a6f994e 100644
--- a/vcl/source/control/group.cxx
+++ b/vcl/source/control/group.cxx
@@ -188,7 +188,7 @@ void GroupBox::FillLayoutData() const
     const_cast<GroupBox*>(this)->   ImplDraw( const_cast<GroupBox*>(this), 0, Point(), GetOutputSizePixel(), true );
 }
 
-void GroupBox::Paint( const Rectangle& )
+void GroupBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     ImplDraw( this, 0, Point(), GetOutputSizePixel() );
 }
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 083faf072e96..01a18d211d53 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -1914,7 +1914,7 @@ void ImplListBoxWindow::ImplDoPaint( const Rectangle& rRect, bool bLayout )
         ImplShowFocusRect();
 }
 
-void ImplListBoxWindow::Paint( const Rectangle& rRect )
+void ImplListBoxWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
 {
     ImplDoPaint( rRect );
 }
@@ -2766,7 +2766,7 @@ void ImplWin::ImplDraw( bool bLayout )
     }
 }
 
-void ImplWin::Paint( const Rectangle& )
+void ImplWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     ImplDraw();
 }
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index efd64c825d68..288cb04b835e 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.cxx
@@ -131,7 +131,7 @@ void ImageControl::ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Poi
     }   // switch ( mnScaleMode )
 }
 
-void ImageControl::Paint( const Rectangle& /*rRect*/ )
+void ImageControl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ )
 {
     ImplDraw( *this, 0, Point(), GetOutputSizePixel() );
 
diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx
index a89afac723bb..8bdf2fe9d850 100644
--- a/vcl/source/control/prgsbar.cxx
+++ b/vcl/source/control/prgsbar.cxx
@@ -145,7 +145,7 @@ void ProgressBar::ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc )
                     Rectangle( Point(), GetSizePixel() ) );
 }
 
-void ProgressBar::Paint( const Rectangle& )
+void ProgressBar::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     ImplDrawProgress( 0, mnPercent );
 }
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index b239c623e3ff..4050560c7605 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -1120,7 +1120,7 @@ void ScrollBar::KeyInput( const KeyEvent& rKEvt )
         Control::KeyInput( rKEvt );
 }
 
-void ScrollBar::Paint( const Rectangle& )
+void ScrollBar::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     ImplDraw( SCRBAR_DRAW_ALL, this );
 }
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index 773f31087ebc..e85ce8099702 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -808,7 +808,7 @@ void Slider::KeyInput( const KeyEvent& rKEvt )
         Control::KeyInput( rKEvt );
 }
 
-void Slider::Paint( const Rectangle& )
+void Slider::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     ImplDraw( SLIDER_DRAW_ALL );
 }
diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index c9feafa07663..4a7da9bead2a 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.cxx
@@ -165,7 +165,7 @@ void SpinButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
     pDev->Pop();
 }
 
-void SpinButton::Paint( const Rectangle& )
+void SpinButton::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     HideFocus();
 
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index fe1feea8ef05..66cabf6d1ca6 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -604,7 +604,7 @@ void SpinField::FillLayoutData() const
         Edit::FillLayoutData();
 }
 
-void SpinField::Paint( const Rectangle& rRect )
+void SpinField::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
 {
     if ( mbSpin )
     {
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index a0553a3c120e..72c1357ef267 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1048,7 +1048,7 @@ void TabControl::KeyInput( const KeyEvent& rKEvt )
     Control::KeyInput( rKEvt );
 }
 
-void TabControl::Paint( const Rectangle& rRect )
+void TabControl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
 {
     if (  !( GetStyle() & WB_NOBORDER ) )
         ImplPaint( rRect, false );
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index cc3a5898cab7..a6313801be94 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -60,7 +60,7 @@ public:
 
     virtual void    Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
 
-    virtual void    Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+    virtual void    Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE;
     virtual void    Resize() SAL_OVERRIDE;
 
     virtual void    GetFocus() SAL_OVERRIDE;
@@ -805,7 +805,7 @@ void TextWindow::KeyInput( const KeyEvent& rKEvent )
         Window::KeyInput( rKEvent );
 }
 
-void TextWindow::Paint( const Rectangle& rRect )
+void TextWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
 {
     mpExtTextView->Paint( rRect );
 }
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 88ef65a07391..464a7e940d47 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1877,7 +1877,7 @@ void ImplBorderWindow::Tracking( const TrackingEvent& rTEvt )
     mpBorderView->Tracking( rTEvt );
 }
 
-void ImplBorderWindow::Paint( const Rectangle& )
+void ImplBorderWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     mpBorderView->DrawWindow( BORDERWINDOW_DRAW_ALL );
 }
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index 43ce7bdb3c4d..e94d6073931a 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -159,7 +159,7 @@ WindowAlign DockingAreaWindow::GetAlign() const
     return mpImplData->meAlign;
 }
 
-void DockingAreaWindow::Paint( const Rectangle& )
+void DockingAreaWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     EnableNativeWidget( true ); // only required because the toolkit currently switches this flag off
     if( IsNativeControlSupported( CTRL_TOOLBAR, PART_ENTIRE_CONTROL ) )
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 160e21074029..7d0f826c4406 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -487,7 +487,7 @@ public:
     virtual void dispose() SAL_OVERRIDE;
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
-    virtual void        Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+    virtual void        Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE;
     virtual void        MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
     virtual void        MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
     virtual void        MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -713,7 +713,7 @@ void ImplPopupFloatWin::DrawGrip()
         SetFillColor();
 }
 
-void ImplPopupFloatWin::Paint( const Rectangle& )
+void ImplPopupFloatWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     Point aPt;
     Rectangle aRect( aPt, GetOutputSizePixel() );
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index 47f61ad6829d..ef83cacb83da 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -871,7 +871,7 @@ bool MenuBarWindow::HandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu )
     return bDone;
 }
 
-void MenuBarWindow::Paint( const Rectangle& )
+void MenuBarWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     if( ! pMenu )
         return;
diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx
index bb3c8be22073..348d167e6469 100644
--- a/vcl/source/window/menubarwindow.hxx
+++ b/vcl/source/window/menubarwindow.hxx
@@ -119,7 +119,7 @@ public:
     virtual void    MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
     virtual void    MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
     virtual void    KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE;
-    virtual void    Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+    virtual void    Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE;
     virtual void    Resize() SAL_OVERRIDE;
     virtual void    RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
 
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 227cc8bb5932..a48152eeffc7 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -1086,7 +1086,7 @@ void MenuFloatingWindow::KeyInput( const KeyEvent& rKEvent )
     }
 }
 
-void MenuFloatingWindow::Paint( const Rectangle& )
+void MenuFloatingWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     if( ! pMenu )
         return;
diff --git a/vcl/source/window/menufloatingwindow.hxx b/vcl/source/window/menufloatingwindow.hxx
index 3157be8d493f..021247af51a5 100644
--- a/vcl/source/window/menufloatingwindow.hxx
+++ b/vcl/source/window/menufloatingwindow.hxx
@@ -90,7 +90,7 @@ public:
     virtual void    MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
     virtual void    KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE;
     virtual void    Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
-    virtual void    Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+    virtual void    Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE;
     virtual void    RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
     virtual void    Resize() SAL_OVERRIDE;
 
diff --git a/vcl/source/window/openglwin.cxx b/vcl/source/window/openglwin.cxx
index 21af6cc53598..6111cbca0a1a 100644
--- a/vcl/source/window/openglwin.cxx
+++ b/vcl/source/window/openglwin.cxx
@@ -58,7 +58,7 @@ OpenGLContext& OpenGLWindow::getContext()
     return mxImpl->getContext();
 }
 
-void OpenGLWindow::Paint(const Rectangle&)
+void OpenGLWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&)
 {
     if(mpRenderer)
         mpRenderer->update();
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index f24755d92904..83ba36286f70 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -161,7 +161,7 @@ void PrintDialog::PrintPreviewWindow::Resize()
 
 }
 
-void PrintDialog::PrintPreviewWindow::Paint( const Rectangle& )
+void PrintDialog::PrintPreviewWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     long nTextHeight = maHorzDim->GetTextHeight();
     Size aSize( GetSizePixel() );
@@ -322,7 +322,7 @@ Size PrintDialog::ShowNupOrderWindow::GetOptimalSize() const
     return Size(70, 70);
 }
 
-void PrintDialog::ShowNupOrderWindow::Paint( const Rectangle& i_rRect )
+void PrintDialog::ShowNupOrderWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& i_rRect )
 {
     Window::Paint( i_rRect );
     SetMapMode( MAP_PIXEL );
diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index a40ef10dc592..009dc14422bc 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.cxx
@@ -286,7 +286,7 @@ PointerStyle ImplWheelWindow::ImplGetMousePointer( long nDistX, long nDistY )
     return eStyle;
 }
 
-void ImplWheelWindow::Paint( const Rectangle& )
+void ImplWheelWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     ImplDrawWheel();
 }
diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx
index 6ec18c4e2b73..82ba04f29e51 100644
--- a/vcl/source/window/scrwnd.hxx
+++ b/vcl/source/window/scrwnd.hxx
@@ -63,7 +63,7 @@ private:
 
 protected:
 
-    virtual void        Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+    virtual void        Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
     virtual void        MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
     virtual void        MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
 
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 70482c02a039..026b40fbbbb2 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -697,7 +697,7 @@ void Splitter::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-void Splitter::Paint( const Rectangle& rPaintRect )
+void Splitter::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rPaintRect )
 {
     DrawRect( rPaintRect );
 
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 293479151943..6be4c7ea10fd 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -2514,7 +2514,7 @@ bool SplitWindow::PreNotify( NotifyEvent& rNEvt )
     return Window::PreNotify( rNEvt );
 }
 
-void SplitWindow::Paint( const Rectangle& )
+void SplitWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     if ( mnWinStyle & WB_BORDER )
         ImplDrawBorder( this );
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 7f43c18e2b1a..37397f912471 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -700,7 +700,7 @@ void StatusBar::MouseButtonDown( const MouseEvent& rMEvt )
     }
 }
 
-void StatusBar::Paint( const Rectangle& )
+void StatusBar::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     if ( mbFormat )
         ImplFormat();
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 964f96043d78..308ca926afe7 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -126,7 +126,7 @@ void TabPage::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-void TabPage::Paint( const Rectangle& )
+void TabPage::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
     // draw native tabpage only inside tabcontrols, standalone tabpages look ugly (due to bad dialog design)
     if( IsNativeControlSupported(CTRL_TAB_BODY, PART_ENTIRE_CONTROL) && GetParent() && (GetParent()->GetType() == WINDOW_TABCONTROL) )
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 2369a7d25da5..bffd15ae8f2f 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4014,7 +4014,7 @@ void ToolBox::Tracking( const TrackingEvent& rTEvt )
     DockingWindow::Tracking( rTEvt );
 }
 
-void ToolBox::Paint( const Rectangle& rPaintRect )
+void ToolBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rPaintRect )
 {
     if( mpData->mbIsPaintLocked )
         return;
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index cef8ac6755c8..326f1f586b91 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -78,7 +78,7 @@ public:
     virtual void dispose() SAL_OVERRIDE { mpFixedBitmap.clear(); WorkWindow::dispose(); }
     void LoadGraphic( const OUString& sImageFile );
 
-    virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+    virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE;
     virtual void Resize() SAL_OVERRIDE;
 };
 
@@ -103,7 +103,7 @@ void MyWorkWindow::LoadGraphic( const OUString& sImageFile )
     }
 }
 
-void MyWorkWindow::Paint( const Rectangle& rRect )
+void MyWorkWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
 {
     std::cout << "==> Paint! " << mnPaintCount++ << " (vcl) " << GetSizePixel() << " " << getTimeNow() - mnStartTime << std::endl;
 
diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx
index 05ab64430972..ad88f1e65e5c 100644
--- a/vcl/workben/mtfdemo.cxx
+++ b/vcl/workben/mtfdemo.cxx
@@ -55,10 +55,10 @@ public:
         }
     }
 
-    virtual void Paint( const Rectangle& rRect )  SAL_OVERRIDE;
+    virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )  SAL_OVERRIDE;
 };
 
-void DemoMtfWin::Paint( const Rectangle& rRect )
+void DemoMtfWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
 {
     maMtf.Play(this, maMtf.GetActionSize());
 
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index da14e1aac673..e647baa7c7b6 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -72,7 +72,7 @@ class TestWindow : public Dialog
             Show();
         }
 
-        virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+        virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
 };
 
 typedef boost::function1<void, OutputDevice*>   functor_type;
@@ -879,7 +879,7 @@ void outDevGrind( OutputDevice& rTarget, sal_Int32 nTurns=100 )
     }
 }
 
-void TestWindow::Paint( const Rectangle& )
+void TestWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&)
 {
     outDevGrind( *this );
     fflush( stdout );
diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx
index e349934a5af1..d509643b4f3d 100644
--- a/vcl/workben/svdem.cxx
+++ b/vcl/workben/svdem.cxx
@@ -75,7 +75,7 @@ public:
     void        MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
     void        KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
     void        KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE;
-    void        Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+    void        Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE;
     void        Resize() SAL_OVERRIDE;
 };
 
@@ -118,7 +118,7 @@ void MyWin::KeyUp( const KeyEvent& rKEvt )
     WorkWindow::KeyUp( rKEvt );
 }
 
-void MyWin::Paint( const Rectangle& rRect )
+void MyWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
 {
     WorkWindow::Paint( rRect );
 }
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 01ad3e9d5f08..b82c89bc23b0 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -104,7 +104,7 @@ public:
     virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
     virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
     virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE;
-    virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+    virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE;
     virtual void Resize() SAL_OVERRIDE;
 
     virtual bool Close() SAL_OVERRIDE;
@@ -301,7 +301,7 @@ void MyWin::KeyUp( const KeyEvent& rKEvt )
     WorkWindow::KeyUp( rKEvt );
 }
 
-void MyWin::Paint( const Rectangle& rRect )
+void MyWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
 {
     WorkWindow::Paint( rRect );
 }
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index ac2c5527a8e0..4ee02591027b 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -85,7 +85,7 @@ public:
     virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
     virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
     virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE;
-    virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+    virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE;
     virtual void Resize() SAL_OVERRIDE;
 };
 
@@ -220,7 +220,7 @@ static Color approachColor( const Color& rFrom, const Color& rTo )
 }
 
 #define DELTA 5.0
-void MyWin::Paint( const Rectangle& rRect )
+void MyWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
 {
     WorkWindow::Paint( rRect );
 
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 4f42f9353445..e85da2eae2b5 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1417,7 +1417,7 @@ public:
         mrRenderer.SetSizePixel(GetSizePixel());
         mrRenderer.KeyInput(rKEvt);
     }
-    virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE
+    virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE
     {
         mrRenderer.SetSizePixel(GetSizePixel());
         fprintf(stderr, "DemoWin::Paint(%ld,%ld,%ld,%ld)\n", rRect.getX(), rRect.getY(), rRect.getWidth(), rRect.getHeight());
@@ -1489,7 +1489,7 @@ public:
         mpButton.disposeAndClear();
         WorkWindow::dispose();
     }
-    virtual void Paint(const Rectangle&) SAL_OVERRIDE
+    virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&) SAL_OVERRIDE
     {
         Rectangle aWholeSize(Point(0, 0),GetOutputSizePixel());
         vcl::Region aClip(aWholeSize);
@@ -1530,7 +1530,7 @@ class DemoPopup : public FloatingWindow
         Update();
     }
 
-    virtual void Paint( const Rectangle& ) SAL_OVERRIDE
+    virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&) SAL_OVERRIDE
     {
         // Interestingly in GL mode on Windows, this doesn't render.