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/tabdlg.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/tabdlg.hxx')
-rw-r--r-- | include/vcl/tabdlg.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx index 312a6a32fee0..e4f42482c23a 100644 --- a/include/vcl/tabdlg.hxx +++ b/include/vcl/tabdlg.hxx @@ -30,7 +30,7 @@ class VCL_DLLPUBLIC TabDialog : public Dialog { private: FixedLine* mpFixedLine; - Window* mpViewWindow; + vcl::Window* mpViewWindow; WindowAlign meViewAlign; bool mbPosControls; @@ -38,15 +38,15 @@ private: SAL_DLLPRIVATE void ImplPosControls(); public: - TabDialog( Window* pParent, + TabDialog( vcl::Window* pParent, WinBits nStyle = WB_STDTABDIALOG ); - TabDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + TabDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~TabDialog(); virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - void SetViewWindow( Window* pWindow ) { mpViewWindow = pWindow; } - Window* GetViewWindow() const { return mpViewWindow; } + void SetViewWindow( vcl::Window* pWindow ) { mpViewWindow = pWindow; } + vcl::Window* GetViewWindow() const { return mpViewWindow; } void SetViewAlign( WindowAlign eAlign ) { meViewAlign = eAlign; } WindowAlign GetViewAlign() const { return meViewAlign; } }; |