diff options
| author | Jesso Clarence Murugan <developer.jesso@gmail.com> | 2012-07-16 12:18:02 +0300 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-07-16 11:44:42 +0100 |
| commit | 8a768fe2d780bdcb60c0dc0c4bc38410052233a4 (patch) | |
| tree | 205ac02312712f026a9ab811f4ce10b539687d5a /vcl/source/control | |
| parent | 1d1e7313ab076c919ce1bd095bac07480cea392f (diff) | |
Replaced all calls to deprecated function ImplDelData::IsDelete()
Deleted the function ImplDelData::IsDelete() and replaced all calls
to it with calls to ImplDelData::IsDead() directly. IsDelete () function
itself was only a simple wrapper to IsDead () (and mentioned as deprecated)
Change-Id: I71baf68801219cfbe2d2dc41d6bd5e419b9b4a87
Diffstat (limited to 'vcl/source/control')
| -rw-r--r-- | vcl/source/control/button.cxx | 18 | ||||
| -rw-r--r-- | vcl/source/control/ctrl.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/control/lstbox.cxx | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 9ba7e8f0fbf6..3dd6097465f7 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -2346,7 +2346,7 @@ void RadioButton::ImplUncheckAllOther() ImplDelData aDelData; pWindow->ImplAddDel( &aDelData ); ((RadioButton*)pWindow)->SetState( sal_False ); - if ( aDelData.IsDelete() ) + if ( aDelData.IsDead() ) return; pWindow->ImplRemoveDel( &aDelData ); } @@ -2376,7 +2376,7 @@ void RadioButton::ImplUncheckAllOther() ImplDelData aDelData; pWindow->ImplAddDel( &aDelData ); ((RadioButton*)pWindow)->SetState( sal_False ); - if ( aDelData.IsDelete() ) + if ( aDelData.IsDead() ) return; pWindow->ImplRemoveDel( &aDelData ); } @@ -2401,18 +2401,18 @@ void RadioButton::ImplCallClick( sal_Bool bGrabFocus, sal_uInt16 nFocusFlags ) ImplAddDel( &aDelData ); if ( mbRadioCheck ) ImplUncheckAllOther(); - if ( aDelData.IsDelete() ) + if ( aDelData.IsDead() ) return; if ( bGrabFocus ) ImplGrabFocus( nFocusFlags ); - if ( aDelData.IsDelete() ) + if ( aDelData.IsDead() ) return; if ( mbStateChanged ) Toggle(); - if ( aDelData.IsDelete() ) + if ( aDelData.IsDead() ) return; Click(); - if ( aDelData.IsDelete() ) + if ( aDelData.IsDead() ) return; ImplRemoveDel( &aDelData ); mbStateChanged = sal_False; @@ -2831,11 +2831,11 @@ void RadioButton::Check( sal_Bool bCheck ) ImplDelData aDelData; ImplAddDel( &aDelData ); StateChanged( STATE_CHANGE_STATE ); - if ( aDelData.IsDelete() ) + if ( aDelData.IsDead() ) return; if ( bCheck && mbRadioCheck ) ImplUncheckAllOther(); - if ( aDelData.IsDelete() ) + if ( aDelData.IsDead() ) return; Toggle(); ImplRemoveDel( &aDelData ); @@ -3351,7 +3351,7 @@ void CheckBox::ImplCheck() ImplInvalidateOrDrawCheckBoxState(); if( ! (GetStyle() & WB_EARLYTOGGLE) ) Toggle(); - if ( aDelData.IsDelete() ) + if ( aDelData.IsDead() ) return; ImplRemoveDel( &aDelData ); Click(); diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index cd1c7df39cd5..5039c2b83e15 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -371,11 +371,11 @@ sal_Bool Control::ImplCallEventListenersAndHandler( sal_uLong nEvent, const Lin ImplAddDel( &aCheckDelete ); ImplCallEventListeners( nEvent ); - if ( !aCheckDelete.IsDelete() ) + if ( !aCheckDelete.IsDead() ) { rHandler.Call( pCaller ); - if ( !aCheckDelete.IsDelete() ) + if ( !aCheckDelete.IsDead() ) { ImplRemoveDel( &aCheckDelete ); return sal_False; diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index bf12e2d1c0b6..6a36f004469b 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -348,7 +348,7 @@ IMPL_LINK_NOARG(ListBox, ImplPopupModeEndHdl) ImplDelData aCheckDelete; ImplAddDel( &aCheckDelete ); Select(); - if ( aCheckDelete.IsDelete() ) + if ( aCheckDelete.IsDead() ) return 0; ImplRemoveDel( &aCheckDelete ); |