[dasher: 6/38] MandarinAlphMgr::GetRoot did not override!

[Patrick Welche <pwelche src gnome org>]

commit d2ea440a1006231a1b19e1b4f89d466f1ca1a787
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date:   Tue Dec 6 14:54:09 2011 +0000

    MandarinAlphMgr::GetRoot did not override!

 Src/DasherCore/MandarinAlphMgr.cpp |    5 +++--
 Src/DasherCore/MandarinAlphMgr.h   |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/Src/DasherCore/MandarinAlphMgr.cpp b/Src/DasherCore/MandarinAlphMgr.cpp
index faa314f..b7db103 100644
--- a/Src/DasherCore/MandarinAlphMgr.cpp
+++ b/Src/DasherCore/MandarinAlphMgr.cpp
@@ -139,7 +139,7 @@ CTrainer *CMandarinAlphMgr::GetTrainer() {
   return new CMandarinTrainer(m_pInterface, static_cast<CPPMPYLanguageModel*>(m_pLanguageModel), m_pAlphabet, m_pAlphabetMap, &m_CHAlphabetMap, m_pAlphabet->m_strConversionTrainingDelimiter);
 }
 
-CAlphabetManager::CAlphNode *CMandarinAlphMgr::GetRoot(CDasherNode *pParent, unsigned int iLower, unsigned int iUpper, bool bEnteredLast, int iOffset) {
+CAlphabetManager::CAlphNode *CMandarinAlphMgr::GetRoot(CDasherNode *pParent, bool bEnteredLast, int iOffset) {
 
   int iNewOffset(max(-1,iOffset-1));  
   // Use chinese alphabet, not pinyin...
@@ -151,8 +151,9 @@ CAlphabetManager::CAlphNode *CMandarinAlphMgr::GetRoot(CDasherNode *pParent, uns
   } else {
     DASHER_ASSERT(p.first>0 && p.first<m_CHtext.size());
     pNewNode = new CMandSym(iNewOffset, this, p.first, 0);
+    pNewNode->SetFlag(NF_SEEN, true);
+    pNewNode->CDasherNode::SetFlag(NF_COMMITTED, true); //do NOT commit!
   }
-  pNewNode->Reparent(pParent, iLower, iUpper);
   pNewNode->iContext = p.second;
   
   return pNewNode;
diff --git a/Src/DasherCore/MandarinAlphMgr.h b/Src/DasherCore/MandarinAlphMgr.h
index 4432ecd..929b16c 100644
--- a/Src/DasherCore/MandarinAlphMgr.h
+++ b/Src/DasherCore/MandarinAlphMgr.h
@@ -76,7 +76,7 @@ namespace Dasher {
     
     //Override to use chinese, not pinyin, alphabet to turn extracted text into symbol numbers; and to create
     // chinese symbol nodes, not pinyin ones.
-    CAlphNode *GetRoot(CDasherNode *pParent, unsigned int iLower, unsigned int iUpper, bool bEnteredLast, int iOffset);    
+    CAlphNode *GetRoot(CDasherNode *pParent, bool bEnteredLast, int iOffset);    
     
   protected:
     void MakeLabels(CDasherScreen *pScreen);