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 /vcl/source/control | |
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 'vcl/source/control')
-rw-r--r-- | vcl/source/control/button.cxx | 72 | ||||
-rw-r--r-- | vcl/source/control/combobox.cxx | 16 | ||||
-rw-r--r-- | vcl/source/control/ctrl.cxx | 6 | ||||
-rw-r--r-- | vcl/source/control/edit.cxx | 26 | ||||
-rw-r--r-- | vcl/source/control/field.cxx | 16 | ||||
-rw-r--r-- | vcl/source/control/field2.cxx | 16 | ||||
-rw-r--r-- | vcl/source/control/fixed.cxx | 40 | ||||
-rw-r--r-- | vcl/source/control/fixedhyper.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/group.cxx | 6 | ||||
-rw-r--r-- | vcl/source/control/ilstbox.cxx | 32 | ||||
-rw-r--r-- | vcl/source/control/imgctrl.cxx | 4 | ||||
-rw-r--r-- | vcl/source/control/longcurr.cxx | 4 | ||||
-rw-r--r-- | vcl/source/control/lstbox.cxx | 18 | ||||
-rw-r--r-- | vcl/source/control/menubtn.cxx | 4 | ||||
-rw-r--r-- | vcl/source/control/morebtn.cxx | 8 | ||||
-rw-r--r-- | vcl/source/control/prgsbar.cxx | 4 | ||||
-rw-r--r-- | vcl/source/control/scrbar.cxx | 12 | ||||
-rw-r--r-- | vcl/source/control/slider.cxx | 6 | ||||
-rw-r--r-- | vcl/source/control/spinbtn.cxx | 4 | ||||
-rw-r--r-- | vcl/source/control/spinfld.cxx | 22 | ||||
-rw-r--r-- | vcl/source/control/tabctrl.cxx | 10 | ||||
-rw-r--r-- | vcl/source/control/throbber.cxx | 2 |
22 files changed, 165 insertions, 165 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index bfc7fd26976a..cef9d0dce18d 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -597,13 +597,13 @@ void PushButton::ImplInitPushButtonData() namespace { - Window* getPreviousSibling(Window *pParent) + vcl::Window* getPreviousSibling(vcl::Window *pParent) { return pParent ? pParent->GetWindow(WINDOW_LASTCHILD) : NULL; } } -void PushButton::ImplInit( Window* pParent, WinBits nStyle ) +void PushButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle(getPreviousSibling(pParent), nStyle); Button::ImplInit( pParent, nStyle, NULL ); @@ -614,7 +614,7 @@ void PushButton::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings( true, true, true ); } -WinBits PushButton::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ) +WinBits PushButton::ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ) { if ( !(nStyle & WB_NOTABSTOP) ) nStyle |= WB_TABSTOP; @@ -675,7 +675,7 @@ void PushButton::ImplInitSettings( bool bFont, } } -void PushButton::ImplDrawPushButtonFrame( Window* pDev, +void PushButton::ImplDrawPushButtonFrame( vcl::Window* pDev, Rectangle& rRect, sal_uInt16 nStyle ) { if ( !(pDev->GetStyle() & (WB_RECTSTYLE | WB_SMALLSTYLE)) ) @@ -701,7 +701,7 @@ void PushButton::ImplDrawPushButtonFrame( Window* pDev, rRect = aDecoView.DrawButton( rRect, nStyle ); } -bool PushButton::ImplHitTestPushButton( Window* pDev, +bool PushButton::ImplHitTestPushButton( vcl::Window* pDev, const Point& rPos ) { Point aTempPoint; @@ -1139,14 +1139,14 @@ PushButton::PushButton( WindowType nType ) : ImplInitPushButtonData(); } -PushButton::PushButton( Window* pParent, WinBits nStyle ) : +PushButton::PushButton( vcl::Window* pParent, WinBits nStyle ) : Button( WINDOW_PUSHBUTTON ) { ImplInitPushButtonData(); ImplInit( pParent, nStyle ); } -PushButton::PushButton( Window* pParent, const ResId& rResId ) : +PushButton::PushButton( vcl::Window* pParent, const ResId& rResId ) : Button( WINDOW_PUSHBUTTON ) { rResId.SetRT( RSC_PUSHBUTTON ); @@ -1480,7 +1480,7 @@ bool PushButton::PreNotify( NotifyEvent& rNEvt ) if( bDropDown && GetParent()->IsNativeControlSupported( aCtrlType, PART_ENTIRE_CONTROL) && !GetParent()->IsNativeControlSupported( aCtrlType, PART_BUTTON_DOWN) ) { - Window *pBorder = GetParent()->GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = GetParent()->GetWindow( WINDOW_BORDER ); if(aCtrlType == CTRL_COMBOBOX) { // only paint the button part to avoid flickering of the combobox text @@ -1634,14 +1634,14 @@ bool PushButton::set_property(const OString &rKey, const OString &rValue) return true; } -void OKButton::ImplInit( Window* pParent, WinBits nStyle ) +void OKButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { PushButton::ImplInit( pParent, nStyle ); SetText( Button::GetStandardText( BUTTON_OK ) ); } -OKButton::OKButton( Window* pParent, WinBits nStyle ) : +OKButton::OKButton( vcl::Window* pParent, WinBits nStyle ) : PushButton( WINDOW_OKBUTTON ) { ImplInit( pParent, nStyle ); @@ -1652,7 +1652,7 @@ void OKButton::Click() // close parent if no link set if ( !GetClickHdl() ) { - Window* pParent = getNonLayoutParent(this); + vcl::Window* pParent = getNonLayoutParent(this); if ( pParent->IsSystemWindow() ) { if ( pParent->IsDialog() ) @@ -1679,14 +1679,14 @@ void OKButton::Click() } } -void CancelButton::ImplInit( Window* pParent, WinBits nStyle ) +void CancelButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { PushButton::ImplInit( pParent, nStyle ); SetText( Button::GetStandardText( BUTTON_CANCEL ) ); } -CancelButton::CancelButton( Window* pParent, WinBits nStyle ) : +CancelButton::CancelButton( vcl::Window* pParent, WinBits nStyle ) : PushButton( WINDOW_CANCELBUTTON ) { ImplInit( pParent, nStyle ); @@ -1697,7 +1697,7 @@ void CancelButton::Click() // close parent if link not set if ( !GetClickHdl() ) { - Window* pParent = getNonLayoutParent(this); + vcl::Window* pParent = getNonLayoutParent(this); if ( pParent->IsSystemWindow() ) { if ( pParent->IsDialog() ) @@ -1724,26 +1724,26 @@ void CancelButton::Click() } } -CloseButton::CloseButton( Window* pParent, WinBits nStyle ) +CloseButton::CloseButton( vcl::Window* pParent, WinBits nStyle ) : CancelButton(pParent, nStyle) { SetText( Button::GetStandardText( BUTTON_CLOSE ) ); } -void HelpButton::ImplInit( Window* pParent, WinBits nStyle ) +void HelpButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { PushButton::ImplInit( pParent, nStyle | WB_NOPOINTERFOCUS ); SetText( Button::GetStandardText( BUTTON_HELP ) ); } -HelpButton::HelpButton( Window* pParent, WinBits nStyle ) : +HelpButton::HelpButton( vcl::Window* pParent, WinBits nStyle ) : PushButton( WINDOW_HELPBUTTON ) { ImplInit( pParent, nStyle ); } -HelpButton::HelpButton( Window* pParent, const ResId& rResId ) : +HelpButton::HelpButton( vcl::Window* pParent, const ResId& rResId ) : PushButton( WINDOW_HELPBUTTON ) { rResId.SetRT( RSC_HELPBUTTON ); @@ -1760,7 +1760,7 @@ void HelpButton::Click() // trigger help if no link set if ( !GetClickHdl() ) { - Window* pFocusWin = Application::GetFocusWindow(); + vcl::Window* pFocusWin = Application::GetFocusWindow(); if ( !pFocusWin ) pFocusWin = this; @@ -1778,7 +1778,7 @@ void RadioButton::ImplInitRadioButtonData() mbStateChanged = false; } -void RadioButton::ImplInit( Window* pParent, WinBits nStyle ) +void RadioButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle(getPreviousSibling(pParent), nStyle); Button::ImplInit( pParent, nStyle, NULL ); @@ -1786,7 +1786,7 @@ void RadioButton::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings( true, true, true ); } -WinBits RadioButton::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ) +WinBits RadioButton::ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ) { if ( !(nStyle & WB_NOGROUP) && (!pPrevWindow || (pPrevWindow->GetType() != WINDOW_RADIOBUTTON)) ) @@ -1818,7 +1818,7 @@ void RadioButton::ImplInitSettings( bool bFont, if ( bBackground ) { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( !IsControlBackground() && (pParent->IsChildTransparentModeEnabled() || IsNativeControlSupported( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL ) ) ) { @@ -2197,10 +2197,10 @@ std::vector< RadioButton* > RadioButton::GetRadioButtonGroup(bool bIncludeThis) SAL_WARN("vcl.control", "No new-style group set on radiobutton <" << GetHelpId() << "> using old-style digging around"); // go back to first in group; - Window* pFirst = const_cast<RadioButton*>(this); + vcl::Window* pFirst = const_cast<RadioButton*>(this); while( ( pFirst->GetStyle() & WB_GROUP ) == 0 ) { - Window* pWindow = pFirst->GetWindow( WINDOW_PREV ); + vcl::Window* pWindow = pFirst->GetWindow( WINDOW_PREV ); if( pWindow ) pFirst = pWindow; else @@ -2272,14 +2272,14 @@ void RadioButton::ImplCallClick( bool bGrabFocus, sal_uInt16 nFocusFlags ) mbStateChanged = false; } -RadioButton::RadioButton( Window* pParent, WinBits nStyle ) : +RadioButton::RadioButton( vcl::Window* pParent, WinBits nStyle ) : Button( WINDOW_RADIOBUTTON ), mbLegacyNoTextAlign( false ) { ImplInitRadioButtonData(); ImplInit( pParent, nStyle ); } -RadioButton::RadioButton( Window* pParent, const ResId& rResId ) : +RadioButton::RadioButton( vcl::Window* pParent, const ResId& rResId ) : Button( WINDOW_RADIOBUTTON ), mbLegacyNoTextAlign( false ) { rResId.SetRT( RSC_RADIOBUTTON ); @@ -2896,7 +2896,7 @@ void CheckBox::ImplInitCheckBoxData() mbTriState = false; } -void CheckBox::ImplInit( Window* pParent, WinBits nStyle ) +void CheckBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle(getPreviousSibling(pParent), nStyle); Button::ImplInit( pParent, nStyle, NULL ); @@ -2904,7 +2904,7 @@ void CheckBox::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings( true, true, true ); } -WinBits CheckBox::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ) +WinBits CheckBox::ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ) { if ( !(nStyle & WB_NOTABSTOP) ) nStyle |= WB_TABSTOP; @@ -2931,7 +2931,7 @@ void CheckBox::ImplInitSettings( bool bFont, if ( bBackground ) { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( !IsControlBackground() && (pParent->IsChildTransparentModeEnabled() || IsNativeControlSupported( CTRL_CHECKBOX, PART_ENTIRE_CONTROL ) ) ) { @@ -3173,14 +3173,14 @@ void CheckBox::ImplCheck() Click(); } -CheckBox::CheckBox( Window* pParent, WinBits nStyle ) : +CheckBox::CheckBox( vcl::Window* pParent, WinBits nStyle ) : Button( WINDOW_CHECKBOX ), mbLegacyNoTextAlign( false ) { ImplInitCheckBoxData(); ImplInit( pParent, nStyle ); } -CheckBox::CheckBox( Window* pParent, const ResId& rResId ) : +CheckBox::CheckBox( vcl::Window* pParent, const ResId& rResId ) : Button( WINDOW_CHECKBOX ), mbLegacyNoTextAlign( false ) { rResId.SetRT( RSC_CHECKBOX ); @@ -3726,13 +3726,13 @@ Size CheckBox::GetOptimalSize() const return CalcMinimumSize(); } -ImageButton::ImageButton( Window* pParent, WinBits nStyle ) : +ImageButton::ImageButton( vcl::Window* pParent, WinBits nStyle ) : PushButton( pParent, nStyle ) { ImplInitStyle(); } -ImageButton::ImageButton( Window* pParent, const ResId& rResId ) : +ImageButton::ImageButton( vcl::Window* pParent, const ResId& rResId ) : PushButton( pParent, rResId.SetRT( RSC_IMAGEBUTTON ) ) { sal_uLong nObjMask = ReadLongRes(); @@ -3769,7 +3769,7 @@ void ImageButton::ImplInitStyle() SetStyle( nStyle ); } -ImageRadioButton::ImageRadioButton( Window* pParent, WinBits nStyle ) : +ImageRadioButton::ImageRadioButton( vcl::Window* pParent, WinBits nStyle ) : RadioButton( pParent, nStyle ) { } @@ -3778,7 +3778,7 @@ ImageRadioButton::~ImageRadioButton() { } -TriStateBox::TriStateBox( Window* pParent, WinBits nStyle ) : +TriStateBox::TriStateBox( vcl::Window* pParent, WinBits nStyle ) : CheckBox( pParent, nStyle ) { EnableTriState( true ); @@ -3788,7 +3788,7 @@ TriStateBox::~TriStateBox() { } -DisclosureButton::DisclosureButton( Window* pParent, WinBits nStyle ) : +DisclosureButton::DisclosureButton( vcl::Window* pParent, WinBits nStyle ) : CheckBox( pParent, nStyle ) { } diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index be4c071c5ea6..cb39c0a5b7c5 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -44,7 +44,7 @@ static void lcl_GetSelectedEntries( ::std::set< sal_Int32 >& rSelectedPos, const } } -ComboBox::ComboBox( Window* pParent, WinBits nStyle ) : +ComboBox::ComboBox( vcl::Window* pParent, WinBits nStyle ) : Edit( WINDOW_COMBOBOX ) { ImplInitComboBoxData(); @@ -52,7 +52,7 @@ ComboBox::ComboBox( Window* pParent, WinBits nStyle ) : SetWidthInChars(-1); } -ComboBox::ComboBox( Window* pParent, const ResId& rResId ) : +ComboBox::ComboBox( vcl::Window* pParent, const ResId& rResId ) : Edit( WINDOW_COMBOBOX ) { ImplInitComboBoxData(); @@ -118,7 +118,7 @@ void ComboBox::ImplCalcEditHeight() } } -void ComboBox::ImplInit( Window* pParent, WinBits nStyle ) +void ComboBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) { ImplInitStyle( nStyle ); @@ -172,7 +172,7 @@ void ComboBox::ImplInit( Window* pParent, WinBits nStyle ) EnableAutocomplete( true ); mpSubEdit->Show(); - Window* pLBParent = this; + vcl::Window* pLBParent = this; if ( mpFloatWin ) pLBParent = mpFloatWin; mpImplLB = new ImplListBox( pLBParent, nListStyle|WB_SIMPLEMODE|WB_AUTOHSCROLL ); @@ -981,7 +981,7 @@ long ComboBox::getMaxWidthScrollBarAndDownButton() const { long nButtonDownWidth = 0; - Window *pBorder = GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = GetWindow( WINDOW_BORDER ); ImplControlValue aControlValue; Point aPoint; Rectangle aContent, aBound; @@ -1041,7 +1041,7 @@ Size ComboBox::CalcAdjustedSize( const Size& rPrefSize ) const { Size aSz = rPrefSize; sal_Int32 nLeft, nTop, nRight, nBottom; - ((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom ); + ((vcl::Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom ); aSz.Height() -= nTop+nBottom; if ( !IsDropDownBox() ) { @@ -1357,7 +1357,7 @@ void ComboBox::SetNoSelection() Rectangle ComboBox::GetBoundingRectangle( sal_Int32 nItem ) const { Rectangle aRect = mpImplLB->GetMainWindow().GetBoundingRectangle( nItem ); - Rectangle aOffset = mpImplLB->GetMainWindow().GetWindowExtentsRelative( (Window*)this ); + Rectangle aOffset = mpImplLB->GetMainWindow().GetWindowExtentsRelative( (vcl::Window*)this ); aRect.Move( aOffset.TopLeft().X(), aOffset.TopLeft().Y() ); return aRect; } @@ -1414,7 +1414,7 @@ ComboBox::ComboBoxBounds ComboBox::calcComboBoxDropDownComponentBounds(const Siz long nTop = 0; long nBottom = rOutSz.Height(); - Window *pBorder = GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = GetWindow( WINDOW_BORDER ); ImplControlValue aControlValue; Point aPoint; Rectangle aContent, aBound; diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 83a977d00fb6..4282453df27d 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -45,14 +45,14 @@ Control::Control( WindowType nType ) : ImplInitControlData(); } -Control::Control( Window* pParent, WinBits nStyle ) : +Control::Control( vcl::Window* pParent, WinBits nStyle ) : Window( WINDOW_CONTROL ) { ImplInitControlData(); ImplInit( pParent, nStyle, NULL ); } -Control::Control( Window* pParent, const ResId& rResId ) : +Control::Control( vcl::Window* pParent, const ResId& rResId ) : Window( WINDOW_CONTROL ) { ImplInitControlData(); @@ -258,7 +258,7 @@ bool Control::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_LOSEFOCUS ) { - Window* pFocusWin = Application::GetFocusWindow(); + vcl::Window* pFocusWin = Application::GetFocusWindow(); if ( !pFocusWin || !ImplIsWindowOrChild( pFocusWin ) ) { mbHasControlFocus = false; diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 8be4dc8be560..f33cbcbe09ea 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -161,14 +161,14 @@ Edit::Edit( WindowType nType ) : ImplInitEditData(); } -Edit::Edit( Window* pParent, WinBits nStyle ) : +Edit::Edit( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_EDIT ) { ImplInitEditData(); ImplInit( pParent, nStyle ); } -Edit::Edit( Window* pParent, const ResId& rResId ) : +Edit::Edit( vcl::Window* pParent, const ResId& rResId ) : Control( WINDOW_EDIT ) { rResId.SetRT( RSC_EDIT ); @@ -308,7 +308,7 @@ bool Edit::ImplUseNativeBorder( WinBits nStyle ) && ((nStyle&WB_BORDER) && !(nStyle&WB_NOBORDER)); if( ! bRet && mbIsSubEdit ) { - Window* pWindow = GetParent(); + vcl::Window* pWindow = GetParent(); nStyle = pWindow->GetStyle(); bRet = pWindow->IsNativeControlSupported(ImplGetNativeControlType(), HAS_BACKGROUND_TEXTURE) && ((nStyle&WB_BORDER) && !(nStyle&WB_NOBORDER)); @@ -316,7 +316,7 @@ bool Edit::ImplUseNativeBorder( WinBits nStyle ) return bRet; } -void Edit::ImplInit( Window* pParent, WinBits nStyle ) +void Edit::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); if ( !(nStyle & (WB_CENTER | WB_RIGHT)) ) @@ -786,7 +786,7 @@ uno::Reference < i18n::XExtendedInputSequenceChecker > Edit::ImplGetInputSequenc return mxISC; } -void Edit::ShowTruncationWarning( Window* pParent ) +void Edit::ShowTruncationWarning( vcl::Window* pParent ) { ResMgr* pResMgr = ImplGetResMgr(); if( pResMgr ) @@ -944,7 +944,7 @@ void Edit::ImplSetText( const OUString& rText, const Selection* pNewSelection ) int Edit::ImplGetNativeControlType() const { int nCtrl = 0; - const Window *pControl = mbIsSubEdit ? GetParent() : this; + const vcl::Window *pControl = mbIsSubEdit ? GetParent() : this; switch( pControl->GetType() ) { @@ -1016,11 +1016,11 @@ void Edit::ImplPaintBorder( long nXStart, long nXEnd ) if( ImplUseNativeBorder( GetStyle() ) || IsPaintTransparent() ) { // draw the inner part by painting the whole control using its border window - Window *pBorder = GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = GetWindow( WINDOW_BORDER ); if( pBorder == this ) { // we have no border, use parent - Window *pControl = mbIsSubEdit ? GetParent() : this; + vcl::Window *pControl = mbIsSubEdit ? GetParent() : this; pBorder = pControl->GetWindow( WINDOW_BORDER ); if( pBorder == this ) pBorder = GetParent(); @@ -1856,10 +1856,10 @@ void Edit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_u } } -void Edit::ImplInvalidateOutermostBorder( Window* pWin ) +void Edit::ImplInvalidateOutermostBorder( vcl::Window* pWin ) { // allow control to show focused state - Window *pInvalWin = pWin, *pBorder = pWin; + vcl::Window *pInvalWin = pWin, *pBorder = pWin; while( ( pBorder = pInvalWin->GetWindow( WINDOW_BORDER ) ) != pInvalWin && pBorder && pInvalWin->ImplGetFrame() == pBorder->ImplGetFrame() ) { @@ -1922,7 +1922,7 @@ void Edit::GetFocus() Control::GetFocus(); } -Window* Edit::GetPreferredKeyInputWindow() +vcl::Window* Edit::GetPreferredKeyInputWindow() { if ( mpSubEdit ) return mpSubEdit->GetPreferredKeyInputWindow(); @@ -2768,7 +2768,7 @@ Size Edit::CalcMinimumSize() const Size Edit::GetMinimumEditSize() { - Window* pDefWin = ImplGetDefaultWindow(); + vcl::Window* pDefWin = ImplGetDefaultWindow(); Edit aEdit( pDefWin, WB_BORDER ); Size aSize( aEdit.CalcMinimumSize() ); return aSize; @@ -2792,7 +2792,7 @@ Size Edit::CalcSize(sal_Int32 nChars) const sal_Int32 Edit::GetMaxVisChars() const { - const Window* pW = mpSubEdit ? mpSubEdit : this; + const vcl::Window* pW = mpSubEdit ? mpSubEdit : this; sal_Int32 nOutWidth = pW->GetOutputSizePixel().Width(); sal_Int32 nCharWidth = GetTextWidth( OUString('x') ); return nCharWidth ? nOutWidth/nCharWidth : 0; diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 4b209e2887d5..e57c7f6533e5 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -720,14 +720,14 @@ void NumericFormatter::ImplNewFieldValue( sal_Int64 nNewValue ) } } -NumericField::NumericField( Window* pParent, WinBits nWinStyle ) : +NumericField::NumericField( vcl::Window* pParent, WinBits nWinStyle ) : SpinField( pParent, nWinStyle ) { SetField( this ); Reformat(); } -NumericField::NumericField( Window* pParent, const ResId& rResId ) : +NumericField::NumericField( vcl::Window* pParent, const ResId& rResId ) : SpinField( WINDOW_NUMERICFIELD ) { rResId.SetRT( RSC_NUMERICFIELD ); @@ -883,7 +883,7 @@ Size NumericField::CalcMinimumSize() const return calcMinimumSize(*this, *this); } -NumericBox::NumericBox( Window* pParent, WinBits nWinStyle ) : +NumericBox::NumericBox( vcl::Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { SetField( this ); @@ -1546,14 +1546,14 @@ sal_Int64 MetricFormatter::GetCorrectedValue( FieldUnit eOutUnit ) const meUnit, eOutUnit ); } -MetricField::MetricField( Window* pParent, WinBits nWinStyle ) : +MetricField::MetricField( vcl::Window* pParent, WinBits nWinStyle ) : SpinField( pParent, nWinStyle ) { SetField( this ); Reformat(); } -MetricField::MetricField( Window* pParent, const ResId& rResId ) : +MetricField::MetricField( vcl::Window* pParent, const ResId& rResId ) : SpinField( WINDOW_METRICFIELD ) { rResId.SetRT( RSC_METRICFIELD ); @@ -1727,7 +1727,7 @@ void MetricField::CustomConvert() maCustomConvertLink.Call( this ); } -MetricBox::MetricBox( Window* pParent, WinBits nWinStyle ) : +MetricBox::MetricBox( vcl::Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { SetField( this ); @@ -1975,7 +1975,7 @@ void CurrencyFormatter::Reformat() SetValue( mnLastValue ); } -CurrencyField::CurrencyField( Window* pParent, WinBits nWinStyle ) : +CurrencyField::CurrencyField( vcl::Window* pParent, WinBits nWinStyle ) : SpinField( pParent, nWinStyle ) { SetField( this ); @@ -2057,7 +2057,7 @@ void CurrencyField::Last() SpinField::Last(); } -CurrencyBox::CurrencyBox( Window* pParent, WinBits nWinStyle ) : +CurrencyBox::CurrencyBox( vcl::Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { SetField( this ); diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 9800030d3b99..4dd7e8568336 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -813,7 +813,7 @@ void PatternFormatter::Reformat() } } -PatternField::PatternField( Window* pParent, WinBits nWinStyle ) : +PatternField::PatternField( vcl::Window* pParent, WinBits nWinStyle ) : SpinField( pParent, nWinStyle ) { SetField( this ); @@ -863,7 +863,7 @@ void PatternField::Modify() SpinField::Modify(); } -PatternBox::PatternBox( Window* pParent, WinBits nWinStyle ) : +PatternBox::PatternBox( vcl::Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { SetField( this ); @@ -1762,7 +1762,7 @@ void DateFormatter::ExpandCentury( Date& rDate, sal_uInt16 nTwoDigitYearStart ) } } -DateField::DateField( Window* pParent, WinBits nWinStyle ) : +DateField::DateField( vcl::Window* pParent, WinBits nWinStyle ) : SpinField( pParent, nWinStyle ), maFirst( GetMin() ), maLast( GetMax() ) @@ -1773,7 +1773,7 @@ DateField::DateField( Window* pParent, WinBits nWinStyle ) : ResetLastDate(); } -DateField::DateField( Window* pParent, const ResId& rResId ) : +DateField::DateField( vcl::Window* pParent, const ResId& rResId ) : SpinField( WINDOW_DATEFIELD ), maFirst( GetMin() ), maLast( GetMax() ) @@ -1911,7 +1911,7 @@ void DateField::Last() SpinField::Last(); } -DateBox::DateBox( Window* pParent, WinBits nWinStyle ) : +DateBox::DateBox( vcl::Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { SetField( this ); @@ -2642,7 +2642,7 @@ void TimeFormatter::Reformat() SetTime( maLastTime ); } -TimeField::TimeField( Window* pParent, WinBits nWinStyle ) : +TimeField::TimeField( vcl::Window* pParent, WinBits nWinStyle ) : SpinField( pParent, nWinStyle ), maFirst( GetMin() ), maLast( GetMax() ) @@ -2652,7 +2652,7 @@ TimeField::TimeField( Window* pParent, WinBits nWinStyle ) : Reformat(); } -TimeField::TimeField( Window* pParent, const ResId& rResId ) : +TimeField::TimeField( vcl::Window* pParent, const ResId& rResId ) : SpinField( WINDOW_TIMEFIELD ), maFirst( GetMin() ), maLast( GetMax() ) @@ -2826,7 +2826,7 @@ void TimeField::SetExtFormat( ExtTimeFieldFormat eFormat ) ReformatAll(); } -TimeBox::TimeBox( Window* pParent, WinBits nWinStyle ) : +TimeBox::TimeBox( vcl::Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { SetField( this ); diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 8d6cb0f8c9a6..beaa5b835aa7 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -80,7 +80,7 @@ static Point ImplCalcPos( WinBits nStyle, const Point& rPos, return aPos; } -void FixedText::ImplInit( Window* pParent, WinBits nStyle ) +void FixedText::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); Control::ImplInit( pParent, nStyle, NULL ); @@ -111,7 +111,7 @@ void FixedText::ImplInitSettings( bool bFont, if ( bBackground ) { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { EnableChildTransparentMode( true ); @@ -133,7 +133,7 @@ void FixedText::ImplInitSettings( bool bFont, } } -FixedText::FixedText( Window* pParent, WinBits nStyle ) +FixedText::FixedText( vcl::Window* pParent, WinBits nStyle ) : Control(WINDOW_FIXEDTEXT) , m_nMaxWidthChars(-1) , m_nMinWidthChars(-1) @@ -142,7 +142,7 @@ FixedText::FixedText( Window* pParent, WinBits nStyle ) ImplInit( pParent, nStyle ); } -FixedText::FixedText( Window* pParent, const ResId& rResId ) +FixedText::FixedText( vcl::Window* pParent, const ResId& rResId ) : Control(WINDOW_FIXEDTEXT) , m_nMaxWidthChars(-1) , m_nMinWidthChars(-1) @@ -435,21 +435,21 @@ bool FixedText::set_property(const OString &rKey, const OString &rValue) return true; } -Window* FixedText::getAccessibleRelationLabelFor() const +vcl::Window* FixedText::getAccessibleRelationLabelFor() const { - Window *pWindow = Control::getAccessibleRelationLabelFor(); + vcl::Window *pWindow = Control::getAccessibleRelationLabelFor(); if (pWindow) return pWindow; return get_mnemonic_widget(); } -void FixedText::set_mnemonic_widget(Window *pWindow) +void FixedText::set_mnemonic_widget(vcl::Window *pWindow) { if (pWindow == m_pMnemonicWindow) return; if (m_pMnemonicWindow) { - Window *pTempReEntryGuard = m_pMnemonicWindow; + vcl::Window *pTempReEntryGuard = m_pMnemonicWindow; m_pMnemonicWindow = NULL; pTempReEntryGuard->remove_mnemonic_label(this); } @@ -463,7 +463,7 @@ FixedText::~FixedText() set_mnemonic_widget(NULL); } -SelectableFixedText::SelectableFixedText(Window* pParent, WinBits nStyle) +SelectableFixedText::SelectableFixedText(vcl::Window* pParent, WinBits nStyle) : Edit(pParent, nStyle) { // no border @@ -483,7 +483,7 @@ void SelectableFixedText::LoseFocus() Invalidate(); } -void FixedLine::ImplInit( Window* pParent, WinBits nStyle ) +void FixedLine::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); Control::ImplInit( pParent, nStyle, NULL ); @@ -514,7 +514,7 @@ void FixedLine::ImplInitSettings( bool bFont, if ( bBackground ) { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { EnableChildTransparentMode( true ); @@ -609,14 +609,14 @@ void FixedLine::ImplDraw( bool bLayout ) } } -FixedLine::FixedLine( Window* pParent, WinBits nStyle ) : +FixedLine::FixedLine( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_FIXEDLINE ) { ImplInit( pParent, nStyle ); SetSizePixel( Size( 2, 2 ) ); } -FixedLine::FixedLine( Window* pParent, const ResId& rResId ) : +FixedLine::FixedLine( vcl::Window* pParent, const ResId& rResId ) : Control( WINDOW_FIXEDLINE ) { rResId.SetRT( RSC_FIXEDLINE ); @@ -705,7 +705,7 @@ Size FixedLine::GetOptimalSize() const return CalcWindowSize( FixedText::CalcMinimumTextSize ( this, 0x7fffffff ) ); } -void FixedBitmap::ImplInit( Window* pParent, WinBits nStyle ) +void FixedBitmap::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); Control::ImplInit( pParent, nStyle, NULL ); @@ -721,7 +721,7 @@ WinBits FixedBitmap::ImplInitStyle( WinBits nStyle ) void FixedBitmap::ImplInitSettings() { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { EnableChildTransparentMode( true ); @@ -742,7 +742,7 @@ void FixedBitmap::ImplInitSettings() } } -FixedBitmap::FixedBitmap( Window* pParent, WinBits nStyle ) : +FixedBitmap::FixedBitmap( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_FIXEDBITMAP ) { ImplInit( pParent, nStyle ); @@ -846,7 +846,7 @@ void FixedBitmap::SetBitmap( const Bitmap& rBitmap ) queue_resize(); } -void FixedImage::ImplInit( Window* pParent, WinBits nStyle ) +void FixedImage::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); mbInUserDraw = false; @@ -863,7 +863,7 @@ WinBits FixedImage::ImplInitStyle( WinBits nStyle ) void FixedImage::ImplInitSettings() { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( pParent && pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { EnableChildTransparentMode( true ); @@ -897,13 +897,13 @@ void FixedImage::ImplLoadRes( const ResId& rResId ) } } -FixedImage::FixedImage( Window* pParent, WinBits nStyle ) : +FixedImage::FixedImage( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_FIXEDIMAGE ) { ImplInit( pParent, nStyle ); } -FixedImage::FixedImage( Window* pParent, const ResId& rResId ) : +FixedImage::FixedImage( vcl::Window* pParent, const ResId& rResId ) : Control( WINDOW_FIXEDIMAGE ) { rResId.SetRT( RSC_FIXEDIMAGE ); diff --git a/vcl/source/control/fixedhyper.cxx b/vcl/source/control/fixedhyper.cxx index f30a8ba9303f..6926a0c843c6 100644 --- a/vcl/source/control/fixedhyper.cxx +++ b/vcl/source/control/fixedhyper.cxx @@ -19,7 +19,7 @@ #include <vcl/fixedhyper.hxx> -FixedHyperlink::FixedHyperlink(Window* pParent, WinBits nWinStyle) +FixedHyperlink::FixedHyperlink(vcl::Window* pParent, WinBits nWinStyle) : FixedText(pParent, nWinStyle) , m_nTextLen(0) { diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index 47f97a55a28b..795bb3b43797 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -30,7 +30,7 @@ #define GROUP_VIEW_STYLE (WB_3DLOOK | WB_NOLABEL) -void GroupBox::ImplInit( Window* pParent, WinBits nStyle ) +void GroupBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); Control::ImplInit( pParent, nStyle, NULL ); @@ -62,7 +62,7 @@ void GroupBox::ImplInitSettings( bool bFont, if ( bBackground ) { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( (pParent->IsChildTransparentModeEnabled() || !(pParent->GetStyle() & WB_CLIPCHILDREN) ) && !IsControlBackground() ) @@ -86,7 +86,7 @@ void GroupBox::ImplInitSettings( bool bFont, } } -GroupBox::GroupBox( Window* pParent, WinBits nStyle ) : +GroupBox::GroupBox( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_GROUPBOX ) { ImplInit( pParent, nStyle ); diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 187b6469e046..8bcdf11202eb 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -46,7 +46,7 @@ using namespace ::com::sun::star; -void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBackground ) +void ImplInitFieldSettings( vcl::Window* pWin, bool bFont, bool bForeground, bool bBackground ) { const StyleSettings& rStyleSettings = pWin->GetSettings().GetStyleSettings(); @@ -87,7 +87,7 @@ void ImplInitDropDownButton( PushButton* pButton ) pButton->SetBackground(); } -ImplEntryList::ImplEntryList( Window* pWindow ) +ImplEntryList::ImplEntryList( vcl::Window* pWindow ) { mpWindow = pWindow; mnLastSelected = LISTBOX_ENTRY_NOTFOUND; @@ -488,7 +488,7 @@ sal_Int32 ImplEntryList::FindFirstSelectable( sal_Int32 nPos, bool bForward /* = return LISTBOX_ENTRY_NOTFOUND; } -ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) : +ImplListBoxWindow::ImplListBoxWindow( vcl::Window* pParent, WinBits nWinStyle ) : Control( pParent, 0 ), maQuickSelectionEngine( *this ) { @@ -2128,7 +2128,7 @@ sal_uInt16 ImplListBoxWindow::ImplGetTextStyle() const return nTextStyle; } -ImplListBox::ImplListBox( Window* pParent, WinBits nWinStyle ) : +ImplListBox::ImplListBox( vcl::Window* pParent, WinBits nWinStyle ) : Control( pParent, nWinStyle ), maLBWindow( this, nWinStyle&(~WB_BORDER) ) { @@ -2228,7 +2228,7 @@ void ImplListBox::GetFocus() maLBWindow.GrabFocus(); } -Window* ImplListBox::GetPreferredKeyInputWindow() +vcl::Window* ImplListBox::GetPreferredKeyInputWindow() { return &maLBWindow; } @@ -2583,7 +2583,7 @@ void ImplListBox::SetEdgeBlending(bool bNew) } } -ImplWin::ImplWin( Window* pParent, WinBits nWinStyle ) : +ImplWin::ImplWin( vcl::Window* pParent, WinBits nWinStyle ) : Control ( pParent, nWinStyle ) { if ( IsNativeControlSupported(CTRL_LISTBOX, PART_ENTIRE_CONTROL) @@ -2654,7 +2654,7 @@ void ImplWin::ImplDraw( bool bLayout ) // Repaint the (focused) area similarly to // ImplSmallBorderWindowView::DrawWindow() in // vcl/source/window/brdwin.cxx - Window *pWin = GetParent(); + vcl::Window *pWin = GetParent(); ImplControlValue aControlValue; if ( !pWin->IsEnabled() ) @@ -2673,7 +2673,7 @@ void ImplWin::ImplDraw( bool bLayout ) bool bMouseOver = false; if( GetParent() ) { - Window *pChild = GetParent()->GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window *pChild = GetParent()->GetWindow( WINDOW_FIRSTCHILD ); while( pChild && !(bMouseOver = pChild->IsMouseOver()) ) pChild = pChild->GetWindow( WINDOW_NEXT ); } @@ -2840,7 +2840,7 @@ void ImplWin::GetFocus() IsNativeWidgetEnabled() && IsNativeControlSupported( CTRL_LISTBOX, PART_ENTIRE_CONTROL ) ) { - Window* pWin = GetParent()->GetWindow( WINDOW_BORDER ); + vcl::Window* pWin = GetParent()->GetWindow( WINDOW_BORDER ); if( ! pWin ) pWin = GetParent(); pWin->Invalidate(); @@ -2857,7 +2857,7 @@ void ImplWin::LoseFocus() IsNativeWidgetEnabled() && IsNativeControlSupported( CTRL_LISTBOX, PART_ENTIRE_CONTROL ) ) { - Window* pWin = GetParent()->GetWindow( WINDOW_BORDER ); + vcl::Window* pWin = GetParent()->GetWindow( WINDOW_BORDER ); if( ! pWin ) pWin = GetParent(); pWin->Invalidate(); @@ -2867,7 +2867,7 @@ void ImplWin::LoseFocus() Control::LoseFocus(); } -ImplBtn::ImplBtn( Window* pParent, WinBits nWinStyle ) : +ImplBtn::ImplBtn( vcl::Window* pParent, WinBits nWinStyle ) : PushButton( pParent, nWinStyle ), mbDown ( false ) { @@ -2889,7 +2889,7 @@ void ImplBtn::MouseButtonDown( const MouseEvent& ) } } -ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( Window* pParent ) : +ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( vcl::Window* pParent ) : FloatingWindow( pParent, WB_BORDER | WB_SYSTEMWINDOW | WB_NOSHADOW ) // no drop shadow for list boxes { mpImplLB = NULL; @@ -2900,7 +2900,7 @@ ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( Window* pParent ) : EnableSaveBackground(); - Window * pBorderWindow = ImplGetBorderWindow(); + vcl::Window * pBorderWindow = ImplGetBorderWindow(); if( pBorderWindow ) { SetAccessibleRole(accessibility::AccessibleRole::PANEL); @@ -2953,8 +2953,8 @@ void ImplListBoxFloatingWindow::setPosSizePixel( long nX, long nY, long nWidth, // The number also cannot be calculated by List/Combobox, as for // this the presence of the vertical Scrollbar has to be known. mpImplLB->SetSizePixel( GetOutputSizePixel() ); - ((Window*)mpImplLB)->Resize(); - ((Window&)mpImplLB->GetMainWindow()).Resize(); + ((vcl::Window*)mpImplLB)->Resize(); + ((vcl::Window&)mpImplLB->GetMainWindow()).Resize(); } } @@ -3067,7 +3067,7 @@ void ImplListBoxFloatingWindow::StartFloat( bool bStartTracking ) // check if the control's parent is un-mirrored which is the case for form controls in a mirrored UI // where the document is unmirrored // because StartPopupMode() expects a rectangle in mirrored coordinates we have to re-mirror - Window *pGrandparent = GetParent()->GetParent(); + vcl::Window *pGrandparent = GetParent()->GetParent(); const OutputDevice *pGrandparentOutDev = pGrandparent->GetOutDev(); if( pGrandparent->ImplIsAntiparallel() ) diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx index 54b97f43cd97..6a8082fb5de2 100644 --- a/vcl/source/control/imgctrl.cxx +++ b/vcl/source/control/imgctrl.cxx @@ -25,7 +25,7 @@ namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode; -ImageControl::ImageControl( Window* pParent, WinBits nStyle ) +ImageControl::ImageControl( vcl::Window* pParent, WinBits nStyle ) :FixedImage( pParent, nStyle ) ,mnScaleMode( ImageScaleMode::ANISOTROPIC ) { @@ -137,7 +137,7 @@ void ImageControl::Paint( const Rectangle& /*rRect*/ ) if( HasFocus() ) { - Window *pWin = GetWindow( WINDOW_BORDER ); + vcl::Window *pWin = GetWindow( WINDOW_BORDER ); bool bFlat = (GetBorderStyle() == 2); Rectangle aRect( Point(0,0), pWin->GetOutputSizePixel() ); diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index 36afacd82698..3b6bd4570a79 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -455,7 +455,7 @@ void ImplNewLongCurrencyFieldValue( LongCurrencyField* pField, BigInt nNewValue pField->Modify(); } -LongCurrencyField::LongCurrencyField( Window* pParent, WinBits nWinStyle ) : +LongCurrencyField::LongCurrencyField( vcl::Window* pParent, WinBits nWinStyle ) : SpinField( pParent, nWinStyle ) { SetField( this ); @@ -537,7 +537,7 @@ void LongCurrencyField::Last() SpinField::Last(); } -LongCurrencyBox::LongCurrencyBox( Window* pParent, WinBits nWinStyle ) : +LongCurrencyBox::LongCurrencyBox( vcl::Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { SetField( this ); diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index ec4d4bc65abe..504f11252479 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -49,13 +49,13 @@ ListBox::ListBox(WindowType nType) ImplInitListBoxData(); } -ListBox::ListBox( Window* pParent, WinBits nStyle ) : Control( WINDOW_LISTBOX ) +ListBox::ListBox( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_LISTBOX ) { ImplInitListBoxData(); ImplInit( pParent, nStyle ); } -ListBox::ListBox( Window* pParent, const ResId& rResId ) : +ListBox::ListBox( vcl::Window* pParent, const ResId& rResId ) : Control( WINDOW_LISTBOX ) { rResId.SetRT( RSC_LISTBOX ); @@ -96,7 +96,7 @@ void ListBox::ImplInitListBoxData() mbEdgeBlending = false; } -void ListBox::ImplInit( Window* pParent, WinBits nStyle ) +void ListBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); if ( !(nStyle & WB_NOBORDER) && ( nStyle & WB_DROPDOWN ) ) @@ -149,7 +149,7 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle ) mpBtn->GetDropTarget()->addDropTargetListener(xDrop); } - Window* pLBParent = this; + vcl::Window* pLBParent = this; if ( mpFloatWin ) pLBParent = mpFloatWin; mpImplLB = new ImplListBox( pLBParent, nStyle&(~WB_BORDER) ); @@ -503,7 +503,7 @@ void ListBox::GetFocus() Control::GetFocus(); } -Window* ListBox::GetPreferredKeyInputWindow() +vcl::Window* ListBox::GetPreferredKeyInputWindow() { if ( mpImplLB ) { @@ -625,7 +625,7 @@ void ListBox::Resize() long nBottom = aOutSz.Height(); // Note: in case of no border, pBorder will actually be this - Window *pBorder = GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = GetWindow( WINDOW_BORDER ); ImplControlValue aControlValue; Point aPoint; Rectangle aContent, aBound; @@ -1158,7 +1158,7 @@ bool ListBox::IsInDropDown() const Rectangle ListBox::GetBoundingRectangle( sal_Int32 nItem ) const { Rectangle aRect = mpImplLB->GetMainWindow().GetBoundingRectangle( nItem ); - Rectangle aOffset = mpImplLB->GetMainWindow().GetWindowExtentsRelative( (Window*)this ); + Rectangle aOffset = mpImplLB->GetMainWindow().GetWindowExtentsRelative( (vcl::Window*)this ); aRect.Move( aOffset.TopLeft().X(), aOffset.TopLeft().Y() ); return aRect; } @@ -1283,7 +1283,7 @@ Size ListBox::CalcAdjustedSize( const Size& rPrefSize ) const { Size aSz = rPrefSize; sal_Int32 nLeft, nTop, nRight, nBottom; - ((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom ); + ((vcl::Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom ); aSz.Height() -= nTop+nBottom; if ( !IsDropDownBox() ) { @@ -1486,7 +1486,7 @@ void ListBox::SetEdgeBlending(bool bNew) } } -MultiListBox::MultiListBox( Window* pParent, WinBits nStyle ) : +MultiListBox::MultiListBox( vcl::Window* pParent, WinBits nStyle ) : ListBox( WINDOW_MULTILISTBOX ) { ImplInit( pParent, nStyle ); diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index d543c291ac95..288b7abeb018 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -37,7 +37,7 @@ void MenuButton::ImplInitMenuButtonData() mnMenuMode = 0; } -void MenuButton::ImplInit( Window* pParent, WinBits nStyle ) +void MenuButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { if ( !(nStyle & WB_NOTABSTOP) ) nStyle |= WB_TABSTOP; @@ -73,7 +73,7 @@ OString MenuButton::GetCurItemIdent() const mpMenu->GetItemIdent(mnCurItemId) : OString(); } -MenuButton::MenuButton( Window* pParent, WinBits nWinBits ) +MenuButton::MenuButton( vcl::Window* pParent, WinBits nWinBits ) : PushButton( WINDOW_MENUBUTTON ) { ImplInitMenuButtonData(); diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx index 0146cefce4ff..f84e0a891287 100644 --- a/vcl/source/control/morebtn.cxx +++ b/vcl/source/control/morebtn.cxx @@ -22,7 +22,7 @@ #include <tools/rc.h> #include <vector> -typedef ::std::vector< Window* > ImplMoreWindowList; +typedef ::std::vector< vcl::Window* > ImplMoreWindowList; struct ImplMoreButtonData { @@ -31,7 +31,7 @@ struct ImplMoreButtonData OUString maLessText; }; -void MoreButton::ImplInit( Window* pParent, WinBits nStyle ) +void MoreButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { mpMBData = new ImplMoreButtonData; mnDelta = 0; @@ -72,7 +72,7 @@ void MoreButton::ShowState() } } -MoreButton::MoreButton( Window* pParent, WinBits nStyle ) : +MoreButton::MoreButton( vcl::Window* pParent, WinBits nStyle ) : PushButton( WINDOW_MOREBUTTON ) { ImplInit( pParent, nStyle ); @@ -86,7 +86,7 @@ MoreButton::~MoreButton() void MoreButton::Click() { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); Size aSize( pParent->GetSizePixel() ); long nDeltaPixel = LogicToPixel( Size( 0, mnDelta ), meUnit ).Height(); diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx index 4634300a68b5..d1b7bf9d6d69 100644 --- a/vcl/source/control/prgsbar.cxx +++ b/vcl/source/control/prgsbar.cxx @@ -33,7 +33,7 @@ void ProgressBar::ImplInit() ImplInitSettings( true, true, true ); } -static WinBits clearProgressBarBorder( Window* pParent, WinBits nOrgStyle ) +static WinBits clearProgressBarBorder( vcl::Window* pParent, WinBits nOrgStyle ) { WinBits nOutStyle = nOrgStyle; if( pParent && (nOrgStyle & WB_BORDER) != 0 ) @@ -49,7 +49,7 @@ Size ProgressBar::GetOptimalSize() const return Size(150, 20); } -ProgressBar::ProgressBar( Window* pParent, WinBits nWinStyle ) : +ProgressBar::ProgressBar( vcl::Window* pParent, WinBits nWinStyle ) : Window( pParent, clearProgressBarBorder( pParent, nWinStyle ) ) { SetOutputSizePixel( GetOptimalSize() ); diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 4351d6ff9e21..8d144ce9a516 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -74,7 +74,7 @@ struct ImplScrollBarData Rectangle maTrackRect; // TODO: move to ScrollBar class when binary incompatibility of ScrollBar class is no longer problematic }; -void ScrollBar::ImplInit( Window* pParent, WinBits nStyle ) +void ScrollBar::ImplInit( vcl::Window* pParent, WinBits nStyle ) { mpData = NULL; mnThumbPixRange = 0; @@ -117,7 +117,7 @@ void ScrollBar::ImplInitStyle( WinBits nStyle ) mbFullDrag = (GetSettings().GetStyleSettings().GetDragFullOptions() & DRAGFULL_OPTION_SCROLL) != 0; } -ScrollBar::ScrollBar( Window* pParent, WinBits nStyle ) : +ScrollBar::ScrollBar( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_SCROLLBAR ) { ImplInit( pParent, nStyle ); @@ -622,9 +622,9 @@ void ScrollBar::ImplDraw( sal_uInt16 nDrawFlags, OutputDevice* pOutDev ) if ( mbCalcSize ) ImplCalc( false ); - Window *pWin = NULL; + vcl::Window *pWin = NULL; if( pOutDev->GetOutDevType() == OUTDEV_WINDOW ) - pWin = (Window*) pOutDev; + pWin = (vcl::Window*) pOutDev; // Draw the entire control if the native theme engine needs it if ( nDrawFlags && pWin && pWin->IsNativeControlSupported(CTRL_SCROLLBAR, PART_DRAW_BACKGROUND_HORZ) ) @@ -1428,7 +1428,7 @@ Size ScrollBar::getCurrentCalcSize() const return aCtrlRegion.GetSize(); } -void ScrollBarBox::ImplInit( Window* pParent, WinBits nStyle ) +void ScrollBarBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) { Window::ImplInit( pParent, nStyle, NULL ); @@ -1438,7 +1438,7 @@ void ScrollBarBox::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings(); } -ScrollBarBox::ScrollBarBox( Window* pParent, WinBits nStyle ) : +ScrollBarBox::ScrollBarBox( vcl::Window* pParent, WinBits nStyle ) : Window( WINDOW_SCROLLBARBOX ) { ImplInit( pParent, nStyle ); diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index f398d02a38e3..00cf7108c981 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -45,7 +45,7 @@ #define SLIDER_VIEW_STYLE (WB_3DLOOK | WB_HORZ | WB_VERT) -void Slider::ImplInit( Window* pParent, WinBits nStyle ) +void Slider::ImplInit( vcl::Window* pParent, WinBits nStyle ) { mnThumbPixOffset = 0; mnThumbPixRange = 0; @@ -73,7 +73,7 @@ void Slider::ImplInit( Window* pParent, WinBits nStyle ) SetSizePixel( CalcWindowSizePixel() ); } -Slider::Slider( Window* pParent, WinBits nStyle ) : +Slider::Slider( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_SLIDER ) { ImplInit( pParent, nStyle ); @@ -81,7 +81,7 @@ Slider::Slider( Window* pParent, WinBits nStyle ) : void Slider::ImplInitSettings() { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { EnableChildTransparentMode( true ); diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index d920737c3c01..f760aaf669e5 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -23,7 +23,7 @@ #include <vcl/spin.hxx> #include <vcl/settings.hxx> -void SpinButton::ImplInit( Window* pParent, WinBits nStyle ) +void SpinButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { mbUpperIn = false; mbLowerIn = false; @@ -48,7 +48,7 @@ void SpinButton::ImplInit( Window* pParent, WinBits nStyle ) Control::ImplInit( pParent, nStyle, NULL ); } -SpinButton::SpinButton( Window* pParent, WinBits nStyle ) +SpinButton::SpinButton( vcl::Window* pParent, WinBits nStyle ) :Control( WINDOW_SPINBUTTON ) ,mbUpperIsFocused( false ) { diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 325e770e1060..c027cbbccbf5 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -30,7 +30,7 @@ namespace { -void ImplGetSpinbuttonValue( Window *pWin, const Rectangle& rUpperRect, +void ImplGetSpinbuttonValue( vcl::Window *pWin, const Rectangle& rUpperRect, const Rectangle& rLowerRect, bool bUpperIn, bool bLowerIn, bool bUpperEnabled, bool bLowerEnabled, bool bHorz, @@ -71,7 +71,7 @@ void ImplGetSpinbuttonValue( Window *pWin, const Rectangle& rUpperRect, rValue.mnLowerPart = bHorz ? PART_BUTTON_RIGHT : PART_BUTTON_DOWN; } -bool ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbuttonValue ) +bool ImplDrawNativeSpinfield( vcl::Window *pWin, const SpinbuttonValue& rSpinbuttonValue ) { bool bNativeOK = false; @@ -89,7 +89,7 @@ bool ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbuttonVa else { // paint the spinbox as a whole, use borderwindow to have proper clipping - Window *pBorder = pWin->GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = pWin->GetWindow( WINDOW_BORDER ); // to not overwrite everything, set the button region as clipregion to the border window Rectangle aClipRect( rSpinbuttonValue.maLowerRect ); @@ -122,7 +122,7 @@ bool ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbuttonVa return bNativeOK; } -bool ImplDrawNativeSpinbuttons( Window *pWin, const SpinbuttonValue& rSpinbuttonValue ) +bool ImplDrawNativeSpinbuttons( vcl::Window *pWin, const SpinbuttonValue& rSpinbuttonValue ) { bool bNativeOK = false; @@ -189,7 +189,7 @@ void ImplDrawSpinButton( OutputDevice* pOutDev, if( pOutDev->GetOutDevType() == OUTDEV_WINDOW ) { - Window *pWin = (Window*) pOutDev; + vcl::Window *pWin = (vcl::Window*) pOutDev; // are we drawing standalone spin buttons or members of a spinfield ? ControlType aControl = CTRL_SPINBUTTONS; @@ -297,7 +297,7 @@ void SpinField::ImplInitSpinFieldData() mbInDropDown = false; } -void SpinField::ImplInit( Window* pParent, WinBits nWinStyle ) +void SpinField::ImplInit( vcl::Window* pParent, WinBits nWinStyle ) { Edit::ImplInit( pParent, nWinStyle ); @@ -337,14 +337,14 @@ SpinField::SpinField( WindowType nTyp ) : ImplInitSpinFieldData(); } -SpinField::SpinField( Window* pParent, WinBits nWinStyle ) : +SpinField::SpinField( vcl::Window* pParent, WinBits nWinStyle ) : Edit( WINDOW_SPINFIELD ) { ImplInitSpinFieldData(); ImplInit( pParent, nWinStyle ); } -SpinField::SpinField( Window* pParent, const ResId& rResId ) : +SpinField::SpinField( vcl::Window* pParent, const ResId& rResId ) : Edit( WINDOW_SPINFIELD ) { ImplInitSpinFieldData(); @@ -663,8 +663,8 @@ void SpinField::ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rec ! (GetStyle() & WB_DROPDOWN) && IsNativeControlSupported(CTRL_SPINBOX, PART_ENTIRE_CONTROL) ) { - Window *pWin = (Window*) pDev; - Window *pBorder = pWin->GetWindow( WINDOW_BORDER ); + vcl::Window *pWin = (vcl::Window*) pDev; + vcl::Window *pBorder = pWin->GetWindow( WINDOW_BORDER ); // get the system's spin button size ImplControlValue aControlValue; @@ -726,7 +726,7 @@ void SpinField::Resize() Rectangle aContent, aBound; // use the full extent of the control - Window *pBorder = GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = GetWindow( WINDOW_BORDER ); Rectangle aArea( aPoint, pBorder->GetOutputSizePixel() ); // adjust position and size of the edit field diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 0187b4e51b68..67cdbbe82934 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -82,7 +82,7 @@ struct ImplTabCtrlData // for the Tab positions #define TAB_PAGERECT 0xFFFF -void TabControl::ImplInit( Window* pParent, WinBits nStyle ) +void TabControl::ImplInit( vcl::Window* pParent, WinBits nStyle ) { mbLayoutDirty = true; @@ -144,7 +144,7 @@ void TabControl::ImplInitSettings( bool bFont, if ( bBackground ) { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( !IsControlBackground() && (pParent->IsChildTransparentModeEnabled() || IsNativeControlSupported(CTRL_TAB_PANE, PART_ENTIRE_CONTROL) @@ -183,7 +183,7 @@ void TabControl::ImplFreeLayoutData() } } -TabControl::TabControl( Window* pParent, WinBits nStyle ) : +TabControl::TabControl( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_TABCONTROL ) { ImplInit( pParent, nStyle ); @@ -575,7 +575,7 @@ void TabControl::ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId ) ImplTabItem* pItem = ImplGetItem( nId ); TabPage* pOldPage = (pOldItem) ? pOldItem->mpTabPage : NULL; TabPage* pPage = (pItem) ? pItem->mpTabPage : NULL; - Window* pCtrlParent = GetParent(); + vcl::Window* pCtrlParent = GetParent(); if ( IsReallyVisible() && IsUpdateMode() ) { @@ -646,7 +646,7 @@ void TabControl::ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId ) if ( pOldPage && pOldPage->HasChildPathFocus() ) { sal_uInt16 n = 0; - Window* pFirstChild = pPage->ImplGetDlgWindow( n, DLGWINDOW_FIRST ); + vcl::Window* pFirstChild = pPage->ImplGetDlgWindow( n, DLGWINDOW_FIRST ); if ( pFirstChild ) pFirstChild->ImplControlFocus( GETFOCUS_INIT ); else diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index c8b585bcb0d1..347f24a32e31 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -42,7 +42,7 @@ using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::Exception; namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode; -Throbber::Throbber( Window* i_parentWindow, WinBits i_style, const ImageSet i_imageSet ) +Throbber::Throbber( vcl::Window* i_parentWindow, WinBits i_style, const ImageSet i_imageSet ) :ImageControl( i_parentWindow, i_style ) ,mbRepeat( true ) ,mnStepTime( 100 ) |