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/prgsbar.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/prgsbar.cxx')
-rw-r--r-- | vcl/source/control/prgsbar.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx index 4634300a68b5..d1b7bf9d6d69 100644 --- a/vcl/source/control/prgsbar.cxx +++ b/vcl/source/control/prgsbar.cxx @@ -33,7 +33,7 @@ void ProgressBar::ImplInit() ImplInitSettings( true, true, true ); } -static WinBits clearProgressBarBorder( Window* pParent, WinBits nOrgStyle ) +static WinBits clearProgressBarBorder( vcl::Window* pParent, WinBits nOrgStyle ) { WinBits nOutStyle = nOrgStyle; if( pParent && (nOrgStyle & WB_BORDER) != 0 ) @@ -49,7 +49,7 @@ Size ProgressBar::GetOptimalSize() const return Size(150, 20); } -ProgressBar::ProgressBar( Window* pParent, WinBits nWinStyle ) : +ProgressBar::ProgressBar( vcl::Window* pParent, WinBits nWinStyle ) : Window( pParent, clearProgressBarBorder( pParent, nWinStyle ) ) { SetOutputSizePixel( GetOptimalSize() ); |