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/window/tabpage.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/window/tabpage.cxx')
| -rw-r--r-- | vcl/source/window/tabpage.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index 655c334292c2..f96cbebd0cb7 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> -void TabPage::ImplInit( Window* pParent, WinBits nStyle ) +void TabPage::ImplInit( vcl::Window* pParent, WinBits nStyle ) { if ( !(nStyle & WB_NODIALOGCONTROL) ) nStyle |= WB_DIALOGCONTROL; @@ -48,7 +48,7 @@ void TabPage::ImplInit( Window* pParent, WinBits nStyle ) void TabPage::ImplInitSettings() { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { EnableChildTransparentMode( true ); @@ -69,13 +69,13 @@ void TabPage::ImplInitSettings() } } -TabPage::TabPage( Window* pParent, WinBits nStyle ) : +TabPage::TabPage( vcl::Window* pParent, WinBits nStyle ) : Window( WINDOW_TABPAGE ) { ImplInit( pParent, nStyle ); } -TabPage::TabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription) +TabPage::TabPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription) : Window(WINDOW_TABPAGE) { ImplInit(pParent, 0); |