From e72c495393ad90a8f72526c60e6d43a1efa01cb4 Mon Sep 17 00:00:00 2001 From: Amith Kumar Mahale Date: Sat, 30 Mar 2013 17:19:55 +0530 Subject: [PATCH] 1.Fixed the order of control deletion Change-Id: I307fd4527365cf75075eb7224b3f67c95addc2b0 Signed-off-by: Amith Kumar Mahale --- res/screen-size-normal/IDL_DTMF_KEYPAD_PANEL.xml | 2 +- src/CallButtonsPanel.cpp | 2 +- src/CallConfCallerListForm.cpp | 2 +- src/CallDtmfKeypadPanel.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/res/screen-size-normal/IDL_DTMF_KEYPAD_PANEL.xml b/res/screen-size-normal/IDL_DTMF_KEYPAD_PANEL.xml index b8e3029..f5a3218 100644 --- a/res/screen-size-normal/IDL_DTMF_KEYPAD_PANEL.xml +++ b/res/screen-size-normal/IDL_DTMF_KEYPAD_PANEL.xml @@ -15,7 +15,7 @@ - + diff --git a/src/CallButtonsPanel.cpp b/src/CallButtonsPanel.cpp index 0da8e83..ec50816 100644 --- a/src/CallButtonsPanel.cpp +++ b/src/CallButtonsPanel.cpp @@ -137,7 +137,7 @@ result CallButtonsPanel::OnTerminating(void) { //remove all child controls... - RemoveAllControls(); +// RemoveAllControls(); return E_SUCCESS; } diff --git a/src/CallConfCallerListForm.cpp b/src/CallConfCallerListForm.cpp index 9b82799..a1ec7f6 100644 --- a/src/CallConfCallerListForm.cpp +++ b/src/CallConfCallerListForm.cpp @@ -175,7 +175,7 @@ ConfCallerListForm::OnTerminating(void) __pConfCallInfo = null; } - RemoveAllControls(); + //RemoveAllControls(); return r; } diff --git a/src/CallDtmfKeypadPanel.cpp b/src/CallDtmfKeypadPanel.cpp index cb62907..066e618 100644 --- a/src/CallDtmfKeypadPanel.cpp +++ b/src/CallDtmfKeypadPanel.cpp @@ -325,7 +325,7 @@ DtmfKeyPadPanel::SetBackgroundtoButton() return E_SUCCESS; CATCH: - RemoveAllControls(); + //RemoveAllControls(); return r; } @@ -527,6 +527,6 @@ result DtmfKeyPadPanel::OnTerminating(void) { result r = E_SUCCESS; - RemoveAllControls(); + //RemoveAllControls(); return r; } -- 2.7.4