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 /vcl/source/control/slider.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 'vcl/source/control/slider.cxx')
| -rw-r--r-- | vcl/source/control/slider.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index f398d02a38e3..00cf7108c981 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -45,7 +45,7 @@ #define SLIDER_VIEW_STYLE (WB_3DLOOK | WB_HORZ | WB_VERT) -void Slider::ImplInit( Window* pParent, WinBits nStyle ) +void Slider::ImplInit( vcl::Window* pParent, WinBits nStyle ) { mnThumbPixOffset = 0; mnThumbPixRange = 0; @@ -73,7 +73,7 @@ void Slider::ImplInit( Window* pParent, WinBits nStyle ) SetSizePixel( CalcWindowSizePixel() ); } -Slider::Slider( Window* pParent, WinBits nStyle ) : +Slider::Slider( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_SLIDER ) { ImplInit( pParent, nStyle ); @@ -81,7 +81,7 @@ Slider::Slider( Window* pParent, WinBits nStyle ) : void Slider::ImplInitSettings() { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { EnableChildTransparentMode( true ); |