diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-05-05 13:46:44 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-05-05 15:51:11 +0200 |
commit | 8fca0c44e8f21fa2ee1000665856292d5a1c44e9 (patch) | |
tree | e750236facc3fd44b051a70aaa0e81be0fc2c002 /vcl/source/control/fixed.cxx | |
parent | f24590521c5ffea13c0aecdb2f30fdd39bbfbc45 (diff) |
vcl: rename other members of StateChangedType for consistency
Change-Id: Ifd3339813e5d3dfb54566fd226aaf2d2a199d59a
Diffstat (limited to 'vcl/source/control/fixed.cxx')
-rw-r--r-- | vcl/source/control/fixed.cxx | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index c8acbd1aaa1d..7b42fee92ffb 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -287,14 +287,14 @@ void FixedText::StateChanged( StateChangedType nType ) { Control::StateChanged( nType ); - if ( (nType == StateChangedType::ENABLE) || - (nType == StateChangedType::TEXT) || - (nType == StateChangedType::UPDATEMODE) ) + if ( (nType == StateChangedType::Enable) || + (nType == StateChangedType::Text) || + (nType == StateChangedType::UpdateMode) ) { if ( IsReallyVisible() && IsUpdateMode() ) Invalidate(); } - else if ( nType == StateChangedType::STYLE ) + else if ( nType == StateChangedType::Style ) { SetStyle( ImplInitStyle( GetStyle() ) ); if ( (GetPrevStyle() & FIXEDTEXT_VIEW_STYLE) != @@ -304,18 +304,18 @@ void FixedText::StateChanged( StateChangedType nType ) Invalidate(); } } - else if ( (nType == StateChangedType::ZOOM) || - (nType == StateChangedType::CONTROLFONT) ) + else if ( (nType == StateChangedType::Zoom) || + (nType == StateChangedType::ControlFont) ) { ImplInitSettings( true, false, false ); Invalidate(); } - else if ( nType == StateChangedType::CONTROLFOREGROUND ) + else if ( nType == StateChangedType::ControlForeground ) { ImplInitSettings( false, true, false ); Invalidate(); } - else if ( nType == StateChangedType::CONTROLBACKGROUND ) + else if ( nType == StateChangedType::ControlBackground ) { ImplInitSettings( false, false, true ); Invalidate(); @@ -660,33 +660,33 @@ void FixedLine::StateChanged( StateChangedType nType ) { Control::StateChanged( nType ); - if ( (nType == StateChangedType::ENABLE) || - (nType == StateChangedType::TEXT) || - (nType == StateChangedType::UPDATEMODE) ) + if ( (nType == StateChangedType::Enable) || + (nType == StateChangedType::Text) || + (nType == StateChangedType::UpdateMode) ) { if ( IsReallyVisible() && IsUpdateMode() ) Invalidate(); } - else if ( nType == StateChangedType::STYLE ) + else if ( nType == StateChangedType::Style ) { SetStyle( ImplInitStyle( GetStyle() ) ); if ( (GetPrevStyle() & FIXEDLINE_VIEW_STYLE) != (GetStyle() & FIXEDLINE_VIEW_STYLE) ) Invalidate(); } - else if ( (nType == StateChangedType::ZOOM) || - (nType == StateChangedType::STYLE) || - (nType == StateChangedType::CONTROLFONT) ) + else if ( (nType == StateChangedType::Zoom) || + (nType == StateChangedType::Style) || + (nType == StateChangedType::ControlFont) ) { ImplInitSettings( true, false, false ); Invalidate(); } - else if ( nType == StateChangedType::CONTROLFOREGROUND ) + else if ( nType == StateChangedType::ControlForeground ) { ImplInitSettings( false, true, false ); Invalidate(); } - else if ( nType == StateChangedType::CONTROLBACKGROUND ) + else if ( nType == StateChangedType::ControlBackground ) { ImplInitSettings( false, false, true ); Invalidate(); @@ -810,20 +810,20 @@ void FixedBitmap::StateChanged( StateChangedType nType ) { Control::StateChanged( nType ); - if ( (nType == StateChangedType::DATA) || - (nType == StateChangedType::UPDATEMODE) ) + if ( (nType == StateChangedType::Data) || + (nType == StateChangedType::UpdateMode) ) { if ( IsReallyVisible() && IsUpdateMode() ) Invalidate(); } - else if ( nType == StateChangedType::STYLE ) + else if ( nType == StateChangedType::Style ) { SetStyle( ImplInitStyle( GetStyle() ) ); if ( (GetPrevStyle() & FIXEDBITMAP_VIEW_STYLE) != (GetStyle() & FIXEDBITMAP_VIEW_STYLE) ) Invalidate(); } - else if ( nType == StateChangedType::CONTROLBACKGROUND ) + else if ( nType == StateChangedType::ControlBackground ) { ImplInitSettings(); Invalidate(); @@ -845,7 +845,7 @@ void FixedBitmap::DataChanged( const DataChangedEvent& rDCEvt ) void FixedBitmap::SetBitmap( const Bitmap& rBitmap ) { maBitmap = rBitmap; - StateChanged( StateChangedType::DATA ); + StateChanged( StateChangedType::Data ); queue_resize(); } @@ -984,21 +984,21 @@ void FixedImage::StateChanged( StateChangedType nType ) { Control::StateChanged( nType ); - if ( (nType == StateChangedType::ENABLE) || - (nType == StateChangedType::DATA) || - (nType == StateChangedType::UPDATEMODE) ) + if ( (nType == StateChangedType::Enable) || + (nType == StateChangedType::Data) || + (nType == StateChangedType::UpdateMode) ) { if ( IsReallyVisible() && IsUpdateMode() ) Invalidate(); } - else if ( nType == StateChangedType::STYLE ) + else if ( nType == StateChangedType::Style ) { SetStyle( ImplInitStyle( GetStyle() ) ); if ( (GetPrevStyle() & FIXEDIMAGE_VIEW_STYLE) != (GetStyle() & FIXEDIMAGE_VIEW_STYLE) ) Invalidate(); } - else if ( nType == StateChangedType::CONTROLBACKGROUND ) + else if ( nType == StateChangedType::ControlBackground ) { ImplInitSettings(); Invalidate(); @@ -1022,7 +1022,7 @@ void FixedImage::SetImage( const Image& rImage ) if ( rImage != maImage ) { maImage = rImage; - StateChanged( StateChangedType::DATA ); + StateChanged( StateChangedType::Data ); queue_resize(); } } |