fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

20 files changed, 131 insertions, 132 deletions

diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index 8f1d5f3dd02e..f3d0c0f9bc31 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -74,16 +74,16 @@ class ImplBorderWindowView;
 #define BORDERWINDOW_TITLE_POPUP            ((sal_uInt16)0x0008)
 #define BORDERWINDOW_TITLE_NONE             ((sal_uInt16)0x0010)
 
-class ImplBorderWindow : public Window
+class ImplBorderWindow : public vcl::Window
 {
-    friend class Window;
+    friend class vcl::Window;
     friend class ImplBorderWindowView;
     friend class ImplSmallBorderWindowView;
     friend class ImplStdBorderWindowView;
 
 private:
     ImplBorderWindowView*   mpBorderView;
-    Window*                 mpMenuBarWindow;
+    vcl::Window*                 mpMenuBarWindow;
     long                    mnMinWidth;
     long                    mnMinHeight;
     long                    mnMaxWidth;
@@ -104,10 +104,10 @@ private:
     bool                    mbDisplayActive;
 
     using Window::ImplInit;
-    void                    ImplInit( Window* pParent,
+    void                    ImplInit( vcl::Window* pParent,
                                       WinBits nStyle, sal_uInt16 nTypeStyle,
                                       SystemParentData* pParentData );
-    void                    ImplInit( Window* pParent,
+    void                    ImplInit( vcl::Window* pParent,
                                       WinBits nStyle, sal_uInt16 nTypeStyle,
                                       const ::com::sun::star::uno::Any& );
 
@@ -116,11 +116,11 @@ private:
                             ImplBorderWindow& operator= (const ImplBorderWindow &);
 
 public:
-                            ImplBorderWindow( Window* pParent,
+                            ImplBorderWindow( vcl::Window* pParent,
                                               SystemParentData* pParentData,
                                               WinBits nStyle = 0,
                                               sal_uInt16 nTypeStyle = 0 );
-                            ImplBorderWindow( Window* pParent, WinBits nStyle = 0,
+                            ImplBorderWindow( vcl::Window* pParent, WinBits nStyle = 0,
                                               sal_uInt16 nTypeStyle = 0 );
                             virtual ~ImplBorderWindow();
 
@@ -155,7 +155,7 @@ public:
     void                    SetMenuButton( bool bMenuButton );
 
     void                    UpdateMenuHeight();
-    void                    SetMenuBarWindow( Window* pWindow );
+    void                    SetMenuBarWindow( vcl::Window* pWindow );
     void                    SetMenuBarMode( bool bHide );
 
     void                    SetMinOutputSize( long nWidth, long nHeight )
diff --git a/vcl/inc/dbggui.hxx b/vcl/inc/dbggui.hxx
index b538d3a1d908..f0a29012ca21 100644
--- a/vcl/inc/dbggui.hxx
+++ b/vcl/inc/dbggui.hxx
@@ -22,12 +22,12 @@
 
 #ifdef DBG_UTIL
 
-class Window;
+namespace vcl { class Window; }
 
 void DbgGUIInitSolarMutexCheck();
 void DbgGUIDeInitSolarMutexCheck();
 void DbgGUIStart();
-void DbgDialogTest( Window* pWindow );
+void DbgDialogTest( vcl::Window* pWindow );
 
 #define DBGGUI_INIT_SOLARMUTEXCHECK() DbgGUIInitSolarMutexCheck()
 #define DBGGUI_DEINIT_SOLARMUTEXCHECK() DbgGUIDeInitSolarMutexCheck()
diff --git a/vcl/inc/dndevdis.hxx b/vcl/inc/dndevdis.hxx
index a62abbd90360..5a1c0797dd7f 100644
--- a/vcl/inc/dndevdis.hxx
+++ b/vcl/inc/dndevdis.hxx
@@ -32,39 +32,39 @@ class DNDEventDispatcher: public ::cppu::WeakImplHelper3<
     ::com::sun::star::datatransfer::dnd::XDropTargetDragContext,
     ::com::sun::star::datatransfer::dnd::XDragGestureListener >
 {
-    Window * m_pTopWindow;
-    Window * m_pCurrentWindow;
+    vcl::Window * m_pTopWindow;
+    vcl::Window * m_pCurrentWindow;
 
     ::osl::Mutex m_aMutex;
     ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > m_aDataFlavorList;
 
-    Window* findTopLevelWindow(Point location);
+    vcl::Window* findTopLevelWindow(Point location);
     /*
      * fire the events on the dnd listener container of the specified window
      */
 
-    sal_Int32 fireDragEnterEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
+    sal_Int32 fireDragEnterEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
         const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction,
         const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& aFlavorList ) throw(::com::sun::star::uno::RuntimeException);
 
-    sal_Int32 fireDragOverEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
+    sal_Int32 fireDragOverEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
         const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(::com::sun::star::uno::RuntimeException);
 
-    sal_Int32 fireDragExitEvent( Window *pWindow ) throw(::com::sun::star::uno::RuntimeException);
+    sal_Int32 fireDragExitEvent( vcl::Window *pWindow ) throw(::com::sun::star::uno::RuntimeException);
 
-    sal_Int32 fireDropActionChangedEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
+    sal_Int32 fireDropActionChangedEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
         const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(::com::sun::star::uno::RuntimeException);
 
-    sal_Int32 fireDropEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDropContext >& xContext,
+    sal_Int32 fireDropEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDropContext >& xContext,
         const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction,
         const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable ) throw(::com::sun::star::uno::RuntimeException);
 
-    sal_Int32 fireDragGestureEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >& xSource,
+    sal_Int32 fireDragGestureEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >& xSource,
         const ::com::sun::star::uno::Any event, const Point& rOrigin, const sal_Int8 nDragAction )throw(::com::sun::star::uno::RuntimeException);
 
 public:
 
-    DNDEventDispatcher( Window * pTopWindow );
+    DNDEventDispatcher( vcl::Window * pTopWindow );
     virtual ~DNDEventDispatcher();
 
     /*
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index 49fa496fa0eb..223d2536791a 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -50,7 +50,7 @@ protected:
     void                ImplShow();
 
 public:
-                        HelpTextWindow( Window* pParent, const OUString& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle );
+                        HelpTextWindow( vcl::Window* pParent, const OUString& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle );
                         virtual ~HelpTextWindow();
 
     const OUString&     GetHelpText() const { return maHelpText; }
@@ -70,11 +70,11 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
 };
 
-void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle,
+void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle,
         const OUString& rHelpText, const OUString& rStatusText,
         const Point& rScreenPos, const Rectangle* pHelpArea = NULL );
 void ImplDestroyHelpWindow( bool bUpdateHideTime );
-void ImplSetHelpWindowPos( Window* pHelpWindow, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle,
+void ImplSetHelpWindowPos( vcl::Window* pHelpWindow, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle,
                             const Point& rPos, const Rectangle* pHelpArea );
 
 #endif // INCLUDED_VCL_INC_HELPWIN_HXX
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 2b049357ab7c..0f142a5e524e 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -87,7 +87,7 @@ struct ImplEntryType
 class ImplEntryList
 {
 private:
-    Window*         mpWindow;   ///< For getting the current locale when matching strings
+    vcl::Window*         mpWindow;   ///< For getting the current locale when matching strings
     sal_Int32       mnLastSelected;
     sal_Int32       mnSelectionAnchor;
     sal_Int32       mnImages;
@@ -107,7 +107,7 @@ private:
     }
 
 public:
-                    ImplEntryList( Window* pWindow );
+                    ImplEntryList( vcl::Window* pWindow );
                     ~ImplEntryList();
 
     sal_Int32               InsertEntry( sal_Int32  nPos, ImplEntryType* pNewEntry, bool bSort );
@@ -265,7 +265,7 @@ protected:
 public:
     virtual void  FillLayoutData() const SAL_OVERRIDE;
 
-                    ImplListBoxWindow( Window* pParent, WinBits nWinStyle );
+                    ImplListBoxWindow( vcl::Window* pParent, WinBits nWinStyle );
                     virtual ~ImplListBoxWindow();
 
     ImplEntryList*  GetEntryList() const { return mpEntryList; }
@@ -410,7 +410,7 @@ protected:
     DECL_LINK(          MRUChanged, void* );
 
 public:
-                    ImplListBox( Window* pParent, WinBits nWinStyle );
+                    ImplListBox( vcl::Window* pParent, WinBits nWinStyle );
                     virtual ~ImplListBox();
 
     const ImplEntryList*    GetEntryList() const            { return maLBWindow.GetEntryList(); }
@@ -418,7 +418,7 @@ public:
 
     virtual void    Resize() SAL_OVERRIDE;
     virtual const Wallpaper& GetDisplayBackground() const SAL_OVERRIDE;
-    virtual Window*     GetPreferredKeyInputWindow() SAL_OVERRIDE;
+    virtual vcl::Window*     GetPreferredKeyInputWindow() SAL_OVERRIDE;
 
     sal_Int32       InsertEntry( sal_Int32  nPos, const OUString& rStr );
     sal_Int32       InsertEntry( sal_Int32  nPos, const OUString& rStr, const Image& rImage );
@@ -517,7 +517,7 @@ protected:
     virtual bool    PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 
 public:
-                    ImplListBoxFloatingWindow( Window* pParent );
+                    ImplListBoxFloatingWindow( vcl::Window* pParent );
 
     void            SetImplListBox( ImplListBox* pLB )  { mpImplLB = pLB; }
 
@@ -564,7 +564,7 @@ protected:
     virtual void  FillLayoutData() const SAL_OVERRIDE;
 public:
 
-                    ImplWin( Window* pParent, WinBits nWinStyle = 0 );
+                    ImplWin( vcl::Window* pParent, WinBits nWinStyle = 0 );
                     virtual ~ImplWin() {};
 
     virtual void    MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -606,7 +606,7 @@ private:
     bool            mbDown;
 
 public:
-                    ImplBtn( Window* pParent, WinBits nWinStyle = 0 );
+                    ImplBtn( vcl::Window* pParent, WinBits nWinStyle = 0 );
                     virtual ~ImplBtn() {};
 
     virtual void    MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -615,7 +615,7 @@ public:
     boost::signals2::signal< void ( ImplBtn* ) > buttonDownSignal;
 };
 
-void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBackground );
+void ImplInitFieldSettings( vcl::Window* pWin, bool bFont, bool bForeground, bool bBackground );
 void ImplInitDropDownButton( PushButton* pButton );
 
 #endif // INCLUDED_VCL_INC_ILSTBOX_HXX
diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx
index d4b4886f9ccc..9cd9e6fbd5e0 100644
--- a/vcl/inc/osx/a11yfocustracker.hxx
+++ b/vcl/inc/osx/a11yfocustracker.hxx
@@ -30,7 +30,7 @@
 #include <vcl/vclevent.hxx>
 #include <set>
 
-class Window;
+namespace vcl { class Window; }
 class ToolBox;
 class DocumentFocusListener;
 
@@ -53,16 +53,16 @@ public:
 protected:
 
     // received a WINDOW_GETFOCUS event for this window
-    void window_got_focus(Window *pWindow);
+    void window_got_focus(vcl::Window *pWindow);
 
     // received a TOOLBOX_HIGHLIGHT event for this window
-    void toolbox_highlight_on(Window *pWindow);
+    void toolbox_highlight_on(vcl::Window *pWindow);
 
     // received a TOOLBOX_HIGHLIGHTOFF event for this window
-    void toolbox_highlight_off(Window *pWindow);
+    void toolbox_highlight_off(vcl::Window *pWindow);
 
     // received a TABPAGE_ACTIVATE event for this window
-    void tabpage_activated(Window *pWindow);
+    void tabpage_activated(vcl::Window *pWindow);
 
     // received a MENU_HIGHLIGHT event for this window
     void menu_highlighted(const ::VclMenuEvent *pEvent);
@@ -71,7 +71,7 @@ protected:
     void notify_toolbox_item_focus(ToolBox *pToolBox);
 
     // toolbox item opened a floating window (e.g. color chooser)
-    void toolbox_open_floater(Window *pWindow);
+    void toolbox_open_floater(vcl::Window *pWindow);
 
     // callback function for Application::addEventListener
     static long WindowEventHandler(AquaA11yFocusTracker *pFocusTracker, ::VclSimpleEvent const *pEvent);
@@ -84,7 +84,7 @@ private:
     rtl::Reference< KeyboardFocusListener > m_aFocusListener;
 
     // the list of Windows that need deeper (focus) investigation
-    std::set< Window *> m_aDocumentWindowList;
+    std::set< vcl::Window *> m_aDocumentWindowList;
 
     // the link object needed for Application::addEventListener
     Link m_aWindowEventLink;
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index f0883d03e6dd..49c97e3467a1 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -44,7 +44,7 @@ namespace vcl
     class PrintDialog : public ModalDialog
     {
     public:
-        class PrintPreviewWindow : public Window
+        class PrintPreviewWindow : public vcl::Window
         {
             static const sal_Int32 PREVIEW_BITMAP_WIDTH;
 
@@ -62,7 +62,7 @@ namespace vcl
             void preparePreviewBitmap();
 
         public:
-            PrintPreviewWindow( Window* pParent );
+            PrintPreviewWindow( vcl::Window* pParent );
             virtual ~PrintPreviewWindow();
 
             virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
@@ -78,14 +78,14 @@ namespace vcl
                             );
         };
 
-        class ShowNupOrderWindow : public Window
+        class ShowNupOrderWindow : public vcl::Window
         {
             int mnOrderMode;
             int mnRows;
             int mnColumns;
             void ImplInitSettings();
         public:
-            ShowNupOrderWindow( Window* pParent );
+            ShowNupOrderWindow( vcl::Window* pParent );
             virtual ~ShowNupOrderWindow();
 
             virtual Size GetOptimalSize() const SAL_OVERRIDE;
@@ -207,10 +207,10 @@ namespace vcl
         sal_Int32                               mnCurPage;
         sal_Int32                               mnCachedPages;
 
-        std::map< Window*, OUString >      maControlToPropertyMap;
-        std::map< OUString, std::vector< Window* > >
+        std::map< vcl::Window*, OUString >      maControlToPropertyMap;
+        std::map< OUString, std::vector< vcl::Window* > >
                                                 maPropertyToWindowMap;
-        std::map< Window*, sal_Int32 >          maControlToNumValMap;
+        std::map< vcl::Window*, sal_Int32 >          maControlToNumValMap;
         std::set< OUString >               maReverseDependencySet;
 
         Size                                    maNupPortraitSize;
@@ -236,12 +236,12 @@ namespace vcl
         void updatePrinterText();
         void checkControlDependencies();
         void checkOptionalControlDependencies();
-        void makeEnabled( Window* );
+        void makeEnabled( vcl::Window* );
         void updateWindowFromProperty( const OUString& );
         void setupOptionalUI();
         void readFromSettings();
         void storeToSettings();
-        com::sun::star::beans::PropertyValue* getValueForWindow( Window* ) const;
+        com::sun::star::beans::PropertyValue* getValueForWindow( vcl::Window* ) const;
 
         virtual void Resize() SAL_OVERRIDE;
         virtual void Command( const CommandEvent& ) SAL_OVERRIDE;
@@ -258,7 +258,7 @@ namespace vcl
         DECL_LINK( UIOption_ModifyHdl, Edit* );
 
     public:
-        PrintDialog( Window*, const boost::shared_ptr< PrinterController >& );
+        PrintDialog( vcl::Window*, const boost::shared_ptr< PrinterController >& );
         virtual ~PrintDialog();
 
         bool isPrintToFile();
@@ -283,7 +283,7 @@ namespace vcl
         DECL_LINK( ClickHdl, Button* );
 
     public:
-        PrintProgressDialog(Window* i_pParent, int i_nMax);
+        PrintProgressDialog(vcl::Window* i_pParent, int i_nMax);
 
         bool isCanceled() const { return mbCanceled; }
         void setProgress( int i_nCurrent, int i_nMax = -1 );
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 1d9eed738cfb..f594977e11c2 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -38,7 +38,7 @@ class AllSettings;
 class SalGraphics;
 class SalBitmap;
 class SalMenu;
-class Window;
+namespace vcl { class Window; }
 
 struct SalFrameState;
 struct SalInputContext;
@@ -99,7 +99,7 @@ struct SystemParentData;
 class VCL_PLUGIN_PUBLIC SalFrame : public vcl::DeletionNotifier
 {
     // the VCL window corresponding to this frame
-    Window*                 m_pWindow;
+    vcl::Window*                 m_pWindow;
     SALFRAMEPROC            m_pProc;
 
 public:
@@ -229,11 +229,11 @@ public:
 
     // Callbacks (indepent part in vcl/source/window/winproc.cxx)
     // for default message handling return 0
-    void                    SetCallback( Window* pWindow, SALFRAMEPROC pProc )
+    void                    SetCallback( vcl::Window* pWindow, SALFRAMEPROC pProc )
         { m_pWindow = pWindow; m_pProc = pProc; }
 
     // returns the instance set
-    Window*                 GetWindow() const { return m_pWindow; }
+    vcl::Window*                 GetWindow() const { return m_pWindow; }
 
     // Call the callback set; this sometimes necessary for implementation classes
     // that should not know more than necessary about the SalFrame implementation
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index 36eab51da2fd..805581316504 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -27,7 +27,7 @@
 class SalGraphics;
 class SalFrame;
 class SalObject;
-class Window;
+namespace vcl { class Window; }
 
 class FontSelectPattern;
 
@@ -234,7 +234,7 @@ struct SalQueryCharPositionEvent
 
 // - SalFrame-Types -
 
-typedef bool (*SALFRAMEPROC)( Window* pInst, SalFrame* pFrame,
+typedef bool (*SALFRAMEPROC)( vcl::Window* pInst, SalFrame* pFrame,
                               sal_uInt16 nEvent, const void* pEvent );
 
 // - SalObject-Events -
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 44b229bf2727..c1d9eed2c45d 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -71,7 +71,7 @@ class Image;
 class PopupMenu;
 class Application;
 class OutputDevice;
-class Window;
+namespace vcl { class Window; }
 class SystemWindow;
 class WorkWindow;
 class Dialog;
@@ -177,20 +177,20 @@ struct ImplSVGDIData
 
 struct ImplSVWinData
 {
-    Window*                 mpFirstFrame;       // First FrameWindow
-    Window*                 mpDefDialogParent;  // Default Dialog Parent
+    vcl::Window*                 mpFirstFrame;       // First FrameWindow
+    vcl::Window*                 mpDefDialogParent;  // Default Dialog Parent
     WorkWindow*             mpAppWin;           // Application-Window
-    Window*                 mpFocusWin;         // window, that has the focus
-    Window*                 mpActiveApplicationFrame; // the last active application frame, can be used as DefModalDialogParent if no focuswin set
-    Window*                 mpCaptureWin;       // window, that has the mouse capture
-    Window*                 mpLastDeacWin;      // Window, that need a deactivate (FloatingWindow-Handling)
+    vcl::Window*                 mpFocusWin;         // window, that has the focus
+    vcl::Window*                 mpActiveApplicationFrame; // the last active application frame, can be used as DefModalDialogParent if no focuswin set
+    vcl::Window*                 mpCaptureWin;       // window, that has the mouse capture
+    vcl::Window*                 mpLastDeacWin;      // Window, that need a deactivate (FloatingWindow-Handling)
     FloatingWindow*         mpFirstFloat;       // First FloatingWindow in PopupMode
     Dialog*                 mpLastExecuteDlg;   // First Dialog that is in Execute
-    Window*                 mpExtTextInputWin;  // Window, which is in ExtTextInput
-    Window*                 mpTrackWin;         // window, that is in tracking mode
+    vcl::Window*                 mpExtTextInputWin;  // Window, which is in ExtTextInput
+    vcl::Window*                 mpTrackWin;         // window, that is in tracking mode
     AutoTimer*              mpTrackTimer;       // tracking timer
     ImageList*              mpMsgBoxImgList;    // ImageList for MessageBox
-    Window*                 mpAutoScrollWin;    // window, that is in AutoScrollMode mode
+    vcl::Window*                 mpAutoScrollWin;    // window, that is in AutoScrollMode mode
     sal_uInt16              mnTrackFlags;       // tracking flags
     sal_uInt16              mnAutoScrollFlags;  // auto scroll flags
     bool                mbNoDeactivate;     // true: do not execute Deactivate
@@ -323,7 +323,7 @@ struct ImplSVData
     ImplSVHelpData          maHelpData;         // indepen data for Help classes
     ImplSVNWFData           maNWFData;
     UnoWrapperBase*         mpUnoWrapper;
-    Window*                 mpIntroWindow;      // the splash screen
+    vcl::Window*                 mpIntroWindow;      // the splash screen
     DockingManager*         mpDockingManager;
     BlendFrameCache*        mpBlendFrameCache;
     bool                mbIsTestTool;
@@ -342,15 +342,14 @@ struct ImplSVData
 void        ImplInitSVData();
 void        ImplDeInitSVData();
 void        ImplDestroySVData();
-Window*     ImplGetDefaultWindow();
+vcl::Window*     ImplGetDefaultWindow();
 VCL_PLUGIN_PUBLIC ResMgr*     ImplGetResMgr();
 VCL_PLUGIN_PUBLIC ResId VclResId( sal_Int32 nId ); // throws std::bad_alloc if no res mgr
 DockingManager*     ImplGetDockingManager();
 BlendFrameCache*    ImplGetBlendFrameCache();
-void        ImplWindowAutoMnemonic( Window* pWindow );
+void        ImplWindowAutoMnemonic( vcl::Window* pWindow );
 
 void        ImplUpdateSystemProcessWindow();
-Window*     ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos );
 
 bool        ImplCallHotKey( const vcl::KeyCode& rKeyCode );
 void        ImplFreeHotKeyData();
@@ -374,10 +373,10 @@ FieldUnitStringList* ImplGetCleanedFieldUnits();
 struct ImplDelData
 {
     ImplDelData*    mpNext;
-    const Window*   mpWindow;
+    const vcl::Window*   mpWindow;
     bool            mbDel;
 
-                    ImplDelData( const Window* pWindow = NULL )
+                    ImplDelData( const vcl::Window* pWindow = NULL )
                     : mpNext( NULL ), mpWindow( NULL ), mbDel( false )
                     { if( pWindow ) AttachToWindow( pWindow ); }
 
@@ -390,19 +389,19 @@ struct ImplDelData
     }
 
 private:
-    void            AttachToWindow( const Window* );
+    void            AttachToWindow( const vcl::Window* );
 };
 
 struct ImplFocusDelData : public ImplDelData
 {
-    Window*         mpFocusWin;
+    vcl::Window*         mpFocusWin;
 };
 
 struct ImplSVEvent
 {
     void*               mpData;
     Link*               mpLink;
-    Window*             mpWindow;
+    vcl::Window*             mpWindow;
     ImplDelData         maDelData;
     bool                mbCall;
 };
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index 9056ec55e043..767c7c36f6af 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -34,11 +34,11 @@
 #define TB_MENUBUTTON_SIZE      12
 #define TB_MENUBUTTON_OFFSET    2
 
-class Window;
+namespace vcl { class Window; }
 
 struct ImplToolItem
 {
-    Window*             mpWindow;
+    vcl::Window*        mpWindow;
     void*               mpUserData;
     Image               maImage;
     Image               maHighImage;
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index b8396c4c11be..e7a8dbac0ed8 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -48,7 +48,7 @@ inline GdkWindow * widget_get_window(GtkWidget *widget)
 #endif
 }
 
-inline XLIB_Window widget_get_xid(GtkWidget *widget)
+inline ::Window widget_get_xid(GtkWidget *widget)
 {
 #if GTK_CHECK_VERSION(3,0,0)
     return GDK_WINDOW_XID(gtk_widget_get_window(widget));
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index d1bd4fbbf756..93a7f1dccb1c 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -48,7 +48,7 @@ class GtkSalGraphics;
 class GtkSalDisplay;
 
 #if GTK_CHECK_VERSION(3,0,0)
-typedef XLIB_Window GdkNativeWindow;
+typedef ::Window GdkNativeWindow;
 #define GDK_WINDOW_XWINDOW(o) GDK_WINDOW_XID(o)
 #define gdk_set_sm_client_id(i) gdk_x11_set_sm_client_id(i)
 #define gdk_window_foreign_new_for_display(a,b) gdk_x11_window_foreign_new_for_display(a,b)
@@ -295,7 +295,7 @@ class GtkSalFrame : public SalFrame
     Size calcDefaultSize();
 
     void setMinMaxSize();
-    void createNewWindow( XLIB_Window aParent, bool bXEmbed, SalX11Screen nXScreen );
+    void createNewWindow( ::Window aParent, bool bXEmbed, SalX11Screen nXScreen );
     void askForXEmbedFocus( sal_Int32 nTimecode );
 
     void AllocateFrame();
diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index 1cf47fae20f6..517f1bbe7244 100644
--- a/vcl/inc/unx/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
@@ -59,7 +59,7 @@ public:
     bool IsPreeditMode()    { return maClientData.eState == ePreeditStatusActive; }
     XIC  GetContext()       { return maContext; }
 
-    void ExtendEventMask(  XLIB_Window aFocusWindow );
+    void ExtendEventMask(  ::Window aFocusWindow );
     void SetICFocus( SalFrame* pFocusFrame );
     void UnsetICFocus( SalFrame* pFrame );
     void HandleDestroyIM();
diff --git a/vcl/inc/unx/i18n_im.hxx b/vcl/inc/unx/i18n_im.hxx
index d1741eedebb8..8e3a2ae31eec 100644
--- a/vcl/inc/unx/i18n_im.hxx
+++ b/vcl/inc/unx/i18n_im.hxx
@@ -43,7 +43,7 @@ public:
     bool        CreateMethod( Display *pDisplay );
     XIMStyles  *GetSupportedStyles()    { return mpStyles;  }
     bool        SetLocale( const char* pLocale = "" );
-    bool        FilterEvent( XEvent *pEvent, XLIB_Window window );
+    bool        FilterEvent( XEvent *pEvent, ::Window window );
 
     SalI18N_InputMethod();
     ~SalI18N_InputMethod();
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 2d77328d1e40..075cf79503fe 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -209,8 +209,8 @@ public:
     {
         bool                m_bInit;
 
-        XLIB_Window         m_aRoot;
-        XLIB_Window         m_aRefWindow;
+        ::Window            m_aRoot;
+        ::Window            m_aRefWindow;
         Size                m_aSize;
         SalVisual           m_aVisual;
         SalColormap         m_aColormap;
@@ -280,7 +280,7 @@ protected:
 
     virtual bool    Dispatch( XEvent *pEvent ) = 0;
     void            InitXinerama();
-    void            InitRandR( XLIB_Window aRoot ) const;
+    void            InitRandR( ::Window aRoot ) const;
     void            DeInitRandR();
     int             processRandREvent( XEvent* );
 
@@ -332,7 +332,7 @@ public:
         return m_aScreens[nXScreen.getXScreen()];
     }
 
-    XLIB_Window     GetDrawable( SalX11Screen nXScreen ) const { return getDataForScreen( nXScreen ).m_aRefWindow; }
+    ::Window         GetDrawable( SalX11Screen nXScreen ) const { return getDataForScreen( nXScreen ).m_aRefWindow; }
     Display        *GetDisplay() const { return pDisp_; }
     SalX11Screen    GetDefaultXScreen() const { return m_nXDefaultScreen; }
     const Size&     GetScreenSize( SalX11Screen nXScreen ) const { return getDataForScreen( nXScreen ).m_aSize; }
@@ -367,7 +367,7 @@ public:
     ::vcl_sal::WMAdaptor* getWMAdaptor() const { return m_pWMAdaptor; }
     bool            IsXinerama() const { return m_bXinerama; }
     const std::vector< Rectangle >& GetXineramaScreens() const { return m_aXineramaScreens; }
-    XLIB_Window     GetRootWindow( SalX11Screen nXScreen ) const
+    ::Window        GetRootWindow( SalX11Screen nXScreen ) const
             { return getDataForScreen( nXScreen ).m_aRoot; }
     const std::vector< ScreenData >& GetScreenData() { return m_aScreens; }
     unsigned int GetXScreenCount() const { return m_aScreens.size(); }
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index bd37f9143c75..d85363a7aad8 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -61,11 +61,11 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame
 
     SalDisplay     *pDisplay_;
     SalX11Screen    m_nXScreen;
-    XLIB_Window     mhWindow;
-    XLIB_Window     mhShellWindow;
-    XLIB_Window     mhForeignParent;
+    ::Window        mhWindow;
+    ::Window        mhShellWindow;
+    ::Window        mhForeignParent;
     // window to fall back to when no longer in fullscreen mode
-    XLIB_Window     mhStackingWindow;
+    ::Window        mhStackingWindow;
     // window to listen for CirculateNotify events
 
     Pixmap          mhBackgroundPixmap;
@@ -138,7 +138,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame
     void            Maximize();
     void            Restore();
 
-    void            RestackChildren( XLIB_Window* pTopLevelWindows, int nTopLevelWindows );
+    void            RestackChildren( ::Window* pTopLevelWindows, int nTopLevelWindows );
     void            RestackChildren();
 
     long            HandleKeyEvent      ( XKeyEvent         *pEvent );
@@ -154,7 +154,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame
 
     DECL_LINK( HandleAlwaysOnTopRaise, void* );
 
-    void            createNewWindow( XLIB_Window aParent, SalX11Screen nXScreen = SalX11Screen( -1 ) );
+    void            createNewWindow( ::Window aParent, SalX11Screen nXScreen = SalX11Screen( -1 ) );
     void            updateScreenNumber();
 
     void            setXEmbedInfo();
@@ -177,15 +177,15 @@ public:
     {
         return pDisplay_->GetDisplay();
     }
-    XLIB_Window GetDrawable() const
+    ::Window GetDrawable() const
     {
         return GetWindow();
     }
     SalX11Screen            GetScreenNumber() const { return m_nXScreen; }
-    XLIB_Window             GetWindow() const { return mhWindow; }
-    XLIB_Window             GetShellWindow() const { return mhShellWindow; }
-    XLIB_Window             GetForeignParent() const { return mhForeignParent; }
-    XLIB_Window             GetStackingWindow() const { return mhStackingWindow; }
+    ::Window                GetWindow() const { return mhWindow; }
+    ::Window                GetShellWindow() const { return mhShellWindow; }
+    ::Window                GetForeignParent() const { return mhForeignParent; }
+    ::Window                GetStackingWindow() const { return mhStackingWindow; }
     long                    ShutDown() const { return CallCallback( SALEVENT_SHUTDOWN, 0 ); }
     long                    Close() const { return CallCallback( SALEVENT_CLOSE, 0 ); }
               sal_uIntPtr           GetStyle() const { return nStyle_; }
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index 7cc73958f9eb..83dc856f5113 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -59,8 +59,8 @@ class VCLPLUG_GEN_PUBLIC X11SalObject : public SalObject
 public:
     SystemEnvData maSystemChildData;
     SalFrame*       mpParent;
-    XLIB_Window     maPrimary;
-    XLIB_Window     maSecondary;
+    ::Window        maPrimary;
+    ::Window        maSecondary;
     Colormap        maColormap;
     SalClipRegion   maClipRegion;
     bool            mbVisible;
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index e2ae8ce08432..d5fcb32cc558 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -198,7 +198,7 @@ public:
     /*
      * gets the workarea the specified window is on (or -1)
      */
-    int getWindowWorkArea( XLIB_Window aWindow ) const;
+    int getWindowWorkArea( ::Window aWindow ) const;
     /*
      *  gets the specified workarea
      */
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 5ab5cc1b57bf..983c3613cc66 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -41,7 +41,7 @@ struct ImplDelData;
 struct ImplAccessibleInfos;
 
 class FixedText;
-class Window;
+namespace vcl { class Window; }
 class VclSizeGroup;
 class VirtualDevice;
 class PhysicalFontCollection;
@@ -91,7 +91,7 @@ namespace vcl {
     struct ControlLayoutData;
 }
 
-bool ImplWindowFrameProc( Window* pInst, SalFrame* pFrame, sal_uInt16 nEvent, const void* pEvent );
+bool ImplWindowFrameProc( vcl::Window* pInst, SalFrame* pFrame, sal_uInt16 nEvent, const void* pEvent );
 
 #define WINDOW_HITTEST_INSIDE           ((sal_uInt16)0x0001)
 #define WINDOW_HITTEST_TRANSPARENT      ((sal_uInt16)0x0002)
@@ -111,7 +111,7 @@ struct ImplWinData
     sal_uInt16          mnIsTopWindow;
     bool                mbMouseOver;            //< tracks mouse over for native widget paint effect
     bool                mbEnableNativeWidget;   //< toggle native widget rendering
-    ::std::list< Window* >
+    ::std::list< vcl::Window* >
                         maTopWindowChildren;
 };
 
@@ -119,7 +119,7 @@ struct ImplOverlapData
 {
     VirtualDevice*      mpSaveBackDev;          //< saved background bitmap
     Region*             mpSaveBackRgn;          //< saved region, which must be invalidated
-    Window*             mpNextBackWin;          //< next window with saved background
+    vcl::Window*        mpNextBackWin;          //< next window with saved background
     sal_uIntPtr         mnSaveBackSize;         //< bitmap size of saved background
     bool                mbSaveBack;             //< true: save background
     sal_uInt8           mnTopLevel;             //< Level for Overlap-Window
@@ -130,13 +130,13 @@ struct ImplFrameData
     Timer               maPaintTimer;           //< paint timer
     Timer               maResizeTimer;          //< resize timer
     InputContext        maOldInputContext;      //< last set Input Context
-    Window*             mpNextFrame;            //< next frame window
-    Window*             mpFirstOverlap;         //< first overlap window
-    Window*             mpFocusWin;             //< focus window (is also set, when frame doesn't have the focous)
-    Window*             mpMouseMoveWin;         //< last window, where MouseMove() called
-    Window*             mpMouseDownWin;         //< last window, where MouseButtonDown() called
-    Window*             mpFirstBackWin;         //< first overlap-window with saved background
-    ::std::vector<Window *> maOwnerDrawList;    //< List of system windows with owner draw decoration
+    vcl::Window*        mpNextFrame;            //< next frame window
+    vcl::Window*        mpFirstOverlap;         //< first overlap vcl::Window
+    vcl::Window*        mpFocusWin;             //< focus window (is also set, when frame doesn't have the focous)
+    vcl::Window*        mpMouseMoveWin;         //< last window, where MouseMove() called
+    vcl::Window*        mpMouseDownWin;         //< last window, where MouseButtonDown() called
+    vcl::Window*        mpFirstBackWin;         //< first overlap-window with saved background
+    ::std::vector<vcl::Window *> maOwnerDrawList;    //< List of system windows with owner draw decoration
     PhysicalFontCollection* mpFontCollection;   //< Font-List for this frame
     ImplFontCache*      mpFontCache;            //< Font-Cache for this frame
     sal_Int32           mnDPIX;                 //< Original Screen Resolution
@@ -185,9 +185,9 @@ struct ImplAccessibleInfos
     sal_uInt16          nAccessibleRole;
     OUString*           pAccessibleName;
     OUString*           pAccessibleDescription;
-    Window*             pLabeledByWindow;
-    Window*             pLabelForWindow;
-    Window*             pMemberOfWindow;
+    vcl::Window*        pLabeledByWindow;
+    vcl::Window*        pLabelForWindow;
+    vcl::Window*        pMemberOfWindow;
 
     ImplAccessibleInfos();
     ~ImplAccessibleInfos();
@@ -206,21 +206,21 @@ public:
     ImplFrameData*      mpFrameData;
     SalFrame*           mpFrame;
     SalObject*          mpSysObj;
-    Window*             mpFrameWindow;
-    Window*             mpOverlapWindow;
-    Window*             mpBorderWindow;
-    Window*             mpClientWindow;
-    Window*             mpParent;
-    Window*             mpRealParent;
-    Window*             mpFirstChild;
-    Window*             mpLastChild;
-    Window*             mpFirstOverlap;
-    Window*             mpLastOverlap;
-    Window*             mpPrev;
-    Window*             mpNext;
-    Window*             mpNextOverlap;
-    Window*             mpLastFocusWindow;
-    Window*             mpDlgCtrlDownWindow;
+    vcl::Window*        mpFrameWindow;
+    vcl::Window*        mpOverlapWindow;
+    vcl::Window*        mpBorderWindow;
+    vcl::Window*        mpClientWindow;
+    vcl::Window*        mpParent;
+    vcl::Window*        mpRealParent;
+    vcl::Window*        mpFirstChild;
+    vcl::Window*        mpLastChild;
+    vcl::Window*        mpFirstOverlap;
+    vcl::Window*        mpLastOverlap;
+    vcl::Window*        mpPrev;
+    vcl::Window*        mpNext;
+    vcl::Window*        mpNextOverlap;
+    vcl::Window*        mpLastFocusWindow;
+    vcl::Window*        mpDlgCtrlDownWindow;
     VclEventListeners   maEventListeners;
     VclEventListeners   maChildEventListeners;
 
@@ -375,10 +375,10 @@ public:
 
 // helper methods
 
-bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeave,
+bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeave,
                            long nX, long nY, sal_uIntPtr nMsgTime,
                            sal_uInt16 nCode, sal_uInt16 nMode );
-void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight );
+void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight );
 
 #endif // INCLUDED_VCL_INC_WINDOW_H