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/menubtn.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/menubtn.cxx')
-rw-r--r-- | vcl/source/control/menubtn.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index d543c291ac95..288b7abeb018 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -37,7 +37,7 @@ void MenuButton::ImplInitMenuButtonData() mnMenuMode = 0; } -void MenuButton::ImplInit( Window* pParent, WinBits nStyle ) +void MenuButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { if ( !(nStyle & WB_NOTABSTOP) ) nStyle |= WB_TABSTOP; @@ -73,7 +73,7 @@ OString MenuButton::GetCurItemIdent() const mpMenu->GetItemIdent(mnCurItemId) : OString(); } -MenuButton::MenuButton( Window* pParent, WinBits nWinBits ) +MenuButton::MenuButton( vcl::Window* pParent, WinBits nWinBits ) : PushButton( WINDOW_MENUBUTTON ) { ImplInitMenuButtonData(); |