diff options
author | Noel Grandin <noel@peralex.com> | 2015-05-21 15:52:27 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-05-22 10:37:59 +0200 |
commit | 566922a98d548529feacb7c21bfc8897ff5b61af (patch) | |
tree | e55a4b26ac5b32d842efbc9d9e6dc5576b226005 /toolkit | |
parent | 321b34419160da6829e30fc67f3d107fcb936390 (diff) |
convert WINDOW constants for GetWindow() methods to scoped enum
Change-Id: I0c7c6d095732704eb4ab48f1277a0592b1c7fa33
Diffstat (limited to 'toolkit')
-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 | ||||
-rw-r--r-- | toolkit/source/helper/unowrapper.cxx | 18 |
4 files changed, 15 insertions, 15 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 ); diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index 56b620c62a77..eafa53906d8f 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -219,12 +219,12 @@ void UnoWrapper::WindowDestroyed( vcl::Window* pWindow ) { // their still might be some children created with ::com::sun::star::loader::Java // that would otherwise not be destroyed until the garbage collector cleans up - VclPtr< vcl::Window > pChild = pWindow->GetWindow( WINDOW_FIRSTCHILD ); + VclPtr< vcl::Window > pChild = pWindow->GetWindow( GetWindowType::FirstChild ); while ( pChild ) { - VclPtr< vcl::Window > pNextChild = pChild->GetWindow( WINDOW_NEXT ); + VclPtr< vcl::Window > pNextChild = pChild->GetWindow( GetWindowType::Next ); - VclPtr< vcl::Window > pClient = pChild->GetWindow( WINDOW_CLIENT ); + VclPtr< vcl::Window > pClient = pChild->GetWindow( GetWindowType::Client ); if ( pClient && pClient->GetWindowPeer() ) { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComp( pClient->GetComponentInterface( false ), ::com::sun::star::uno::UNO_QUERY ); @@ -235,14 +235,14 @@ void UnoWrapper::WindowDestroyed( vcl::Window* pWindow ) } // System-Windows suchen... - VclPtr< vcl::Window > pOverlap = pWindow->GetWindow( WINDOW_OVERLAP ); + VclPtr< vcl::Window > pOverlap = pWindow->GetWindow( GetWindowType::Overlap ); if ( pOverlap ) { - pOverlap = pOverlap->GetWindow( WINDOW_FIRSTOVERLAP ); + pOverlap = pOverlap->GetWindow( GetWindowType::FirstOverlap ); while ( pOverlap ) { - VclPtr< vcl::Window > pNextOverlap = pOverlap->GetWindow( WINDOW_NEXT ); - VclPtr< vcl::Window > pClient = pOverlap->GetWindow( WINDOW_CLIENT ); + VclPtr< vcl::Window > pNextOverlap = pOverlap->GetWindow( GetWindowType::Next ); + VclPtr< vcl::Window > pClient = pOverlap->GetWindow( GetWindowType::Client ); if ( pClient && pClient->GetWindowPeer() && lcl_ImplIsParent( pWindow, pClient ) ) { @@ -278,13 +278,13 @@ void UnoWrapper::WindowDestroyed( vcl::Window* pWindow ) // #i42462#/#116855# no, don't loop: Instead, just ensure that all our top-window-children // are disposed, too (which should also be a valid fix for #102132#, but doesn't have the extreme // performance penalties) - VclPtr< vcl::Window > pTopWindowChild = pWindow->GetWindow( WINDOW_FIRSTTOPWINDOWCHILD ); + VclPtr< vcl::Window > pTopWindowChild = pWindow->GetWindow( GetWindowType::FirstTopWindowChild ); while ( pTopWindowChild ) { OSL_ENSURE( pTopWindowChild->GetParent() == pWindow, "UnoWrapper::WindowDestroyed: inconsistency in the SystemWindow relationship!" ); - VclPtr< vcl::Window > pNextTopChild = pTopWindowChild->GetWindow( WINDOW_NEXTTOPWINDOWSIBLING ); + VclPtr< vcl::Window > pNextTopChild = pTopWindowChild->GetWindow( GetWindowType::NextTopWindowSibling ); //the window still could be on the stack, so we have to // use lazy delete ( it will automatically |