equal
deleted
inserted
replaced
28 // CMRImage::~CMRImage |
28 // CMRImage::~CMRImage |
29 // --------------------------------------------------------------------------- |
29 // --------------------------------------------------------------------------- |
30 // |
30 // |
31 EXPORT_C CMRImage* CMRImage::NewL( |
31 EXPORT_C CMRImage* CMRImage::NewL( |
32 NMRBitmapManager::TMRBitmapId aBitmapId, |
32 NMRBitmapManager::TMRBitmapId aBitmapId, |
|
33 const CCoeControl* aParent, |
33 TBool aIsMaskIcon, |
34 TBool aIsMaskIcon, |
34 TScaleMode aScaleMode ) |
35 TScaleMode aScaleMode ) |
35 { |
36 { |
36 CMRImage* self = new (ELeave) CMRImage( aScaleMode ); |
37 CMRImage* self = new (ELeave) CMRImage( aScaleMode ); |
37 CleanupStack::PushL( self ); |
38 CleanupStack::PushL( self ); |
38 self->ConstructL( aBitmapId, aIsMaskIcon ); |
39 self->ConstructL( aBitmapId, aParent, aIsMaskIcon ); |
39 CleanupStack::Pop( self ); |
40 CleanupStack::Pop( self ); |
40 return self; |
41 return self; |
41 } |
42 } |
42 |
43 |
43 // --------------------------------------------------------------------------- |
44 // --------------------------------------------------------------------------- |
72 |
73 |
73 // --------------------------------------------------------------------------- |
74 // --------------------------------------------------------------------------- |
74 // CMRImage::ConstructL |
75 // CMRImage::ConstructL |
75 // --------------------------------------------------------------------------- |
76 // --------------------------------------------------------------------------- |
76 // |
77 // |
77 void CMRImage::ConstructL( NMRBitmapManager::TMRBitmapId aBitmapId, |
78 void CMRImage::ConstructL( |
78 TBool aIsMaskIcon ) |
79 NMRBitmapManager::TMRBitmapId aBitmapId, |
|
80 const CCoeControl* aParent, |
|
81 TBool aIsMaskIcon ) |
79 { |
82 { |
80 if( aIsMaskIcon ) |
83 if ( aIsMaskIcon ) |
81 { |
84 { |
82 CreateMaskIconL( aBitmapId ); |
85 CreateMaskIconL( aBitmapId ); |
83 } |
86 } |
84 else |
87 else |
85 { |
88 { |
86 CreateIconL( aBitmapId ); |
89 CreateIconL( aBitmapId ); |
87 } |
90 } |
|
91 |
|
92 if ( aParent ) |
|
93 { |
|
94 SetContainerWindowL( *aParent ); |
|
95 } |
88 } |
96 } |
89 |
97 |
90 // --------------------------------------------------------------------------- |
98 // --------------------------------------------------------------------------- |
91 // CMRImage::CreateIconL |
99 // CMRImage::CreateIconL |
92 // --------------------------------------------------------------------------- |
100 // --------------------------------------------------------------------------- |