diff -r e5618cc85d74 -r 6c158198356e javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swtprogressbar.cpp --- a/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swtprogressbar.cpp Thu Jul 15 18:31:06 2010 +0300 +++ b/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swtprogressbar.cpp Thu Aug 19 09:48:13 2010 +0300 @@ -25,8 +25,18 @@ #include "swtfont.h" #include "swtprogressbar.h" + +/** + * Default value of the ProgressBar + */ +const TInt KDefaultProgressBarSelectionValue= 0; +const TInt KDefaultProgressBarMinValue = 0; +const TInt KDefaultProgressBarMaxValue = 100; + + // ======== MEMBER FUNCTIONS ======== + TInt CSwtProgressBar::AnimationCallBack(TAny* aPtr) { CSwtProgressBar* progressBar = static_cast(aPtr); @@ -143,8 +153,8 @@ AknsUtils::CreateIconL(skin, KAknsIIDQgnGrafBarProgress, bitmap, mask, KAvkonBitmapFile, EMbmAvkonQgn_graf_bar_progress, EMbmAvkonQgn_graf_bar_progress_mask); - iImagesToDelete.Append(bitmap); - iImagesToDelete.Append(mask); + iImagesToDelete.AppendL(bitmap); + iImagesToDelete.AppendL(mask); User::LeaveIfError(iBarImages.Append(bitmap)); User::LeaveIfError(iBarMasks.Append(mask)); } @@ -177,8 +187,8 @@ bitmap = aknAnimation ->BitmapAnimData()->FrameArray().At(i)->Bitmap(); mask = aknAnimation ->BitmapAnimData()->FrameArray().At(i)->Mask(); - iImagesToDelete.Append(bitmap); - iImagesToDelete.Append(mask); + iImagesToDelete.AppendL(bitmap); + iImagesToDelete.AppendL(mask); User::LeaveIfError(iBarImages.Append(bitmap)); if (mask) @@ -195,23 +205,23 @@ iBarFrameLeftImage, iBarFrameLeftMask, KAvkonBitmapFile, EMbmAvkonQgn_graf_bar_frame_side_l, EMbmAvkonQgn_graf_bar_frame_side_l_mask); - iImagesToDelete.Append(iBarFrameLeftImage); - iImagesToDelete.Append(iBarFrameLeftMask); + iImagesToDelete.AppendL(iBarFrameLeftImage); + iImagesToDelete.AppendL(iBarFrameLeftMask); AknsUtils::CreateIconL(skin, KAknsIIDQgnGrafBarFrameCenter, iBarFrameCenterImage, iBarFrameCenterMask, KAvkonBitmapFile, EMbmAvkonQgn_graf_bar_frame_center, EMbmAvkonQgn_graf_bar_frame_center_mask); - iImagesToDelete.Append(iBarFrameCenterImage); - iImagesToDelete.Append(iBarFrameCenterMask); + iImagesToDelete.AppendL(iBarFrameCenterImage); + iImagesToDelete.AppendL(iBarFrameCenterMask); AknsUtils::CreateIconL(skin, KAknsIIDQgnGrafBarFrameSideR, iBarFrameRightImage, iBarFrameRightMask, KAvkonBitmapFile, EMbmAvkonQgn_graf_bar_frame_side_r, EMbmAvkonQgn_graf_bar_frame_side_r_mask); - iImagesToDelete.Append(iBarFrameRightImage); - iImagesToDelete.Append(iBarFrameRightMask); + iImagesToDelete.AppendL(iBarFrameRightImage); + iImagesToDelete.AppendL(iBarFrameRightMask); if (iStyle & KSwtStyleIndeterminate && IsVisible()) { @@ -268,12 +278,12 @@ TRAP(error, (aBitmap = CreatePlainBitmapL(aBitmap))); if (error == KErrNone) - iImagesToDelete.Append(aBitmap); + TRAP_IGNORE(iImagesToDelete.AppendL(aBitmap)); } } if (error == KErrNone) - iImagesRotator->AddImage(aBitmap); + TRAP_IGNORE(iImagesRotator->AddImageL(aBitmap)); } }