diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-04-28 15:09:39 +0900 |
---|---|---|
committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-04-29 09:27:54 +0900 |
commit | 6cea2e61cf77bfe5bc53aa6002807c9b38e77499 (patch) | |
tree | 45c3876576c58fb47461ba7730658805ddd1ca25 /vcl/source | |
parent | 704ebef99de606f5a60c495130e6e3d791981042 (diff) |
fix compile: delegate RenderContext parameter to super
Change-Id: I1c08e29c45d8334db52b129a957098481f3e57a4
Diffstat (limited to 'vcl/source')
-rw-r--r-- | vcl/source/control/edit.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/brdwin.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/paint.cxx | 6 | ||||
-rw-r--r-- | vcl/source/window/printdlg.cxx | 5 | ||||
-rw-r--r-- | vcl/source/window/window.cxx | 2 |
5 files changed, 11 insertions, 10 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; } |