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 /dbaccess/source/ui/control/FieldDescControl.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 'dbaccess/source/ui/control/FieldDescControl.cxx')
| -rw-r--r-- | dbaccess/source/ui/control/FieldDescControl.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 44bf027627b3..d0c35b7cd759 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -93,7 +93,7 @@ namespace } // class OFieldDescControl -OFieldDescControl::OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHelpBar ) +OFieldDescControl::OFieldDescControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar ) :TabPage( pParent, WB_3DLOOK | WB_DIALOGCONTROL ) ,pHelp( pHelpBar ) ,pLastFocusWindow(NULL) @@ -163,11 +163,11 @@ OFieldDescControl::~OFieldDescControl() { { - boost::scoped_ptr<Window> aTemp(m_pVertScroll); + boost::scoped_ptr<vcl::Window> aTemp(m_pVertScroll); m_pVertScroll = NULL; } { - boost::scoped_ptr<Window> aTemp(m_pHorzScroll); + boost::scoped_ptr<vcl::Window> aTemp(m_pHorzScroll); m_pHorzScroll = NULL; } if ( m_bAdded ) @@ -226,7 +226,7 @@ IMPL_LINK(OFieldDescControl, OnScroll, ScrollBar*, /*pBar*/) namespace { - void getMaxXPosition(Window* _pWindow,long& _rnMaxXPosition) + void getMaxXPosition(vcl::Window* _pWindow,long& _rnMaxXPosition) { if (_pWindow) { @@ -1556,7 +1556,7 @@ void OFieldDescControl::GetFocus() } } -void OFieldDescControl::implFocusLost(Window* _pWhich) +void OFieldDescControl::implFocusLost(vcl::Window* _pWhich) { OSL_ENSURE(!_pWhich || IsChild(_pWhich), "OFieldDescControl::implFocusLost : invalid window !"); |