equal
deleted
inserted
replaced
85 /** |
85 /** |
86 * |
86 * |
87 */ |
87 */ |
88 EXPORT_C CAknDialog::~CAknDialog() |
88 EXPORT_C CAknDialog::~CAknDialog() |
89 { |
89 { |
90 AknItemActionMenuRegister::SetConstructingMenuBarOwnerL( NULL ); |
90 AknItemActionMenuRegister::RemoveConstructingMenuBarOwner( this ); |
91 |
91 |
92 if ( iCoeEnv->AppUi() && iAttributes ) |
92 if ( iCoeEnv->AppUi() && iAttributes ) |
93 if (iAttributes->iAknDialogFlags&EAknDialogFlagDefaultSounds) // return original sound stack |
93 if (iAttributes->iAknDialogFlags&EAknDialogFlagDefaultSounds) // return original sound stack |
94 { |
94 { |
95 iAvkonAppUiBase->KeySounds()->PopContext(); |
95 iAvkonAppUiBase->KeySounds()->PopContext(); |
241 /** |
241 /** |
242 * |
242 * |
243 */ |
243 */ |
244 EXPORT_C void CAknDialog::DisplayMenuL() |
244 EXPORT_C void CAknDialog::DisplayMenuL() |
245 { |
245 { |
246 iMenuBar->TryDisplayMenuBarL(); |
246 if (iMenuBar) |
|
247 { |
|
248 iMenuBar->TryDisplayMenuBarL(); |
|
249 } |
247 } |
250 } |
248 |
251 |
249 /** |
252 /** |
250 * |
253 * |
251 */ |
254 */ |