Resolved issue N_SE-39048

[apps/osp/Calendar.git] / src / ClYearPanel.cpp

diff --git a/src/ClYearPanel.cpp b/src/ClYearPanel.cpp
index 2074eaa..5030066 100644 (file)
--- a/src/ClYearPanel.cpp
+++ b/src/ClYearPanel.cpp
@@ -322,6 +322,7 @@ YearPanel::YearPanel(void)
        : __pPm(null)
        , __pPanningAnimationManager(null)
        , __pBitmapFocus(null)
+       , __pGoToDatePopup(null)
 {
        memset((void *)__pPanelYearCalendar, 0, sizeof(Panel*) * VIEW_SCROLL_EFFECT_COUNT);
        memset((void *)__pBitmapWeekText, 0, sizeof(Bitmap*) * YEAR_PANEL_COUNT_OF_WEEK);
@@ -371,6 +372,9 @@ YearPanel::OnInitializing(void)
        pCalendarPanel->SetDateFocusEventListener(*this);
        __pPanelYearCalendar[VIEW_SCROLL_EFFECT_CURRENT] = pCalendarPanel;
 
+       __pGoToDatePopup = new (std::nothrow) GoToDatePopup();
+       __pGoToDatePopup->Initialize();
+
        return E_SUCCESS;
 }
 
@@ -391,6 +395,11 @@ YearPanel::OnTerminating(void)
        }
        delete __pBitmapFocus;
 
+       if (__pGoToDatePopup)
+       {
+               __pGoToDatePopup->Destroy();
+       }
+
        return E_SUCCESS;
 }
 
@@ -404,7 +413,7 @@ YearPanel::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
                __pPm->SetTodayToCurrentDate();
                break;
        case IDA_SUB_MENU_GO_TO_DATE:
-               GoToDatePopup::RequestGoToDate(__pPm->GetCurrentDate(), this);
+               __pGoToDatePopup->RequestPopup(__pPm->GetCurrentDate(), this);
                break;
        case IDA_MAIN_FORM_FOOTER_CREATE:
        {