sync with master

diff --git a/project/src/MapDataControlForm.cpp b/project/src/MapDataControlForm.cpp
index 2f7e4c4..71401e1 100644 (file)
--- a/project/src/MapDataControlForm.cpp
+++ b/project/src/MapDataControlForm.cpp
@@ -43,6 +43,7 @@ MapDataControlForm::MapDataControlForm(void)
 MapDataControlForm::~MapDataControlForm(void)
 {
        __map.RemoveAll(true);
+       delete __pMapDataControl;
 }
 
 bool

diff --git a/project/src/SelectDictionaryDataControlForm.cpp b/project/src/SelectDictionaryDataControlForm.cpp
index 6c343fd..243b36c 100644 (file)
--- a/project/src/SelectDictionaryDataControlForm.cpp
+++ b/project/src/SelectDictionaryDataControlForm.cpp
@@ -51,7 +51,7 @@ SelectDictionaryDataControlForm::OnInitializing(void)
        result r = E_SUCCESS;
 
        Header* pHeader = GetHeader();
-       pHeader->SetTitleText(L"DICTIONARY DataControl");
+       pHeader->SetTitleText(L"DICTIONARY DATACONTROL");
 
        Footer* pFooter = GetFooter();
        if (pFooter != null)