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/status.hxx | |
parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (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 'include/vcl/status.hxx')
-rw-r--r-- | include/vcl/status.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 250d08d5fbe1..0f74411eaec2 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -32,7 +32,7 @@ typedef ::std::vector< ImplStatusItem* > ImplStatusItemList; // - Progress-Ausgabe - -void VCL_DLLPUBLIC DrawProgress( Window* pWindow, const Point& rPos, +void VCL_DLLPUBLIC DrawProgress( vcl::Window* pWindow, const Point& rPos, long nOffset, long nPrgsWidth, long nPrgsHeight, sal_uInt16 nPercent1, sal_uInt16 nPercent2, sal_uInt16 nPercentCount, const Rectangle& rFramePosSize @@ -69,7 +69,7 @@ typedef sal_uInt16 StatusBarItemBits; // - StatusBar - -class VCL_DLLPUBLIC StatusBar : public Window +class VCL_DLLPUBLIC StatusBar : public vcl::Window { class ImplData; private: @@ -96,7 +96,7 @@ private: Link maDoubleClickHdl; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplFormat(); SAL_DLLPRIVATE bool ImplIsItemUpdate(); @@ -110,7 +110,7 @@ private: SAL_DLLPRIVATE sal_uInt16 ImplGetFirstVisiblePos() const; public: - StatusBar( Window* pParent, + StatusBar( vcl::Window* pParent, WinBits nWinStyle = WB_BORDER | WB_RIGHT ); virtual ~StatusBar(); |