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 /svx/source/dialog/dialcontrol.cxx | |
| 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 'svx/source/dialog/dialcontrol.cxx')
| -rw-r--r-- | svx/source/dialog/dialcontrol.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index ddf6bc8799cd..c14125ddb0e6 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -38,7 +38,7 @@ const long DIAL_OUTER_WIDTH = 8; -DialControlBmp::DialControlBmp( Window& rParent ) : +DialControlBmp::DialControlBmp( vcl::Window& rParent ) : VirtualDevice( rParent, 0, 0 ), mbEnabled( true ), mrParent( rParent ), @@ -223,7 +223,7 @@ void DialControlBmp::DrawBackground() -DialControl::DialControl_Impl::DialControl_Impl ( Window& rParent ) : +DialControl::DialControl_Impl::DialControl_Impl ( vcl::Window& rParent ) : mpBmpEnabled(new DialControlBmp(rParent)), mpBmpDisabled(new DialControlBmp(rParent)), mpBmpBuffered(new DialControlBmp(rParent)), @@ -264,7 +264,7 @@ void DialControl::DialControl_Impl::SetSize( const Size& rWinSize ) -DialControl::DialControl( Window* pParent, WinBits nBits ) : +DialControl::DialControl( vcl::Window* pParent, WinBits nBits ) : Control( pParent, nBits ), mpImpl( new DialControl_Impl( *this ) ) { @@ -275,7 +275,7 @@ DialControl::~DialControl() { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDialControl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDialControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new DialControl(pParent, WB_TABSTOP); } |