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/morebtn.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/morebtn.cxx')
| -rw-r--r-- | vcl/source/control/morebtn.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx index 0146cefce4ff..f84e0a891287 100644 --- a/vcl/source/control/morebtn.cxx +++ b/vcl/source/control/morebtn.cxx @@ -22,7 +22,7 @@ #include <tools/rc.h> #include <vector> -typedef ::std::vector< Window* > ImplMoreWindowList; +typedef ::std::vector< vcl::Window* > ImplMoreWindowList; struct ImplMoreButtonData { @@ -31,7 +31,7 @@ struct ImplMoreButtonData OUString maLessText; }; -void MoreButton::ImplInit( Window* pParent, WinBits nStyle ) +void MoreButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { mpMBData = new ImplMoreButtonData; mnDelta = 0; @@ -72,7 +72,7 @@ void MoreButton::ShowState() } } -MoreButton::MoreButton( Window* pParent, WinBits nStyle ) : +MoreButton::MoreButton( vcl::Window* pParent, WinBits nStyle ) : PushButton( WINDOW_MOREBUTTON ) { ImplInit( pParent, nStyle ); @@ -86,7 +86,7 @@ MoreButton::~MoreButton() void MoreButton::Click() { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); Size aSize( pParent->GetSizePixel() ); long nDeltaPixel = LogicToPixel( Size( 0, mnDelta ), meUnit ).Height(); |