equal
deleted
inserted
replaced
129 #endif |
129 #endif |
130 } |
130 } |
131 |
131 |
132 void CAknFepUIAvkonImpl::DeleteDialogs() |
132 void CAknFepUIAvkonImpl::DeleteDialogs() |
133 { |
133 { |
|
134 // If there is no dialog displayed, do not need delete the dialog, |
|
135 // but set all dialog pointer to null and return |
|
136 if( !CEikonEnv::Static()->EikAppUi()->IsDisplayingMenuOrDialog()) |
|
137 { |
|
138 iDialog = NULL; |
|
139 iCharMapDialog = NULL; |
|
140 iListQueryDialog = NULL; |
|
141 iTextQueryDialog = NULL; |
|
142 iPredictiveSettingDialog = NULL; |
|
143 return; |
|
144 } |
|
145 |
134 if(iDialog) |
146 if(iDialog) |
135 { |
147 { |
136 delete iDialog; |
148 delete iDialog; |
137 iDialog = NULL; |
149 iDialog = NULL; |
138 } |
150 } |
330 |
342 |
331 TUint8 version = (TUint8)reader.ReadUint8(); |
343 TUint8 version = (TUint8)reader.ReadUint8(); |
332 TInt commandId; |
344 TInt commandId; |
333 if (version == KAknCbaVersion) |
345 if (version == KAknCbaVersion) |
334 { |
346 { |
335 TUint32 shortCommandId = reader.ReadUint16(); |
347 commandId = reader.ReadInt16(); |
336 TUint32 longCommandId = reader.ReadUint16(); |
348 reader.ReadInt16(); //long press id |
337 commandId = (longCommandId << 16) | shortCommandId; |
|
338 } |
349 } |
339 else |
350 else |
340 { |
351 { |
341 commandId = TInt(TUint(reader.ReadUint16())); |
352 commandId =reader.ReadInt16(); |
342 } |
353 } |
343 TPtrC text=reader.ReadTPtrC(); |
354 TPtrC text=reader.ReadTPtrC(); |
344 reader.ReadTPtrC(); // bmp filename |
355 reader.ReadTPtrC(); // bmp filename |
345 reader.ReadInt16(); // bmp id |
356 reader.ReadInt16(); // bmp id |
346 reader.ReadInt16(); // bmp mask id |
357 reader.ReadInt16(); // bmp mask id |