diff options
Diffstat (limited to 'vcl/source/control')
-rw-r--r-- | vcl/source/control/button.cxx | 14 | ||||
-rw-r--r-- | vcl/source/control/combobox.cxx | 6 | ||||
-rw-r--r-- | vcl/source/control/edit.cxx | 10 | ||||
-rw-r--r-- | vcl/source/control/ilstbox.cxx | 12 | ||||
-rw-r--r-- | vcl/source/control/imgctrl.cxx | 6 | ||||
-rw-r--r-- | vcl/source/control/lstbox.cxx | 4 | ||||
-rw-r--r-- | vcl/source/control/spinfld.cxx | 6 |
7 files changed, 29 insertions, 29 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 70baaa0b8ac0..1cd46dd5d6ad 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -636,7 +636,7 @@ namespace { vcl::Window* getPreviousSibling(vcl::Window *pParent) { - return pParent ? pParent->GetWindow(WINDOW_LASTCHILD) : NULL; + return pParent ? pParent->GetWindow(GetWindowType::LastChild) : NULL; } } @@ -1427,7 +1427,7 @@ void PushButton::StateChanged( StateChangedType nType ) } else if ( nType == StateChangedType::Style ) { - SetStyle( ImplInitStyle( GetWindow( WINDOW_PREV ), GetStyle() ) ); + SetStyle( ImplInitStyle( GetWindow( GetWindowType::Prev ), GetStyle() ) ); bool bIsDefButton = ( GetStyle() & WB_DEFBUTTON ) != 0; bool bWasDefButton = ( GetPrevStyle() & WB_DEFBUTTON ) != 0; @@ -1512,7 +1512,7 @@ bool PushButton::PreNotify( NotifyEvent& rNEvt ) if( bDropDown && GetParent()->IsNativeControlSupported( aCtrlType, PART_ENTIRE_CONTROL) && !GetParent()->IsNativeControlSupported( aCtrlType, PART_BUTTON_DOWN) ) { - vcl::Window *pBorder = GetParent()->GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = GetParent()->GetWindow( GetWindowType::Border ); if(aCtrlType == CTRL_COMBOBOX) { // only paint the button part to avoid flickering of the combobox text @@ -2220,7 +2220,7 @@ std::vector< VclPtr<RadioButton> > RadioButton::GetRadioButtonGroup(bool bInclud vcl::Window* pFirst = const_cast<RadioButton*>(this); while( ( pFirst->GetStyle() & WB_GROUP ) == 0 ) { - vcl::Window* pWindow = pFirst->GetWindow( WINDOW_PREV ); + vcl::Window* pWindow = pFirst->GetWindow( GetWindowType::Prev ); if( pWindow ) pFirst = pWindow; else @@ -2235,7 +2235,7 @@ std::vector< VclPtr<RadioButton> > RadioButton::GetRadioButtonGroup(bool bInclud if( pFirst != this || bIncludeThis ) aGroup.push_back( static_cast<RadioButton*>(pFirst) ); } - pFirst = pFirst->GetWindow( WINDOW_NEXT ); + pFirst = pFirst->GetWindow( GetWindowType::Next ); } while( pFirst && ( ( pFirst->GetStyle() & WB_GROUP ) == 0 ) ); return aGroup; @@ -2564,7 +2564,7 @@ void RadioButton::StateChanged( StateChangedType nType ) } else if ( nType == StateChangedType::Style ) { - SetStyle( ImplInitStyle( GetWindow( WINDOW_PREV ), GetStyle() ) ); + SetStyle( ImplInitStyle( GetWindow( GetWindowType::Prev ), GetStyle() ) ); if ( (GetPrevStyle() & RADIOBUTTON_VIEW_STYLE) != (GetStyle() & RADIOBUTTON_VIEW_STYLE) ) @@ -3519,7 +3519,7 @@ void CheckBox::StateChanged( StateChangedType nType ) } else if ( nType == StateChangedType::Style ) { - SetStyle( ImplInitStyle( GetWindow( WINDOW_PREV ), GetStyle() ) ); + SetStyle( ImplInitStyle( GetWindow( GetWindowType::Prev ), GetStyle() ) ); if ( (GetPrevStyle() & CHECKBOX_VIEW_STYLE) != (GetStyle() & CHECKBOX_VIEW_STYLE) ) diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 635ba1145254..399127408eba 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -565,7 +565,7 @@ void ComboBox::Resize() if( IsDropDownBox() ) { ComboBoxBounds aBounds(calcComboBoxDropDownComponentBounds(aOutSz, - GetWindow(WINDOW_BORDER)->GetOutputSizePixel())); + GetWindow(GetWindowType::Border)->GetOutputSizePixel())); mpSubEdit->SetPosSizePixel(aBounds.aSubEditPos, aBounds.aSubEditSize); mpBtn->SetPosSizePixel(aBounds.aButtonPos, aBounds.aButtonSize); } @@ -991,7 +991,7 @@ long ComboBox::getMaxWidthScrollBarAndDownButton() const { long nButtonDownWidth = 0; - vcl::Window *pBorder = GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = GetWindow( GetWindowType::Border ); ImplControlValue aControlValue; Point aPoint; Rectangle aContent, aBound; @@ -1424,7 +1424,7 @@ ComboBox::ComboBoxBounds ComboBox::calcComboBoxDropDownComponentBounds(const Siz long nTop = 0; long nBottom = rOutSz.Height(); - vcl::Window *pBorder = GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = GetWindow( GetWindowType::Border ); ImplControlValue aControlValue; Point aPoint; Rectangle aContent, aBound; diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index f621aa5b4288..558490387d0c 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -979,7 +979,7 @@ int Edit::ImplGetNativeControlType() const break; case WINDOW_MULTILINEEDIT: - if ( GetWindow( WINDOW_BORDER ) != this ) + if ( GetWindow( GetWindowType::Border ) != this ) nCtrl = CTRL_MULTILINE_EDITBOX; else nCtrl = CTRL_EDITBOX_NOBORDER; @@ -998,7 +998,7 @@ int Edit::ImplGetNativeControlType() const nCtrl = CTRL_SPINBOX; else { - if (GetWindow(WINDOW_BORDER) != this) + if (GetWindow(GetWindowType::Border) != this) nCtrl = CTRL_EDITBOX; else nCtrl = CTRL_EDITBOX_NOBORDER; @@ -1035,12 +1035,12 @@ void Edit::ImplPaintBorder(vcl::RenderContext& rRenderContext, long nXStart, lon if (ImplUseNativeBorder(rRenderContext, GetStyle()) || IsPaintTransparent()) { // draw the inner part by painting the whole control using its border window - vcl::Window* pBorder = GetWindow(WINDOW_BORDER); + vcl::Window* pBorder = GetWindow(GetWindowType::Border); if (pBorder == this) { // we have no border, use parent vcl::Window* pControl = mbIsSubEdit ? GetParent() : this; - pBorder = pControl->GetWindow(WINDOW_BORDER); + pBorder = pControl->GetWindow(GetWindowType::Border); if (pBorder == this) pBorder = GetParent(); } @@ -1878,7 +1878,7 @@ void Edit::ImplInvalidateOutermostBorder( vcl::Window* pWin ) { // allow control to show focused state vcl::Window *pInvalWin = pWin, *pBorder = pWin; - while( ( pBorder = pInvalWin->GetWindow( WINDOW_BORDER ) ) != pInvalWin && pBorder && + while( ( pBorder = pInvalWin->GetWindow( GetWindowType::Border ) ) != pInvalWin && pBorder && pInvalWin->ImplGetFrame() == pBorder->ImplGetFrame() ) { pInvalWin = pBorder; diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index ad254911f2d4..0407eedd6660 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -2667,8 +2667,8 @@ bool ImplWin::PreNotify( NotifyEvent& rNEvt ) if ( IsNativeControlSupported(CTRL_LISTBOX, PART_ENTIRE_CONTROL) && ! IsNativeControlSupported(CTRL_LISTBOX, PART_BUTTON_DOWN) ) { - GetParent()->GetWindow( WINDOW_BORDER )->Invalidate( INVALIDATE_NOERASE ); - GetParent()->GetWindow( WINDOW_BORDER )->Update(); + GetParent()->GetWindow( GetWindowType::Border )->Invalidate( INVALIDATE_NOERASE ); + GetParent()->GetWindow( GetWindowType::Border )->Update(); } } } @@ -2710,9 +2710,9 @@ void ImplWin::ImplDraw( bool bLayout ) bool bMouseOver = false; if( GetParent() ) { - vcl::Window *pChild = GetParent()->GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window *pChild = GetParent()->GetWindow( GetWindowType::FirstChild ); while( pChild && !(bMouseOver = pChild->IsMouseOver()) ) - pChild = pChild->GetWindow( WINDOW_NEXT ); + pChild = pChild->GetWindow( GetWindowType::Next ); } if( bMouseOver ) @@ -2926,7 +2926,7 @@ void ImplWin::GetFocus() IsNativeWidgetEnabled() && IsNativeControlSupported( CTRL_LISTBOX, PART_ENTIRE_CONTROL ) ) { - vcl::Window* pWin = GetParent()->GetWindow( WINDOW_BORDER ); + vcl::Window* pWin = GetParent()->GetWindow( GetWindowType::Border ); if( ! pWin ) pWin = GetParent(); pWin->Invalidate(); @@ -2943,7 +2943,7 @@ void ImplWin::LoseFocus() IsNativeWidgetEnabled() && IsNativeControlSupported( CTRL_LISTBOX, PART_ENTIRE_CONTROL ) ) { - vcl::Window* pWin = GetParent()->GetWindow( WINDOW_BORDER ); + vcl::Window* pWin = GetParent()->GetWindow( GetWindowType::Border ); if( ! pWin ) pWin = GetParent(); pWin->Invalidate(); diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx index 6da20c0cde53..8d9a5cbddff1 100644 --- a/vcl/source/control/imgctrl.cxx +++ b/vcl/source/control/imgctrl.cxx @@ -137,7 +137,7 @@ void ImageControl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /* if (HasFocus()) { - vcl::Window* pBorderWindow = GetWindow(WINDOW_BORDER); + vcl::Window* pBorderWindow = GetWindow(GetWindowType::Border); bool bFlat = (GetBorderStyle() == WindowBorderStyle::MONO); Rectangle aRect(Point(0,0), pBorderWindow->GetOutputSizePixel()); @@ -180,13 +180,13 @@ void ImageControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSiz void ImageControl::GetFocus() { FixedImage::GetFocus(); - GetWindow( WINDOW_BORDER )->Invalidate(); + GetWindow( GetWindowType::Border )->Invalidate(); } void ImageControl::LoseFocus() { FixedImage::GetFocus(); - GetWindow( WINDOW_BORDER )->Invalidate(); + GetWindow( GetWindowType::Border )->Invalidate(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 170e60d3088a..58d9c1341dac 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -633,7 +633,7 @@ void ListBox::Resize() long nBottom = aOutSz.Height(); // Note: in case of no border, pBorder will actually be this - vcl::Window *pBorder = GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = GetWindow( GetWindowType::Border ); ImplControlValue aControlValue; Point aPoint; Rectangle aContent, aBound; @@ -793,7 +793,7 @@ void ListBox::StateChanged( StateChangedType nType ) if ( IsNativeControlSupported(CTRL_LISTBOX, PART_ENTIRE_CONTROL) && ! IsNativeControlSupported(CTRL_LISTBOX, PART_BUTTON_DOWN) ) { - GetWindow( WINDOW_BORDER )->Invalidate( INVALIDATE_NOERASE ); + GetWindow( GetWindowType::Border )->Invalidate( INVALIDATE_NOERASE ); } else mpImplWin->Invalidate(); diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index fa4bf44b261a..d5547dfc4db3 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -87,7 +87,7 @@ bool ImplDrawNativeSpinfield(vcl::RenderContext& rRenderContext, vcl::Window* pW else { // paint the spinbox as a whole, use borderwindow to have proper clipping - vcl::Window* pBorder = pWin->GetWindow(WINDOW_BORDER); + vcl::Window* pBorder = pWin->GetWindow(GetWindowType::Border); // to not overwrite everything, set the button region as clipregion to the border window Rectangle aClipRect(rSpinbuttonValue.maLowerRect); @@ -666,7 +666,7 @@ void SpinField::ImplCalcButtonAreas(OutputDevice* pDev, const Size& rOutSz, Rect IsNativeControlSupported(CTRL_SPINBOX, PART_ENTIRE_CONTROL)) { vcl::Window *pWin = static_cast<vcl::Window*>(pDev); - vcl::Window *pBorder = pWin->GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = pWin->GetWindow( GetWindowType::Border ); // get the system's spin button size ImplControlValue aControlValue; @@ -728,7 +728,7 @@ void SpinField::Resize() Rectangle aContent, aBound; // use the full extent of the control - vcl::Window *pBorder = GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = GetWindow( GetWindowType::Border ); Rectangle aArea( aPoint, pBorder->GetOutputSizePixel() ); // adjust position and size of the edit field |