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/imgctrl.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/imgctrl.cxx')
-rw-r--r-- | vcl/source/control/imgctrl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx index 54b97f43cd97..6a8082fb5de2 100644 --- a/vcl/source/control/imgctrl.cxx +++ b/vcl/source/control/imgctrl.cxx @@ -25,7 +25,7 @@ namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode; -ImageControl::ImageControl( Window* pParent, WinBits nStyle ) +ImageControl::ImageControl( vcl::Window* pParent, WinBits nStyle ) :FixedImage( pParent, nStyle ) ,mnScaleMode( ImageScaleMode::ANISOTROPIC ) { @@ -137,7 +137,7 @@ void ImageControl::Paint( const Rectangle& /*rRect*/ ) if( HasFocus() ) { - Window *pWin = GetWindow( WINDOW_BORDER ); + vcl::Window *pWin = GetWindow( WINDOW_BORDER ); bool bFlat = (GetBorderStyle() == 2); Rectangle aRect( Point(0,0), pWin->GetOutputSizePixel() ); |