--- a/meetingrequest/mrgui/mrfieldbuilderplugin/src/cmrmulticalenfield.cpp Mon Jun 21 15:20:54 2010 +0300
+++ b/meetingrequest/mrgui/mrfieldbuilderplugin/src/cmrmulticalenfield.cpp Thu Jul 15 18:19:25 2010 +0300
@@ -178,8 +178,10 @@
delete iLockIcon;
iLockIcon = NULL;
- iLockIcon = CMRImage::NewL( NMRBitmapManager::EMRBitmapLockField, ETrue );
- iIcon->SetParent( this );
+ iLockIcon = CMRImage::NewL(
+ NMRBitmapManager::EMRBitmapLockField,
+ this,
+ ETrue );
}
// ---------------------------------------------------------------------------
@@ -228,16 +230,13 @@
{
FUNC_LOG;
- iCalenName = CMRLabel::NewL();
+ iCalenName = CMRLabel::NewL( this );
CESMRField::ConstructL( iCalenName );
iCalenName->SetTextL( KNullDesC() );
- TGulAlignment align;
- align.SetHAlignment( EHLeft );
- align.SetVAlignment( EVCenter );
- iCalenName->SetAlignment( align );
-
- iIcon = CMRImage::NewL( NMRBitmapManager::EMRBitmapCalendarSelection );
+ iIcon = CMRImage::NewL(
+ NMRBitmapManager::EMRBitmapCalendarSelection,
+ this );
}
@@ -291,12 +290,12 @@
{
case 0:
{
- control = iCalenName;
+ control = iIcon;
break;
}
case 1:
{
- control = iIcon;
+ control = iCalenName;
break;
}
case 2:
@@ -371,21 +370,6 @@
}
// ---------------------------------------------------------------------------
-// CMRMultiCalenField::SetContainerWindowL
-// ---------------------------------------------------------------------------
-//
-void CMRMultiCalenField::SetContainerWindowL(
- const CCoeControl& aContainer )
- {
- FUNC_LOG;
- CCoeControl::SetContainerWindowL( aContainer );
- iCalenName->SetContainerWindowL( aContainer );
- iCalenName->SetParent( this );
- iIcon->SetContainerWindowL( aContainer );
- iIcon->SetParent( this );
- }
-
-// ---------------------------------------------------------------------------
// CMRMultiCalenField::SetTextDimmed
// ---------------------------------------------------------------------------
//