summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/control/edit.cxx4
-rw-r--r--vcl/source/window/brdwin.cxx4
-rw-r--r--vcl/source/window/paint.cxx6
-rw-r--r--vcl/source/window/printdlg.cxx5
-rw-r--r--vcl/source/window/window.cxx2
-rw-r--r--vcl/workben/icontest.cxx4
-rw-r--r--vcl/workben/mtfdemo.cxx6
-rw-r--r--vcl/workben/svdem.cxx4
-rw-r--r--vcl/workben/svpclient.cxx4
-rw-r--r--vcl/workben/svptest.cxx4
10 files changed, 22 insertions, 21 deletions
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 85bbbeb46e99..4e07e3b16740 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1072,12 +1072,12 @@ void Edit::ImplPaintBorder( long nXStart, long nXEnd )
vcl::Region oldRgn( pBorder->GetClipRegion() );
pBorder->SetClipRegion( aClipRgn );
- pBorder->Paint( Rectangle() );
+ pBorder->Paint(*pBorder, Rectangle());
pBorder->SetClipRegion( oldRgn );
}
else
- pBorder->Paint( Rectangle() );
+ pBorder->Paint(*pBorder, Rectangle());
}
}
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 464a7e940d47..82aa0bea8d2d 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1309,8 +1309,8 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice*
if ( (aCtrlType == CTRL_SPINBOX) && !pCtrl->IsNativeControlSupported( CTRL_SPINBOX, PART_BUTTON_UP ) )
{
Edit *pEdit = static_cast<Edit*>(pCtrl)->GetSubEdit();
- if ( pEdit )
- pCtrl->Paint( Rectangle() ); // make sure the buttons are also drawn as they might overwrite the border
+ if (pEdit)
+ pCtrl->Paint(*pCtrl, Rectangle()); // make sure the buttons are also drawn as they might overwrite the border
}
}
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index ae8776be1012..e0220189c9f2 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -122,7 +122,7 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
{
m_pWindow->BeginPaint();
m_pWindow->PushPaintHelper(this);
- m_pWindow->Paint(m_aPaintRect);
+ m_pWindow->Paint(*m_pWindow, m_aPaintRect);
m_pWindow->EndPaint();
}
}
@@ -677,7 +677,7 @@ void Window::PrePaint()
{
}
-void Window::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void Window::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect)
{
CallEventListeners(VCLEVENT_WINDOW_PAINT, (void*)&rRect);
}
@@ -1085,7 +1085,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
if( ! IsPaintTransparent() && IsBackground() && ! (GetParentClipMode() & PARENTCLIPMODE_NOCLIP ) )
Erase();
// foreground
- Paint( aPaintRect );
+ Paint(*this, aPaintRect);
// put a pop action to metafile
Pop();
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 83ba36286f70..2391f61ca8c2 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -322,9 +322,10 @@ Size PrintDialog::ShowNupOrderWindow::GetOptimalSize() const
return Size(70, 70);
}
-void PrintDialog::ShowNupOrderWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& i_rRect )
+void PrintDialog::ShowNupOrderWindow::Paint( vcl::RenderContext& rRenderContext, const Rectangle& i_rRect )
{
- Window::Paint( i_rRect );
+ Window::Paint(rRenderContext, i_rRect);
+
SetMapMode( MAP_PIXEL );
SetTextColor( GetSettings().GetStyleSettings().GetFieldTextColor() );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index f991b98b6fe5..eaec6fe38c81 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3418,7 +3418,7 @@ void Window::RecordLayoutData( vcl::ControlLayoutData* pLayout, const Rectangle&
assert(mpOutDevData);
mpOutDevData->mpRecordLayout = pLayout;
mpOutDevData->maRecordRect = rRect;
- Paint( rRect );
+ Paint(*this, rRect);
mpOutDevData->mpRecordLayout = NULL;
}
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index 326f1f586b91..6cbe37113914 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -103,7 +103,7 @@ void MyWorkWindow::LoadGraphic( const OUString& sImageFile )
}
}
-void MyWorkWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
+void MyWorkWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
{
std::cout << "==> Paint! " << mnPaintCount++ << " (vcl) " << GetSizePixel() << " " << getTimeNow() - mnStartTime << std::endl;
@@ -124,7 +124,7 @@ void MyWorkWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangl
mpFixedBitmap->SetBitmap( *mpBitmap );
mpFixedBitmap->SetSizePixel( aSize );
- WorkWindow::Paint( rRect );
+ WorkWindow::Paint(rRenderContext, rRect);
if (mnPaintCount == 100)
Application::Quit();
diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx
index ad88f1e65e5c..22629be87e4c 100644
--- a/vcl/workben/mtfdemo.cxx
+++ b/vcl/workben/mtfdemo.cxx
@@ -55,14 +55,14 @@ public:
}
}
- virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
};
-void DemoMtfWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
+void DemoMtfWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
{
maMtf.Play(this, maMtf.GetActionSize());
- WorkWindow::Paint( rRect );
+ WorkWindow::Paint(rRenderContext, rRect);
}
class DemoMtfApp : public Application
diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx
index d509643b4f3d..365ad38048e4 100644
--- a/vcl/workben/svdem.cxx
+++ b/vcl/workben/svdem.cxx
@@ -118,9 +118,9 @@ void MyWin::KeyUp( const KeyEvent& rKEvt )
WorkWindow::KeyUp( rKEvt );
}
-void MyWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
+void MyWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
{
- WorkWindow::Paint( rRect );
+ WorkWindow::Paint(rRenderContext, rRect);
}
void MyWin::Resize()
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index b82c89bc23b0..50f388f5d2d8 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -301,9 +301,9 @@ void MyWin::KeyUp( const KeyEvent& rKEvt )
WorkWindow::KeyUp( rKEvt );
}
-void MyWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
+void MyWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
{
- WorkWindow::Paint( rRect );
+ WorkWindow::Paint(rRenderContext, rRect);
}
void MyWin::Resize()
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 4ee02591027b..f220f3280ac7 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -220,9 +220,9 @@ static Color approachColor( const Color& rFrom, const Color& rTo )
}
#define DELTA 5.0
-void MyWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
+void MyWin::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect )
{
- WorkWindow::Paint( rRect );
+ WorkWindow::Paint(rRenderContext, rRect);
Push( PushFlags::ALL );
MapMode aMapMode( MAP_100TH_MM );
generated by cgit (git 2.34.1) at 2024-07-15 00:04:40 +0000