From 827c46e7d75000cb03b0ce21759f9d0825f0c096 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 23 Sep 2014 11:20:40 +0200
Subject: fdo#82577: Handle Window

Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
---
 vcl/source/window/dockingarea.cxx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'vcl/source/window/dockingarea.cxx')

diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index 6cdc73e08f9c..bda794bc1631 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -59,7 +59,7 @@ static void ImplInitBackground( DockingAreaWindow* pThis )
         SystemWindow *pSysWin = pThis->GetSystemWindow();
         if ( pSysWin && pSysWin->GetMenuBar() )
         {
-            Window *pMenubarWin = pSysWin->GetMenuBar()->GetWindow();
+            vcl::Window *pMenubarWin = pSysWin->GetMenuBar()->GetWindow();
             if ( pMenubarWin )
                 nMenubarHeight = pMenubarWin->GetOutputHeightPixel();
         }
@@ -77,7 +77,7 @@ static void ImplInitBackground( DockingAreaWindow* pThis )
         pThis->SetBackground( Wallpaper( pThis->GetSettings().GetStyleSettings().GetFaceColor() ) );
 }
 
-DockingAreaWindow::DockingAreaWindow( Window* pParent ) :
+DockingAreaWindow::DockingAreaWindow( vcl::Window* pParent ) :
     Window( WINDOW_DOCKINGAREA )
 {
     ImplInit( pParent, WB_CLIPCHILDREN|WB_3DLOOK, NULL );
@@ -114,7 +114,7 @@ static void ImplInvalidateMenubar( DockingAreaWindow* pThis )
         SystemWindow *pSysWin = pThis->GetSystemWindow();
         if( pSysWin && pSysWin->GetMenuBar() )
         {
-            Window *pMenubarWin = pSysWin->GetMenuBar()->GetWindow();
+            vcl::Window *pMenubarWin = pSysWin->GetMenuBar()->GetWindow();
             if( pMenubarWin )
                 pMenubarWin->Invalidate();
         }
@@ -181,7 +181,7 @@ void DockingAreaWindow::Paint( const Rectangle& )
                 sal_uInt16 nChildren = GetChildCount();
                 for( sal_uInt16 n = 0; n < nChildren; n++ )
                 {
-                    Window* pChild = GetChild( n );
+                    vcl::Window* pChild = GetChild( n );
                     if ( pChild->IsVisible() )
                     {
                         Point aPos = pChild->GetPosPixel();
@@ -207,7 +207,7 @@ void DockingAreaWindow::Paint( const Rectangle& )
             sal_uInt16 nChildren = GetChildCount();
             for( sal_uInt16 n = 0; n < nChildren; n++ )
             {
-                Window* pChild = GetChild( n );
+                vcl::Window* pChild = GetChild( n );
                 Point aPos = pChild->GetPosPixel();
                 Size aSize = pChild->GetSizePixel();
                 if( IsHorizontal() )
-- 
cgit