From 1a8addc13734164d649974ea2f6426d12e8992a2 Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Sat, 29 Jun 2013 15:20:03 +0400 Subject: GetNativeControlRegion is const Change-Id: I0b34001e99036f197a50ff24b854e5a07eac6f06 --- vcl/source/control/button.cxx | 4 ++-- vcl/source/control/edit.cxx | 2 +- vcl/source/control/lstbox.cxx | 8 ++++---- vcl/source/gdi/outdevnative.cxx | 2 +- vcl/source/window/status.cxx | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'vcl') diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 78a600b184ec..a5781ee61d35 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -2903,7 +2903,7 @@ Size RadioButton::ImplGetRadioImageSize() const Rectangle aBoundingRgn, aContentRgn; // get native size of a radio button - if( pThis->GetNativeControlRegion( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion, + if( GetNativeControlRegion( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion, nState, aControlValue, OUString(), aBoundingRgn, aContentRgn ) ) { @@ -3837,7 +3837,7 @@ Size CheckBox::ImplGetCheckImageSize() const Rectangle aBoundingRgn, aContentRgn; // get native size of a check box - if( pThis->GetNativeControlRegion( CTRL_CHECKBOX, PART_ENTIRE_CONTROL, aCtrlRegion, + if( GetNativeControlRegion( CTRL_CHECKBOX, PART_ENTIRE_CONTROL, aCtrlRegion, nState, aControlValue, OUString(), aBoundingRgn, aContentRgn ) ) { diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 513047c76426..a27fe60045c0 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2926,7 +2926,7 @@ Size Edit::CalcMinimumSizeForText(const OUString &rString) const ImplControlValue aControlValue; Rectangle aRect( Point( 0, 0 ), aSize ); Rectangle aContent, aBound; - if( const_cast(this)->GetNativeControlRegion( + if( GetNativeControlRegion( eCtrlType, PART_ENTIRE_CONTROL, aRect, 0, aControlValue, OUString(), aBound, aContent) ) { diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 4b5c1a43f898..abd4f2374c51 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -1256,8 +1256,8 @@ Size ListBox::CalcMinimumSize() const Rectangle aContent, aBound; Size aTestSize( 100, 20 ); Rectangle aArea( aPoint, aTestSize ); - if( const_cast(this)->GetNativeControlRegion( - CTRL_LISTBOX, PART_SUB_EDIT, aArea, 0, aControlValue, OUString(), aBound, aContent) ) + if( GetNativeControlRegion( CTRL_LISTBOX, PART_SUB_EDIT, aArea, 0, + aControlValue, OUString(), aBound, aContent) ) { // use the themes drop down size aSz.Width() += aTestSize.Width() - aContent.GetWidth(); @@ -1273,8 +1273,8 @@ Size ListBox::CalcMinimumSize() const ImplControlValue aControlValue; Rectangle aRect( Point( 0, 0 ), aSz ); Rectangle aContent, aBound; - if( const_cast(this)->GetNativeControlRegion( - CTRL_LISTBOX, PART_ENTIRE_CONTROL, aRect, 0, aControlValue, OUString(), aBound, aContent) ) + if( GetNativeControlRegion( CTRL_LISTBOX, PART_ENTIRE_CONTROL, aRect, 0, + aControlValue, OUString(), aBound, aContent) ) { if( aBound.GetHeight() > aSz.Height() ) aSz.Height() = aBound.GetHeight(); diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx index 4727ba6dedef..fe0ed275a8ba 100644 --- a/vcl/source/gdi/outdevnative.cxx +++ b/vcl/source/gdi/outdevnative.cxx @@ -147,7 +147,7 @@ PushButtonValue* PushButtonValue::clone() const // ----------------------------------------------------------------------- -sal_Bool OutputDevice::IsNativeControlSupported( ControlType nType, ControlPart nPart ) +sal_Bool OutputDevice::IsNativeControlSupported( ControlType nType, ControlPart nPart ) const { if( !lcl_enableNativeWidget( *this ) ) return sal_False; diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 78705c79b1c8..7ec6fd79d968 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -1602,9 +1602,9 @@ Size StatusBar::CalcWindowSizePixel() const ImplControlValue aValue; Rectangle aControlRegion( (const Point&)Point(), Size( nCalcWidth, nMinHeight ) ); Rectangle aNativeControlRegion, aNativeContentRegion; - if( pThis->GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, - CTRL_STATE_ENABLED, aValue, OUString(), - aNativeControlRegion, aNativeContentRegion ) ) + if( GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, + aControlRegion, CTRL_STATE_ENABLED, aValue, OUString(), + aNativeControlRegion, aNativeContentRegion ) ) { nProgressHeight = aNativeControlRegion.GetHeight(); } @@ -1616,8 +1616,8 @@ Size StatusBar::CalcWindowSizePixel() const ImplControlValue aControlValue( FRAME_DRAW_NODRAW ); Rectangle aBound, aContent; Rectangle aNatRgn( Point( 0, 0 ), Size( 150, 50 ) ); - if( pThis->GetNativeControlRegion(CTRL_FRAME, PART_BORDER, - aNatRgn, 0, aControlValue, OUString(), aBound, aContent) ) + if( GetNativeControlRegion(CTRL_FRAME, PART_BORDER, + aNatRgn, 0, aControlValue, OUString(), aBound, aContent) ) { mpImplData->mnItemBorderWidth = ( aBound.GetHeight() - aContent.GetHeight() ) / 2; -- cgit