diff -r 53c8aa5d97a3 -r 8f559c47d7fd camerauis/cameraapp/generic/src/CamStandbyContainer.cpp --- a/camerauis/cameraapp/generic/src/CamStandbyContainer.cpp Tue May 25 12:22:04 2010 +0300 +++ b/camerauis/cameraapp/generic/src/CamStandbyContainer.cpp Wed Jun 09 09:21:41 2010 +0300 @@ -128,8 +128,7 @@ // TInt CCamStandbyContainer::CountComponentControls() const { - TInt count = 1; - return count; // Return the number of controls inside this container + return CCamContainerBase::CountComponentControls() + 1; } // --------------------------------------------------------- @@ -139,17 +138,20 @@ // CCoeControl* CCamStandbyContainer::ComponentControl( TInt aIndex ) const { + CCoeControl* control = CCamContainerBase::ComponentControl( aIndex ); + if( control ) + return control; switch ( aIndex ) { - case 0: + case 1: { - return iText; + control = iText; } + break; default: - { - return NULL; - } + break; } + return control; } // ---------------------------------------------------------