1.Dtmf change 2.Removed Unlock

[apps/osp/Call.git] / src / CallActiveCallForm.cpp

diff --git a/src/CallActiveCallForm.cpp b/src/CallActiveCallForm.cpp
index 3c8952c..41f9a46 100644 (file)
--- a/src/CallActiveCallForm.cpp
+++ b/src/CallActiveCallForm.cpp
@@ -194,11 +194,7 @@ ActiveCallForm::OnInitializing(void)
 void
 ActiveCallForm::ShowDTMFKeypad(void)
 {
-       if(__pDTMFKeypad != null)
-       {
-               RemoveControl(*__pDTMFKeypad);
-               __pDTMFKeypad = null;
-       }
+
 
        if(__pDTMFKeypad == null)
        {
@@ -229,7 +225,6 @@ ActiveCallForm::ShowDTMFKeypad(void)
                }
        }
        EditField* pTextBox = static_cast<EditField*>(__pDTMFKeypad->GetControl(IDC_TEXTBOX));
-       pTextBox->SetText(L"");
        __pDTMFKeypad->SetShowState(true);
        __pDTMFKeypad->Draw(true);
        __pDTMFKeypad->Show();
@@ -289,8 +284,9 @@ ActiveCallForm::HideDTMFKeypad(void)
 {
        if(__pDTMFKeypad != null)
        {
-               RemoveControl(*__pDTMFKeypad);
-               __pDTMFKeypad = null;
+               __pDTMFKeypad->SetShowState(false);
+               __pDTMFKeypad->Draw(true);
+               __pDTMFKeypad->Show();
        }
 }
 
@@ -567,7 +563,6 @@ ActiveCallForm::OnActionPerformed(const Control& source, int actionId)
                SetShowStateOnKeypad(false);
                }
                ShowDTMFKeypad();
-               SetTextToDTMFTextField(L"");
                __pCallButtonsPanel->SetKeypadButtonState(IDA_CLOSE_NUMKEYPAD);
        }
        break;