diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-21 15:52:27 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-05-29 20:16:52 +0200 |
| commit | a5e58e66d82a63d99ced4ed8a42c38ed6179aa6c (patch) | |
| tree | 234325db56cadde360176607258cdf98d2db7826 /toolkit/source/awt | |
| parent | cfd5cbae2871e45c60d3df24e954708d2f0d4b94 (diff) | |
convert WINDOW constants for GetWindow() methods to scoped enum
Change-Id: I0c7c6d095732704eb4ab48f1277a0592b1c7fa33
Signed-off-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'toolkit/source/awt')
| -rw-r--r-- | toolkit/source/awt/vclxaccessiblecomponent.cxx | 6 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxcontainer.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxwindows.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index 1dcb9b88f3d7..9031492fbf2a 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -447,11 +447,11 @@ void VCLXAccessibleComponent::FillAccessibleStateSet( utl::AccessibleStateSetHel rStateSet.AddState( accessibility::AccessibleStateType::EDITABLE ); } - VclPtr<vcl::Window> pChild = pWindow->GetWindow( WINDOW_FIRSTCHILD ); + VclPtr<vcl::Window> pChild = pWindow->GetWindow( GetWindowType::FirstChild ); while( pWindow && pChild ) { - VclPtr<vcl::Window> pWinTemp = pChild->GetWindow( WINDOW_FIRSTCHILD ); + VclPtr<vcl::Window> pWinTemp = pChild->GetWindow( GetWindowType::FirstChild ); if( pWinTemp && pWinTemp->GetType() == WINDOW_EDIT ) { if( !( pWinTemp->GetStyle() & WB_READONLY) || @@ -466,7 +466,7 @@ void VCLXAccessibleComponent::FillAccessibleStateSet( utl::AccessibleStateSetHel rStateSet.AddState( accessibility::AccessibleStateType::EDITABLE ); break; } - pChild = pChild->GetWindow( WINDOW_NEXT ); + pChild = pChild->GetWindow( GetWindowType::Next ); } } else diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index 496a3f7020b6..aff962396d16 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -210,7 +210,7 @@ void VCLXContainer::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun: // Add WB_GROUP after the last group if ( n == ( nCount - 1 ) ) { - vcl::Window* pBehindLast = pWin->GetWindow( WINDOW_NEXT ); + vcl::Window* pBehindLast = pWin->GetWindow( GetWindowType::Next ); if ( pBehindLast ) { WinBits nLastStyle = pBehindLast->GetStyle(); diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 937e48a84e6d..2476e1f1151c 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -2318,13 +2318,13 @@ sal_Int16 VCLXDialog::execute() throw(::com::sun::star::uno::RuntimeException, s if ( GetWindow() ) { VclPtr< Dialog > pDlg = GetAs< Dialog >(); - vcl::Window* pParent = pDlg->GetWindow( WINDOW_PARENTOVERLAP ); + vcl::Window* pParent = pDlg->GetWindow( GetWindowType::ParentOverlap ); vcl::Window* pOldParent = NULL; vcl::Window* pSetParent = NULL; if ( pParent && !pParent->IsReallyVisible() ) { pOldParent = pDlg->GetParent(); - vcl::Window* pFrame = pDlg->GetWindow( WINDOW_FRAME ); + vcl::Window* pFrame = pDlg->GetWindow( GetWindowType::Frame ); if( pFrame != pDlg ) { pDlg->SetParent( pFrame ); |