diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /include/vcl/popupmenuwindow.hxx | |
parent | Disable HTML export "hspace" and "vspace" check on OSX (diff) | |
download | core-827c46e7d75000cb03b0ce21759f9d0825f0c096.tar.gz core-827c46e7d75000cb03b0ce21759f9d0825f0c096.zip |
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 'include/vcl/popupmenuwindow.hxx')
-rw-r--r-- | include/vcl/popupmenuwindow.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/vcl/popupmenuwindow.hxx b/include/vcl/popupmenuwindow.hxx index 87ef34c60c08..266738a170c3 100644 --- a/include/vcl/popupmenuwindow.hxx +++ b/include/vcl/popupmenuwindow.hxx @@ -28,7 +28,7 @@ private: struct ImplData; ImplData* mpImplData; public: - PopupMenuFloatingWindow( Window* pParent, WinBits nStyle = (WB_SYSTEMFLOATWIN|WB_SYSTEMWINDOW|WB_NOBORDER) ); + PopupMenuFloatingWindow( vcl::Window* pParent, WinBits nStyle = (WB_SYSTEMFLOATWIN|WB_SYSTEMWINDOW|WB_NOBORDER) ); virtual ~PopupMenuFloatingWindow(); sal_uInt16 GetMenuStackLevel() const; @@ -36,7 +36,7 @@ public: bool IsPopupMenu() const; //determine if a given window is an activated PopupMenuFloatingWindow - static bool isPopupMenu(const Window *pWindow); + static bool isPopupMenu(const vcl::Window *pWindow); }; #endif |