summaryrefslogtreecommitdiff
path: root/vcl/source/gdi
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-23 11:20:40 +0200
committerNoel Grandin <noel@peralex.com>2014-09-23 14:11:39 +0300
commit827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch)
tree3a84ccc45d54607c61328b18f58f914c1d6ec240 /vcl/source/gdi
parent7cbbefae224ab85343accb42b03f9431ec693a83 (diff)
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11 Window typedef. Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'vcl/source/gdi')
-rw-r--r--vcl/source/gdi/gdimtf.cxx4
-rw-r--r--vcl/source/gdi/impanmvw.cxx6
-rw-r--r--vcl/source/gdi/print.cxx4
-rw-r--r--vcl/source/gdi/print3.cxx2
4 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 3b0d9d007fcb..c8b842d93b6a 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -374,7 +374,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos )
// flush output from time to time
if( i++ > nSyncCount )
- ( (Window*) pOut )->Flush(), i = 0;
+ ( (vcl::Window*) pOut )->Flush(), i = 0;
}
pAction = NextAction();
@@ -391,7 +391,7 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S
Size rDestSize( pOut->LogicToPixel( rLogicDestSize ) );
- const Window* win = dynamic_cast <Window*> ( pOut );
+ const vcl::Window* win = dynamic_cast <vcl::Window*> ( pOut );
if (!win)
win = Application::GetActiveTopWindow();
diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx
index bf870819c408..096e67fa48ae 100644
--- a/vcl/source/gdi/impanmvw.cxx
+++ b/vcl/source/gdi/impanmvw.cxx
@@ -78,7 +78,7 @@ ImplAnimView::ImplAnimView( Animation* pParent, OutputDevice* pOut,
MapMode aTempMap( mpOut->GetMapMode() );
aTempMap.SetOrigin( Point() );
mpBackground->SetMapMode( aTempMap );
- ( (Window*) mpOut )->SaveBackground( maDispPt, maDispSz, Point(), *mpBackground );
+ ( (vcl::Window*) mpOut )->SaveBackground( maDispPt, maDispSz, Point(), *mpBackground );
mpBackground->SetMapMode( MapMode() );
}
else
@@ -282,7 +282,7 @@ void ImplAnimView::ImplDraw( sal_uLong nPos, VirtualDevice* pVDev )
delete pDev;
if( mpOut->GetOutDevType() == OUTDEV_WINDOW )
- ( (Window*) mpOut )->Sync();
+ ( (vcl::Window*) mpOut )->Sync();
}
}
}
@@ -296,7 +296,7 @@ void ImplAnimView::ImplRepaint()
MapMode aTempMap( mpOut->GetMapMode() );
aTempMap.SetOrigin( Point() );
mpBackground->SetMapMode( aTempMap );
- ( (Window*) mpOut )->SaveBackground( maDispPt, maDispSz, Point(), *mpBackground );
+ ( (vcl::Window*) mpOut )->SaveBackground( maDispPt, maDispSz, Point(), *mpBackground );
mpBackground->SetMapMode( MapMode() );
}
else
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 6c8bdc449264..a901a312564b 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -783,7 +783,7 @@ void Printer::ImplInit( SalPrinterQueueInfo* pInfo )
mpGraphics->GetDevFontList( mpFontCollection );
}
-void Printer::ImplInitDisplay( const Window* pWindow )
+void Printer::ImplInitDisplay( const vcl::Window* pWindow )
{
ImplSVData* pSVData = ImplGetSVData();
@@ -1121,7 +1121,7 @@ bool Printer::SetJobSetup( const JobSetup& rSetup )
return false;
}
-bool Printer::Setup( Window* pWindow )
+bool Printer::Setup( vcl::Window* pWindow )
{
if ( IsDisplayPrinter() )
return false;
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index ad7a8ba68048..b87425f2934c 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -789,7 +789,7 @@ void PrinterController::resetPrinterOptions( bool i_bFileOutput )
mpImplData->mpPrinter->SetPrinterOptions( aOpt );
}
-bool PrinterController::setupPrinter( Window* i_pParent )
+bool PrinterController::setupPrinter( vcl::Window* i_pParent )
{
bool bRet = false;
if( mpImplData->mpPrinter.get() )