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/splitwin.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/splitwin.hxx')
| -rw-r--r-- | include/vcl/splitwin.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index b71b8e745b6e..83f640696814 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -88,7 +88,7 @@ private: Link maFadeOutHdl; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); SAL_DLLPRIVATE void ImplCalcLayout(); SAL_DLLPRIVATE void ImplUpdate(); @@ -125,7 +125,7 @@ private: SAL_DLLPRIVATE SplitWindow (const SplitWindow &); SAL_DLLPRIVATE SplitWindow & operator= (const SplitWindow &); public: - SplitWindow( Window* pParent, WinBits nStyle = 0 ); + SplitWindow( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~SplitWindow(); virtual void StartSplit(); @@ -146,7 +146,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void InsertItem( sal_uInt16 nId, Window* pWindow, long nSize, + void InsertItem( sal_uInt16 nId, vcl::Window* pWindow, long nSize, sal_uInt16 nPos = SPLITWINDOW_APPEND, sal_uInt16 nSetId = 0, SplitWindowItemBits nBits = 0 ); void InsertItem( sal_uInt16 nId, long nSize, @@ -173,7 +173,7 @@ public: */ long GetItemSize( sal_uInt16 nId, SplitWindowItemBits nBits ) const; sal_uInt16 GetSet( sal_uInt16 nId ) const; - sal_uInt16 GetItemId( Window* pWindow ) const; + sal_uInt16 GetItemId( vcl::Window* pWindow ) const; sal_uInt16 GetItemId( const Point& rPos ) const; sal_uInt16 GetItemPos( sal_uInt16 nId, sal_uInt16 nSetId = 0 ) const; sal_uInt16 GetItemId( sal_uInt16 nPos, sal_uInt16 nSetId = 0 ) const; |