diff options
Diffstat (limited to 'vcl/source/window')
25 files changed, 121 insertions, 121 deletions
diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index 07abf759c92d..39befdabf728 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -180,7 +180,7 @@ bool Window::ImplIsAccessibleNativeFrame() const return false; } -sal_uInt16 Window::ImplGetAccessibleCandidateChildWindowCount( sal_uInt16 nFirstWindowType ) const +sal_uInt16 Window::ImplGetAccessibleCandidateChildWindowCount( GetWindowType nFirstWindowType ) const { sal_uInt16 nChildren = 0; vcl::Window* pChild = GetWindow( nFirstWindowType ); @@ -189,13 +189,13 @@ sal_uInt16 Window::ImplGetAccessibleCandidateChildWindowCount( sal_uInt16 nFirst if( pChild->ImplIsAccessibleCandidate() ) nChildren++; else - nChildren = sal::static_int_cast<sal_uInt16>(nChildren + pChild->ImplGetAccessibleCandidateChildWindowCount( WINDOW_FIRSTCHILD )); + nChildren = sal::static_int_cast<sal_uInt16>(nChildren + pChild->ImplGetAccessibleCandidateChildWindowCount( GetWindowType::FirstChild )); pChild = pChild->mpWindowImpl->mpNext; } return nChildren; } -vcl::Window* Window::ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& rChildCount, sal_uInt16 nFirstWindowType, bool bTopLevel ) const +vcl::Window* Window::ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& rChildCount, GetWindowType nFirstWindowType, bool bTopLevel ) const { if( bTopLevel ) @@ -207,7 +207,7 @@ vcl::Window* Window::ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uIn vcl::Window *pTmpChild = pChild; if( !pChild->ImplIsAccessibleCandidate() ) - pTmpChild = pChild->ImplGetAccessibleCandidateChild( nChild, rChildCount, WINDOW_FIRSTCHILD, false ); + pTmpChild = pChild->ImplGetAccessibleCandidateChild( nChild, rChildCount, GetWindowType::FirstChild, false ); if ( nChild == rChildCount ) return pTmpChild; diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 25caed82bbb3..06fb92130230 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1016,7 +1016,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei pWin = static_cast<vcl::Window*>(mpOutDev.get()); if (pWin) - pCtrl = mpBorderWindow->GetWindow(WINDOW_CLIENT); + pCtrl = mpBorderWindow->GetWindow(GetWindowType::Client); long nOrigLeftBorder = mnLeftBorder; long nOrigTopBorder = mnTopBorder; @@ -1199,7 +1199,7 @@ void ImplSmallBorderWindowView::DrawWindow(vcl::RenderContext& rRenderContext, s ControlType aCtrlType = 0; ControlPart aCtrlPart = PART_ENTIRE_CONTROL; - if (pWin && (pCtrl = mpBorderWindow->GetWindow(WINDOW_CLIENT)) != NULL) + if (pWin && (pCtrl = mpBorderWindow->GetWindow(GetWindowType::Client)) != NULL) { switch (pCtrl->GetType()) { @@ -1282,10 +1282,10 @@ void ImplSmallBorderWindowView::DrawWindow(vcl::RenderContext& rRenderContext, s } bool bMouseOver = false; - vcl::Window *pCtrlChild = pCtrl->GetWindow(WINDOW_FIRSTCHILD); + vcl::Window *pCtrlChild = pCtrl->GetWindow(GetWindowType::FirstChild); while(pCtrlChild && !(bMouseOver = pCtrlChild->IsMouseOver())) { - pCtrlChild = pCtrlChild->GetWindow(WINDOW_NEXT); + pCtrlChild = pCtrlChild->GetWindow(GetWindowType::Next); } if (bMouseOver) @@ -1577,7 +1577,7 @@ void ImplStdBorderWindowView::DrawWindow(vcl::RenderContext& rRenderContext, sal // for popups, don't draw part of the frame if (pData->mnTitleType == BORDERWINDOW_TITLE_POPUP) { - FloatingWindow* pWin = dynamic_cast<FloatingWindow*>(pData->mpBorderWindow->GetWindow(WINDOW_CLIENT)); + FloatingWindow* pWin = dynamic_cast<FloatingWindow*>(pData->mpBorderWindow->GetWindow(GetWindowType::Client)); if (pWin) { vcl::Region aClipRgn(aInRect); diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 645338674715..64d08c4f2559 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -484,7 +484,7 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUStr VclExpander *pOne = *aI; vcl::Window *pChild = pOne->get_child(); - vcl::Window* pLabel = pOne->GetWindow(WINDOW_LASTCHILD); + vcl::Window* pLabel = pOne->GetWindow(GetWindowType::LastChild); if (pLabel && pLabel != pChild && pLabel->GetType() == WINDOW_FIXEDTEXT) { FixedText *pLabelWidget = static_cast<FixedText*>(pLabel); @@ -2110,8 +2110,8 @@ void VclBuilder::handleChild(vcl::Window *pParent, xmlreader::XmlReader &reader) //To-Do make reorder a virtual in Window, move this foo //there and see above std::vector<vcl::Window*> aChilds; - for (vcl::Window* pChild = pCurrentChild->GetWindow(WINDOW_FIRSTCHILD); pChild; - pChild = pChild->GetWindow(WINDOW_NEXT)) + for (vcl::Window* pChild = pCurrentChild->GetWindow(GetWindowType::FirstChild); pChild; + pChild = pChild->GetWindow(GetWindowType::Next)) { aChilds.push_back(pChild); } diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index d0f42755a893..3ef2bc95bf40 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -638,7 +638,7 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle& rRect, if( bFlatBorders && pWin && pWin->GetType() == WINDOW_BORDERWINDOW && (pWin != pWin->ImplGetFrameWindow()) ) { // check for formcontrol, i.e., a control without NWF enabled - Control *const pControl = dynamic_cast< Control* >( pWin->GetWindow( WINDOW_CLIENT ) ); + Control *const pControl = dynamic_cast< Control* >( pWin->GetWindow( GetWindowType::Client ) ); if( !pControl || !pControl->IsNativeWidgetEnabled() ) bFlatBorders = false; } diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index e4aa836ffc18..72652ae48577 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -93,10 +93,10 @@ static bool ImplIsMnemonicCtrl( vcl::Window* pWindow ) //until we can be sure we can remove it if ( pWindow->GetStyle() & (WB_INFO | WB_NOLABEL) ) return false; - vcl::Window* pNextWindow = pWindow->GetWindow( WINDOW_NEXT ); + vcl::Window* pNextWindow = pWindow->GetWindow( GetWindowType::Next ); if ( !pNextWindow ) return false; - pNextWindow = pNextWindow->GetWindow( WINDOW_CLIENT ); + pNextWindow = pNextWindow->GetWindow( GetWindowType::Client ); if ( !(pNextWindow->GetStyle() & WB_TABSTOP) || (pNextWindow->GetType() == WINDOW_FIXEDTEXT) || (pNextWindow->GetType() == WINDOW_GROUPBOX) || @@ -127,9 +127,9 @@ vcl::Window * nextLogicalChildOfParent(vcl::Window *pTopLevel, vcl::Window *pChi vcl::Window *pLastChild = pChild; if (isContainerWindow(*pChild)) - pChild = pChild->GetWindow(WINDOW_FIRSTCHILD); + pChild = pChild->GetWindow(GetWindowType::FirstChild); else - pChild = pChild->GetWindow(WINDOW_NEXT); + pChild = pChild->GetWindow(GetWindowType::Next); while (!pChild) { @@ -139,7 +139,7 @@ vcl::Window * nextLogicalChildOfParent(vcl::Window *pTopLevel, vcl::Window *pChi if (pParent == pTopLevel) return NULL; pLastChild = pParent; - pChild = pParent->GetWindow(WINDOW_NEXT); + pChild = pParent->GetWindow(GetWindowType::Next); } if (pChild && isContainerWindow(*pChild)) @@ -153,9 +153,9 @@ vcl::Window * prevLogicalChildOfParent(vcl::Window *pTopLevel, vcl::Window *pChi vcl::Window *pLastChild = pChild; if (isContainerWindow(*pChild)) - pChild = pChild->GetWindow(WINDOW_LASTCHILD); + pChild = pChild->GetWindow(GetWindowType::LastChild); else - pChild = pChild->GetWindow(WINDOW_PREV); + pChild = pChild->GetWindow(GetWindowType::Prev); while (!pChild) { @@ -165,7 +165,7 @@ vcl::Window * prevLogicalChildOfParent(vcl::Window *pTopLevel, vcl::Window *pChi if (pParent == pTopLevel) return NULL; pLastChild = pParent; - pChild = pParent->GetWindow(WINDOW_PREV); + pChild = pParent->GetWindow(GetWindowType::Prev); } if (pChild && isContainerWindow(*pChild)) @@ -178,7 +178,7 @@ vcl::Window * prevLogicalChildOfParent(vcl::Window *pTopLevel, vcl::Window *pChi //if any intermediate layout widgets didn't exist vcl::Window * firstLogicalChildOfParent(vcl::Window *pTopLevel) { - vcl::Window *pChild = pTopLevel->GetWindow(WINDOW_FIRSTCHILD); + vcl::Window *pChild = pTopLevel->GetWindow(GetWindowType::FirstChild); if (pChild && isContainerWindow(*pChild)) pChild = nextLogicalChildOfParent(pTopLevel, pChild); return pChild; @@ -191,7 +191,7 @@ void ImplWindowAutoMnemonic( vcl::Window* pWindow ) vcl::Window* pChild; // register the assigned mnemonics - pGetChild = pWindow->GetWindow( WINDOW_FIRSTCHILD ); + pGetChild = pWindow->GetWindow( GetWindowType::FirstChild ); while ( pGetChild ) { pChild = pGetChild->ImplGetWindow(); @@ -208,7 +208,7 @@ void ImplWindowAutoMnemonic( vcl::Window* pWindow ) if ( (pParent->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) == WB_DIALOGCONTROL ) { - pGetChild = pParent->GetWindow( WINDOW_FIRSTCHILD ); + pGetChild = pParent->GetWindow( GetWindowType::FirstChild ); while ( pGetChild ) { pChild = pGetChild->ImplGetWindow(); @@ -219,7 +219,7 @@ void ImplWindowAutoMnemonic( vcl::Window* pWindow ) } // assign mnemonics to Controls which have none - pGetChild = pWindow->GetWindow( WINDOW_FIRSTCHILD ); + pGetChild = pWindow->GetWindow( GetWindowType::FirstChild ); while ( pGetChild ) { pChild = pGetChild->ImplGetWindow(); @@ -240,14 +240,14 @@ static VclButtonBox* getActionArea(Dialog *pDialog) VclButtonBox *pButtonBox = NULL; if (pDialog->isLayoutEnabled()) { - vcl::Window *pBox = pDialog->GetWindow(WINDOW_FIRSTCHILD); - vcl::Window *pChild = pBox->GetWindow(WINDOW_LASTCHILD); + vcl::Window *pBox = pDialog->GetWindow(GetWindowType::FirstChild); + vcl::Window *pChild = pBox->GetWindow(GetWindowType::LastChild); while (pChild) { pButtonBox = dynamic_cast<VclButtonBox*>(pChild); if (pButtonBox) break; - pChild = pChild->GetWindow(WINDOW_PREV); + pChild = pChild->GetWindow(GetWindowType::Prev); } } return pButtonBox; @@ -257,8 +257,8 @@ static vcl::Window* getActionAreaButtonList(Dialog *pDialog) { VclButtonBox* pButtonBox = getActionArea(pDialog); if (pButtonBox) - return pButtonBox->GetWindow(WINDOW_FIRSTCHILD); - return pDialog->GetWindow(WINDOW_FIRSTCHILD); + return pButtonBox->GetWindow(GetWindowType::FirstChild); + return pDialog->GetWindow(GetWindowType::FirstChild); } static PushButton* ImplGetDefaultButton( Dialog* pDialog ) @@ -273,7 +273,7 @@ static PushButton* ImplGetDefaultButton( Dialog* pDialog ) return pPushButton; } - pChild = pChild->GetWindow( WINDOW_NEXT ); + pChild = pChild->GetWindow( GetWindowType::Next ); } return NULL; @@ -287,7 +287,7 @@ static PushButton* ImplGetOKButton( Dialog* pDialog ) if ( pChild->GetType() == WINDOW_OKBUTTON ) return static_cast<PushButton*>(pChild); - pChild = pChild->GetWindow( WINDOW_NEXT ); + pChild = pChild->GetWindow( GetWindowType::Next ); } return NULL; @@ -302,7 +302,7 @@ static PushButton* ImplGetCancelButton( Dialog* pDialog ) if ( pChild->GetType() == WINDOW_CANCELBUTTON ) return static_cast<PushButton*>(pChild); - pChild = pChild->GetWindow( WINDOW_NEXT ); + pChild = pChild->GetWindow( GetWindowType::Next ); } return NULL; diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index e927590c4da9..ef47cd059059 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -102,7 +102,7 @@ static vcl::Window* ImplGetSubChildWindow( vcl::Window* pParent, sal_uInt16 n, s TabPage* pTempTabPage = pTabControl->GetTabPage( pTabControl->GetCurPageId() ); if ( pTempTabPage ) { - vcl::Window* pTempWindow = pTabControl->GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window* pTempWindow = pTabControl->GetWindow( GetWindowType::FirstChild ); while ( pTempWindow ) { if ( pTempWindow->ImplGetWindow() == pTempTabPage ) diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index b9bfd03b3f84..38111425583e 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -166,7 +166,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) // we allow docking only when the window was moved // by dragging its caption // and ignore move request due to resizing - vcl::Window *pBorder = GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = GetWindow( GetWindowType::Border ); if( pBorder != this ) { Point aPt; @@ -249,7 +249,7 @@ void ImplDockFloatWin2::Move() void ImplDockFloatWin2::Resize() { // forwarding of resize only required if we have no borderwindow ( GetWindow() then returns 'this' ) - if( GetWindow( WINDOW_BORDER ) == this ) + if( GetWindow( GetWindowType::Border ) == this ) { FloatingWindow::Resize(); Size aSize( GetSizePixel() ); @@ -761,7 +761,7 @@ void ImplPopupFloatWin::MouseButtonDown( const MouseEvent& rMEvt ) PointerState aState = GetParent()->GetPointerState(); if (HasMirroredGraphics() && IsRTLEnabled()) ImplMirrorFramePos(aState.maPos); - maTearOffPosition = GetWindow( WINDOW_BORDER )->GetPosPixel(); + maTearOffPosition = GetWindow( GetWindowType::Border )->GetPosPixel(); maDelta = aState.maPos - maTearOffPosition; mbTrackingEnabled = true; } @@ -788,7 +788,7 @@ void ImplPopupFloatWin::Tracking( const TrackingEvent& rTEvt ) if (pOutDev->HasMirroredGraphics() && IsRTLEnabled()) ImplMirrorFramePos(aState.maPos); maTearOffPosition = aState.maPos - maDelta; - GetWindow( WINDOW_BORDER )->SetPosPixel( maTearOffPosition ); + GetWindow( GetWindowType::Border )->SetPosPixel( maTearOffPosition ); } } } @@ -1107,8 +1107,8 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin GetWindow()->Show( false, SHOW_NOFOCUSCHANGE ); // prepare reparenting - vcl::Window* pRealParent = GetWindow()->GetWindow( WINDOW_PARENT ); - mpOldBorderWin = GetWindow()->GetWindow( WINDOW_BORDER ); + vcl::Window* pRealParent = GetWindow()->GetWindow( GetWindowType::Parent ); + mpOldBorderWin = GetWindow()->GetWindow( GetWindowType::Border ); if( mpOldBorderWin.get() == GetWindow() ) mpOldBorderWin = NULL; // no border window found @@ -1168,7 +1168,7 @@ IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd) EndPopupModeData aData( pPopupFloatWin->GetTearOffPosition(), mpFloatWin->IsPopupModeTearOff() ); // before deleting change parent back, so we can delete the floating window alone - vcl::Window* pRealParent = GetWindow()->GetWindow( WINDOW_PARENT ); + vcl::Window* pRealParent = GetWindow()->GetWindow( GetWindowType::Parent ); GetWindow()->mpWindowImpl->mpBorderWindow = NULL; if ( mpOldBorderWin ) { @@ -1216,8 +1216,8 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode ) maDockPos = GetWindow()->GetPosPixel(); - vcl::Window* pRealParent = GetWindow()->GetWindow( WINDOW_PARENT ); - mpOldBorderWin = GetWindow()->GetWindow( WINDOW_BORDER ); + vcl::Window* pRealParent = GetWindow()->GetWindow( GetWindowType::Parent ); + mpOldBorderWin = GetWindow()->GetWindow( GetWindowType::Border ); if( mpOldBorderWin == mpDockingWindow ) mpOldBorderWin = NULL; // no border window found @@ -1283,7 +1283,7 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode ) maMinOutSize = mpFloatWin->GetMinOutputSizePixel(); maMaxOutSize = mpFloatWin->GetMaxOutputSizePixel(); - vcl::Window* pRealParent = GetWindow()->GetWindow( WINDOW_PARENT ); //mpWindowImpl->mpRealParent; + vcl::Window* pRealParent = GetWindow()->GetWindow( GetWindowType::Parent ); //mpWindowImpl->mpRealParent; GetWindow()->mpWindowImpl->mpBorderWindow = NULL; if ( mpOldBorderWin ) { diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index b8068c1c5e94..2c4704d8b6fb 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -940,7 +940,7 @@ void DockingWindow::setPosSizePixel( long nX, long nY, aSize.Height() -= 2 * nBorderWidth; Point aPos(nBorderWidth, nBorderWidth); - Window *pBox = GetWindow(WINDOW_FIRSTCHILD); + Window *pBox = GetWindow(GetWindowType::FirstChild); assert(pBox); VclContainer::setLayoutAllocation(*pBox, aPos, aSize); } @@ -1085,7 +1085,7 @@ void DockingWindow::setOptimalLayoutSize() maLayoutIdle.Stop(); //resize DockingWindow to fit requisition on initial show - Window *pBox = GetWindow(WINDOW_FIRSTCHILD); + Window *pBox = GetWindow(GetWindowType::FirstChild); Size aSize = get_preferred_size(); @@ -1115,7 +1115,7 @@ Size DockingWindow::GetOptimalSize() const if (!isLayoutEnabled()) return Window::GetOptimalSize(); - Size aSize = VclContainer::getLayoutRequisition(*GetWindow(WINDOW_FIRSTCHILD)); + Size aSize = VclContainer::getLayoutRequisition(*GetWindow(GetWindowType::FirstChild)); sal_Int32 nBorderWidth = get_border_width(); @@ -1145,7 +1145,7 @@ IMPL_LINK_NOARG_TYPED(DockingWindow, ImplHandleLayoutTimerHdl, Idle*, void) return; } - Window *pBox = GetWindow(WINDOW_FIRSTCHILD); + Window *pBox = GetWindow(GetWindowType::FirstChild); assert(pBox); setPosSizeOnContainee(GetSizePixel(), *pBox); } diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 5d11517c7cd7..8474188c7fab 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -478,7 +478,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( vcl::Window* pReference, const // compute the floating window's size in absolute screen coordinates // use the border window to have the exact position - vcl::Window *pBorderWin = pWin->GetWindow( WINDOW_BORDER ); + vcl::Window *pBorderWin = pWin->GetWindow( GetWindowType::Border ); Point aPt; // the top-left corner in output coordinates ie (0,0) Rectangle devRect( pBorderWin->ImplOutputToUnmirroredAbsoluteScreenPixel( Rectangle( aPt, pBorderWin->GetSizePixel()) ) ) ; diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index c8bffb54751c..226359690ae7 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -182,7 +182,7 @@ Size VclBox::calculateRequisition() const sal_uInt16 nVisibleChildren = 0; Size aSize; - for (vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) + for (vcl::Window *pChild = GetWindow(GetWindowType::FirstChild); pChild; pChild = pChild->GetWindow(GetWindowType::Next)) { if (!pChild->IsVisible()) continue; @@ -202,7 +202,7 @@ Size VclBox::calculateRequisition() const void VclBox::setAllocation(const Size &rAllocation) { sal_uInt16 nVisibleChildren = 0, nExpandChildren = 0; - for (vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) + for (vcl::Window *pChild = GetWindow(GetWindowType::FirstChild); pChild; pChild = pChild->GetWindow(GetWindowType::Next)) { if (!pChild->IsVisible()) continue; @@ -231,7 +231,7 @@ void VclBox::setAllocation(const Size &rAllocation) //Split into those we pack from the start onwards, and those we pack from the end backwards std::vector<vcl::Window*> aWindows[2]; - for (vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) + for (vcl::Window *pChild = GetWindow(GetWindowType::FirstChild); pChild; pChild = pChild->GetWindow(GetWindowType::Next)) { if (!pChild->IsVisible()) continue; @@ -427,7 +427,7 @@ VclButtonBox::Requisition VclButtonBox::calculatePrimarySecondaryRequisitions() std::vector<long> aSubGroupSizes; std::vector<bool> aSubGroupNonHomogeneous; - for (const vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) + for (const vcl::Window *pChild = GetWindow(GetWindowType::FirstChild); pChild; pChild = pChild->GetWindow(GetWindowType::Next)) { if (!pChild->IsVisible()) continue; @@ -621,7 +621,7 @@ void VclButtonBox::setAllocation(const Size &rAllocation) std::vector<long>::const_iterator aPrimaryI = aReq.m_aMainGroupDimensions.begin(); std::vector<long>::const_iterator aSecondaryI = aReq.m_aSubGroupDimensions.begin(); bool bIgnoreSecondaryPacking = (m_eLayoutStyle == VCL_BUTTONBOX_SPREAD || m_eLayoutStyle == VCL_BUTTONBOX_CENTER); - for (vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) + for (vcl::Window *pChild = GetWindow(GetWindowType::FirstChild); pChild; pChild = pChild->GetWindow(GetWindowType::Next)) { if (!pChild->IsVisible()) continue; @@ -736,8 +736,8 @@ bool sortButtons::operator()(const vcl::Window *pA, const vcl::Window *pB) const void VclButtonBox::sort_native_button_order() { std::vector<vcl::Window*> aChilds; - for (vcl::Window* pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; - pChild = pChild->GetWindow(WINDOW_NEXT)) + for (vcl::Window* pChild = GetWindow(GetWindowType::FirstChild); pChild; + pChild = pChild->GetWindow(GetWindowType::Next)) { aChilds.push_back(pChild); } @@ -752,8 +752,8 @@ VclGrid::array_type VclGrid::assembleGrid() const { ext_array_type A; - for (vcl::Window* pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; - pChild = pChild->GetWindow(WINDOW_NEXT)) + for (vcl::Window* pChild = GetWindow(GetWindowType::FirstChild); pChild; + pChild = pChild->GetWindow(GetWindowType::Next)) { sal_Int32 nLeftAttach = std::max<sal_Int32>(pChild->get_grid_left_attach(), 0); sal_Int32 nWidth = pChild->get_grid_width(); @@ -1490,7 +1490,7 @@ const vcl::Window *VclExpander::get_child() const assert(pWindowImpl->mpFirstChild == m_pDisclosureButton); - return pWindowImpl->mpFirstChild->GetWindow(WINDOW_NEXT); + return pWindowImpl->mpFirstChild->GetWindow(GetWindowType::Next); } vcl::Window *VclExpander::get_child() @@ -1654,7 +1654,7 @@ IMPL_LINK_NOARG(VclScrolledWindow, ScrollBarHdl) assert(dynamic_cast<VclViewport*>(pChild) && "scrolledwindow child should be a Viewport"); - pChild = pChild->GetWindow(WINDOW_FIRSTCHILD); + pChild = pChild->GetWindow(GetWindowType::FirstChild); if (!pChild) return 1; @@ -1862,7 +1862,7 @@ const vcl::Window *VclEventBox::get_child() const assert(pWindowImpl->mpFirstChild.get() == m_aEventBoxHelper.get()); - return pWindowImpl->mpFirstChild->GetWindow(WINDOW_NEXT); + return pWindowImpl->mpFirstChild->GetWindow(GetWindowType::Next); } vcl::Window *VclEventBox::get_child() @@ -1873,7 +1873,7 @@ vcl::Window *VclEventBox::get_child() void VclEventBox::setAllocation(const Size& rAllocation) { Point aChildPos(0, 0); - for (vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) + for (vcl::Window *pChild = GetWindow(GetWindowType::FirstChild); pChild; pChild = pChild->GetWindow(GetWindowType::Next)) { if (!pChild->IsVisible()) continue; @@ -1886,7 +1886,7 @@ Size VclEventBox::calculateRequisition() const Size aRet(0, 0); for (const vcl::Window* pChild = get_child(); pChild; - pChild = pChild->GetWindow(WINDOW_NEXT)) + pChild = pChild->GetWindow(GetWindowType::Next)) { if (!pChild->IsVisible()) continue; @@ -2072,8 +2072,8 @@ short MessageDialog::get_response(const vcl::Window *pWindow) const void MessageDialog::setButtonHandlers(VclButtonBox *pButtonBox) { assert(pButtonBox); - for (vcl::Window* pChild = pButtonBox->GetWindow(WINDOW_FIRSTCHILD); pChild; - pChild = pChild->GetWindow(WINDOW_NEXT)) + for (vcl::Window* pChild = pButtonBox->GetWindow(GetWindowType::FirstChild); pChild; + pChild = pChild->GetWindow(GetWindowType::Next)) { switch (pChild->GetType()) { @@ -2334,8 +2334,8 @@ Size getLegacyBestSizeForChildren(const vcl::Window &rWindow) { Rectangle aBounds; - for (const vcl::Window* pChild = rWindow.GetWindow(WINDOW_FIRSTCHILD); pChild; - pChild = pChild->GetWindow(WINDOW_NEXT)) + for (const vcl::Window* pChild = rWindow.GetWindow(GetWindowType::FirstChild); pChild; + pChild = pChild->GetWindow(GetWindowType::Next)) { if (!pChild->IsVisible()) continue; @@ -2406,8 +2406,8 @@ bool isEnabledInLayout(const vcl::Window *pWindow) bool isLayoutEnabled(const vcl::Window *pWindow) { //Child is a container => we're layout enabled - const vcl::Window *pChild = pWindow ? pWindow->GetWindow(WINDOW_FIRSTCHILD) : NULL; - return pChild && isContainerWindow(*pChild) && !pChild->GetWindow(WINDOW_NEXT); + const vcl::Window *pChild = pWindow ? pWindow->GetWindow(GetWindowType::FirstChild) : NULL; + return pChild && isContainerWindow(*pChild) && !pChild->GetWindow(GetWindowType::Next); } bool isInitialLayout(const vcl::Window *pWindow) diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 9d1dee066889..34c485de80c5 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2975,7 +2975,7 @@ sal_uInt16 PopupMenu::ImplExecute( vcl::Window* pW, const Rectangle& rRect, Floa Rectangle aDesktopRect(pWin->GetDesktopRectPixel()); if( Application::GetScreenCount() > 1 && Application::IsUnifiedDisplay() ) { - vcl::Window* pDeskW = pWindow->GetWindow( WINDOW_REALPARENT ); + vcl::Window* pDeskW = pWindow->GetWindow( GetWindowType::RealParent ); if( ! pDeskW ) pDeskW = pWindow; Point aDesktopTL( pDeskW->OutputToAbsoluteScreenPixel( aRect.TopLeft() ) ); diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index 7cbc158d0128..cf6573ed635a 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -533,12 +533,12 @@ static int ImplGetTopDockingAreaHeight( vcl::Window *pWindow ) // note: dockingareas are direct children of the SystemWindow if( pWindow->ImplGetFrameWindow() ) { - vcl::Window *pWin = pWindow->ImplGetFrameWindow()->GetWindow( WINDOW_FIRSTCHILD ); //mpWindowImpl->mpFirstChild; + vcl::Window *pWin = pWindow->ImplGetFrameWindow()->GetWindow( GetWindowType::FirstChild ); //mpWindowImpl->mpFirstChild; while( pWin ) { if( pWin->IsSystemWindow() ) { - vcl::Window *pChildWin = pWin->GetWindow( WINDOW_FIRSTCHILD ); //mpWindowImpl->mpFirstChild; + vcl::Window *pChildWin = pWin->GetWindow( GetWindowType::FirstChild ); //mpWindowImpl->mpFirstChild; while( pChildWin ) { DockingAreaWindow *pDockingArea = NULL; @@ -551,12 +551,12 @@ static int ImplGetTopDockingAreaHeight( vcl::Window *pWindow ) return pDockingArea->GetOutputSizePixel().Height(); } - pChildWin = pChildWin->GetWindow( WINDOW_NEXT ); //mpWindowImpl->mpNext; + pChildWin = pChildWin->GetWindow( GetWindowType::Next ); //mpWindowImpl->mpNext; } } - pWin = pWin->GetWindow( WINDOW_NEXT ); //mpWindowImpl->mpNext; + pWin = pWin->GetWindow( GetWindowType::Next ); //mpWindowImpl->mpNext; } } return 0; @@ -716,9 +716,9 @@ bool MenuBarWindow::HandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu ) if( GetParent() ) { - if( GetParent()->GetWindow( WINDOW_CLIENT )->IsSystemWindow() ) + if( GetParent()->GetWindow( GetWindowType::Client )->IsSystemWindow() ) { - SystemWindow *pSysWin = static_cast<SystemWindow*>(GetParent()->GetWindow( WINDOW_CLIENT )); + SystemWindow *pSysWin = static_cast<SystemWindow*>(GetParent()->GetWindow( GetWindowType::Client )); if( pSysWin->GetTaskPaneList() ) if( pSysWin->GetTaskPaneList()->HandleKeyEvent( rKEvent ) ) return true; diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index 5aeed11a45ab..7a4a8262dfa6 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -406,7 +406,7 @@ void Window::ImplGrabFocusToDocument( sal_uInt16 nFlags ) { if( !pWin->GetParent() ) { - pWin->ImplGetFrameWindow()->GetWindow( WINDOW_CLIENT )->ImplGrabFocus(nFlags); + pWin->ImplGetFrameWindow()->GetWindow( GetWindowType::Client )->ImplGrabFocus(nFlags); return; } pWin = pWin->GetParent(); diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index 2217797ced8e..ff30617795fa 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -182,7 +182,7 @@ void Splitter::SetKeyboardStepSize( long nStepSize ) Splitter* Splitter::ImplFindSibling() { // look for another splitter with the same parent but different orientation - vcl::Window *pWin = GetParent()->GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window *pWin = GetParent()->GetWindow( GetWindowType::FirstChild ); Splitter *pSplitter = NULL; while( pWin ) { @@ -192,7 +192,7 @@ Splitter* Splitter::ImplFindSibling() if( pSplitter != this && IsHorizontal() != pSplitter->IsHorizontal() ) return pSplitter; } - pWin = pWin->GetWindow( WINDOW_NEXT ); + pWin = pWin->GetWindow( GetWindowType::Next ); } return NULL; } diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx index ccf60ca60f5f..dc0f78e78d72 100644 --- a/vcl/source/window/stacking.cxx +++ b/vcl/source/window/stacking.cxx @@ -1054,67 +1054,67 @@ vcl::Window* Window::GetChild( sal_uInt16 nChild ) const return NULL; } -vcl::Window* Window::GetWindow( sal_uInt16 nType ) const +vcl::Window* Window::GetWindow( GetWindowType nType ) const { if (!mpWindowImpl) return 0; switch ( nType ) { - case WINDOW_PARENT: + case GetWindowType::Parent: return mpWindowImpl->mpRealParent; - case WINDOW_FIRSTCHILD: + case GetWindowType::FirstChild: return mpWindowImpl->mpFirstChild; - case WINDOW_LASTCHILD: + case GetWindowType::LastChild: return mpWindowImpl->mpLastChild; - case WINDOW_PREV: + case GetWindowType::Prev: return mpWindowImpl->mpPrev; - case WINDOW_NEXT: + case GetWindowType::Next: return mpWindowImpl->mpNext; - case WINDOW_FIRSTOVERLAP: + case GetWindowType::FirstOverlap: return mpWindowImpl->mpFirstOverlap; - case WINDOW_LASTOVERLAP: + case GetWindowType::LastOverlap: return mpWindowImpl->mpLastOverlap; - case WINDOW_OVERLAP: + case GetWindowType::Overlap: if ( ImplIsOverlapWindow() ) return const_cast<vcl::Window*>(this); else return mpWindowImpl->mpOverlapWindow; - case WINDOW_PARENTOVERLAP: + case GetWindowType::ParentOverlap: if ( ImplIsOverlapWindow() ) return mpWindowImpl->mpOverlapWindow; else return mpWindowImpl->mpOverlapWindow->mpWindowImpl->mpOverlapWindow; - case WINDOW_CLIENT: + case GetWindowType::Client: return const_cast<vcl::Window*>(this)->ImplGetWindow(); - case WINDOW_REALPARENT: + case GetWindowType::RealParent: return ImplGetParent(); - case WINDOW_FRAME: + case GetWindowType::Frame: return mpWindowImpl->mpFrameWindow; - case WINDOW_BORDER: + case GetWindowType::Border: if ( mpWindowImpl->mpBorderWindow ) - return mpWindowImpl->mpBorderWindow->GetWindow( WINDOW_BORDER ); + return mpWindowImpl->mpBorderWindow->GetWindow( GetWindowType::Border ); return const_cast<vcl::Window*>(this); - case WINDOW_FIRSTTOPWINDOWCHILD: + case GetWindowType::FirstTopWindowChild: return ImplGetWinData()->maTopWindowChildren.empty() ? NULL : (*ImplGetWinData()->maTopWindowChildren.begin()).get(); - case WINDOW_LASTTOPWINDOWCHILD: + case GetWindowType::LastTopWindowChild: return ImplGetWinData()->maTopWindowChildren.empty() ? NULL : (*ImplGetWinData()->maTopWindowChildren.rbegin()).get(); - case WINDOW_PREVTOPWINDOWSIBLING: + case GetWindowType::PrevTopWindowSibling: { if ( !mpWindowImpl->mpRealParent ) return NULL; @@ -1128,7 +1128,7 @@ vcl::Window* Window::GetWindow( sal_uInt16 nType ) const return *--myPos; } - case WINDOW_NEXTTOPWINDOWSIBLING: + case GetWindowType::NextTopWindowSibling: { if ( !mpWindowImpl->mpRealParent ) return NULL; diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index a2c46eead160..07c087dcf7ab 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -1028,7 +1028,7 @@ Size SystemWindow::GetOptimalSize() const if (!isLayoutEnabled()) return Window::GetOptimalSize(); - Size aSize = VclContainer::getLayoutRequisition(*GetWindow(WINDOW_FIRSTCHILD)); + Size aSize = VclContainer::getLayoutRequisition(*GetWindow(GetWindowType::FirstChild)); sal_Int32 nBorderWidth = get_border_width(); @@ -1059,7 +1059,7 @@ IMPL_LINK_NOARG_TYPED( SystemWindow, ImplHandleLayoutTimerHdl, Idle*, void ) return; } - Window *pBox = GetWindow(WINDOW_FIRSTCHILD); + Window *pBox = GetWindow(GetWindowType::FirstChild); assert(pBox); setPosSizeOnContainee(GetSizePixel(), *pBox); } @@ -1085,7 +1085,7 @@ void SystemWindow::setOptimalLayoutSize() maLayoutIdle.Stop(); //resize SystemWindow to fit requisition on initial show - Window *pBox = GetWindow(WINDOW_FIRSTCHILD); + Window *pBox = GetWindow(GetWindowType::FirstChild); settingOptimalLayoutSize(pBox); diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx index a99daecc3390..47e9912bfc73 100644 --- a/vcl/source/window/tabdlg.cxx +++ b/vcl/source/window/tabdlg.cxx @@ -41,7 +41,7 @@ void TabDialog::ImplPosControls() long nOffY = 0; vcl::Window* pTabControl = NULL; - vcl::Window* pChild = GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window* pChild = GetWindow( GetWindowType::FirstChild ); while ( pChild ) { if ( pChild->IsVisible() && (pChild != mpViewWindow) ) @@ -67,7 +67,7 @@ void TabDialog::ImplPosControls() } } - pChild = pChild->GetWindow( WINDOW_NEXT ); + pChild = pChild->GetWindow( GetWindowType::Next ); } // do we have a TabControl ? @@ -155,7 +155,7 @@ void TabDialog::ImplPosControls() if ( nCtrlBarWidth <= (aTabSize.Width()+nBtnEx) ) nX = (aTabSize.Width()+nBtnEx) - nCtrlBarWidth + IMPL_DIALOG_OFFSET; - vcl::Window* pChild2 = GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window* pChild2 = GetWindow( GetWindowType::FirstChild ); while ( pChild2 ) { if ( pChild2->IsVisible() && (pChild2 != mpViewWindow) ) @@ -185,7 +185,7 @@ void TabDialog::ImplPosControls() } } - pChild2 = pChild2->GetWindow( WINDOW_NEXT ); + pChild2 = pChild2->GetWindow( GetWindowType::Next ); } aDlgSize.Height() += nLines * (aCtrlSize.Height()+IMPL_DIALOG_OFFSET); diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index 787411221f6e..0f326758683a 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -187,14 +187,14 @@ OString TabPage::GetConfigId() const { OString sId(GetHelpId()); if (sId.isEmpty() && isLayoutEnabled(this)) - sId = GetWindow(WINDOW_FIRSTCHILD)->GetHelpId(); + sId = GetWindow(GetWindowType::FirstChild)->GetHelpId(); return sId; } Size TabPage::GetOptimalSize() const { if (isLayoutEnabled(this)) - return VclContainer::getLayoutRequisition(*GetWindow(WINDOW_FIRSTCHILD)); + return VclContainer::getLayoutRequisition(*GetWindow(GetWindowType::FirstChild)); return getLegacyBestSizeForChildren(*this); } @@ -202,14 +202,14 @@ void TabPage::SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation) { Window::SetPosSizePixel(rAllocPos, rAllocation); if (isLayoutEnabled(this) && rAllocation.Width() && rAllocation.Height()) - VclContainer::setLayoutAllocation(*GetWindow(WINDOW_FIRSTCHILD), Point(0, 0), rAllocation); + VclContainer::setLayoutAllocation(*GetWindow(GetWindowType::FirstChild), Point(0, 0), rAllocation); } void TabPage::SetSizePixel(const Size& rAllocation) { Window::SetSizePixel(rAllocation); if (isLayoutEnabled(this) && rAllocation.Width() && rAllocation.Height()) - VclContainer::setLayoutAllocation(*GetWindow(WINDOW_FIRSTCHILD), Point(0, 0), rAllocation); + VclContainer::setLayoutAllocation(*GetWindow(GetWindowType::FirstChild), Point(0, 0), rAllocation); } void TabPage::SetPosPixel(const Point& rAllocPos) @@ -218,7 +218,7 @@ void TabPage::SetPosPixel(const Point& rAllocPos) Size aAllocation(GetOutputSizePixel()); if (isLayoutEnabled(this) && aAllocation.Width() && aAllocation.Height()) { - VclContainer::setLayoutAllocation(*GetWindow(WINDOW_FIRSTCHILD), Point(0, 0), aAllocation); + VclContainer::setLayoutAllocation(*GetWindow(GetWindowType::FirstChild), Point(0, 0), aAllocation); } } diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index af4f617205ae..46aa4e117121 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -78,8 +78,8 @@ static void ImplTaskPaneListGrabFocus( vcl::Window *pWindow, bool bForward ) { // put focus in child of floating windows which is typically a toolbar // that can deal with the focus - if( pWindow->ImplIsFloatingWindow() && pWindow->GetWindow( WINDOW_FIRSTCHILD ) ) - pWindow = pWindow->GetWindow( WINDOW_FIRSTCHILD ); + if( pWindow->ImplIsFloatingWindow() && pWindow->GetWindow( GetWindowType::FirstChild ) ) + pWindow = pWindow->GetWindow( GetWindowType::FirstChild ); pWindow->ImplGrabFocus( GETFOCUS_F6 | (bForward ? GETFOCUS_FORWARD : GETFOCUS_BACKWARD)); } diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index dc2409ac322e..e17950136349 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -4591,7 +4591,7 @@ void ToolBox::ToggleFloatingMode() mbHorz = false; // set focus back to document - ImplGetFrameWindow()->GetWindow( WINDOW_CLIENT )->GrabFocus(); + ImplGetFrameWindow()->GetWindow( GetWindowType::Client )->GrabFocus(); } if( mbOldHorz != mbHorz ) @@ -5213,7 +5213,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) { if( !pWin->GetParent() ) { - pWin->ImplGetFrameWindow()->GetWindow( WINDOW_CLIENT )->GrabFocus(); + pWin->ImplGetFrameWindow()->GetWindow( GetWindowType::Client )->GrabFocus(); break; } pWin = pWin->GetParent(); diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 6504a42aaa08..4aa4269c6902 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -1046,7 +1046,7 @@ bool ToolBox::ImplHasExternalMenubutton() if( ImplIsFloatingMode() ) { // custom menu is placed in the decoration - ImplBorderWindow *pBorderWin = dynamic_cast<ImplBorderWindow*>( GetWindow( WINDOW_BORDER ) ); + ImplBorderWindow *pBorderWin = dynamic_cast<ImplBorderWindow*>( GetWindow( GetWindowType::Border ) ); if( pBorderWin && !pBorderWin->GetMenuRect().IsEmpty() ) bRet = true; } @@ -1902,7 +1902,7 @@ void ToolBox::ImplExecuteCustomMenu() if( IsFloatingMode() ) { // custom menu is placed in the decoration - ImplBorderWindow *pBorderWin = dynamic_cast<ImplBorderWindow*>( GetWindow( WINDOW_BORDER ) ); + ImplBorderWindow *pBorderWin = dynamic_cast<ImplBorderWindow*>( GetWindow( GetWindowType::Border ) ); if( pBorderWin && !pBorderWin->GetMenuRect().IsEmpty() ) { pWin = pBorderWin; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 8be6e900feaf..12d44d759865 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -117,7 +117,7 @@ namespace // skip border windows, they don't carry information which helps diagnosing the problem const vcl::Window* pWindow( &i_rWindow ); while ( pWindow && ( pWindow->GetType() == WINDOW_BORDERWINDOW ) ) - pWindow = pWindow->GetWindow( WINDOW_FIRSTCHILD ); + pWindow = pWindow->GetWindow( GetWindowType::FirstChild ); if ( !pWindow ) pWindow = &i_rWindow; diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index b8d822f9ad8e..ef2631321bea 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -1126,7 +1126,7 @@ WindowType Window::GetType() const if (mpWindowImpl) return mpWindowImpl->mnType; else - return WINDOW_PARENT; + return 0; } Dialog* Window::GetParentDialog() const diff --git a/vcl/source/window/window3.cxx b/vcl/source/window/window3.cxx index 3eda064b9c7a..aa2a04919663 100644 --- a/vcl/source/window/window3.cxx +++ b/vcl/source/window/window3.cxx @@ -47,11 +47,11 @@ void Window::ImplAdjustNWFSizes() default: { // iterate over children - vcl::Window* pWin = GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window* pWin = GetWindow( GetWindowType::FirstChild ); while( pWin ) { pWin->ImplAdjustNWFSizes(); - pWin = pWin->GetWindow( WINDOW_NEXT ); + pWin = pWin->GetWindow( GetWindowType::Next ); } } break; diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 738a64cd15fb..06d8fa879dfa 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -2263,7 +2263,7 @@ static bool ImplHandleShowDialog( vcl::Window* pWindow, ShowDialogId nDialogId ) if( pWindow->GetType() == WINDOW_BORDERWINDOW ) { - vcl::Window* pWrkWin = pWindow->GetWindow( WINDOW_CLIENT ); + vcl::Window* pWrkWin = pWindow->GetWindow( GetWindowType::Client ); if( pWrkWin ) pWindow = pWrkWin; } |