[dasher: 23/27] Misc fixes

[Patrick Welche <pwelche src gnome org>]

commit 2863d4a202b6a966d309a87e5dfe0bea2cbc54f3
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date:   Tue Aug 17 18:49:11 2010 +0100

    Misc fixes
    
    Linux build fix to AlphabetMap & Gtk2/Preferences
    wrongly freeing AlphInfo in AlphabetManager d'tor (& not freeing AlphabetMap)
    Bad assertion in DasherViewSquare::TruncateTri
    
    TODO the linux preferences file is a minimal "fix" to get it to build,
    removing reference to old BP_OUTLINE_MODE parameter; it leaves the checkbox
    still there (but doing nothing), and does not allow to adjust the corresponding
    new parameter LP_OUTLINE_WIDTH...

 Src/DasherCore/Alphabet/AlphabetMap.cpp |    1 +
 Src/DasherCore/AlphabetManager.cpp      |    3 ++-
 Src/DasherCore/DasherViewSquare.cpp     |    2 +-
 Src/Gtk2/Preferences.cpp                |    1 -
 4 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/Src/DasherCore/Alphabet/AlphabetMap.cpp b/Src/DasherCore/Alphabet/AlphabetMap.cpp
index 9311de2..4ff8a6d 100644
--- a/Src/DasherCore/Alphabet/AlphabetMap.cpp
+++ b/Src/DasherCore/Alphabet/AlphabetMap.cpp
@@ -17,6 +17,7 @@
 #include <limits>
 #include <iostream>
 #include <sstream>
+#include <cstring>
 
 using namespace Dasher;
 using namespace std;
diff --git a/Src/DasherCore/AlphabetManager.cpp b/Src/DasherCore/AlphabetManager.cpp
index a9669fc..6018540 100644
--- a/Src/DasherCore/AlphabetManager.cpp
+++ b/Src/DasherCore/AlphabetManager.cpp
@@ -58,7 +58,8 @@ const CAlphInfo *CAlphabetManager::GetAlphabet() const {
 
 CAlphabetManager::~CAlphabetManager() {
   m_pLanguageModel->ReleaseContext(m_iLearnContext);
-  delete m_pAlphabet;
+  //the alphabet belongs to the AlphIO, and may be reused later;
+  delete m_pAlphabetMap; //the map was created for this mgr.
   delete m_pLanguageModel;
 }
 
diff --git a/Src/DasherCore/DasherViewSquare.cpp b/Src/DasherCore/DasherViewSquare.cpp
index d76ee3b..aa9a76a 100644
--- a/Src/DasherCore/DasherViewSquare.cpp
+++ b/Src/DasherCore/DasherViewSquare.cpp
@@ -257,7 +257,7 @@ CDasherViewSquare::CTextString::~CTextString() {
 }
 
 void CDasherViewSquare::TruncateTri(myint x, myint y1, myint y2, myint midy1, myint midy2, int fillColor, int outlineColor, int lineWidth) {
-  DASHER_ASSERT (y1<midy1 && midy1 <= midy2 && midy2 < y2);
+  DASHER_ASSERT (y1<=midy1 && midy1<=midy2 && midy2<=y2);
   myint iVisibleMinX, iVisibleMaxX, iVisibleMinY, iVisibleMaxY;
   VisibleRegion(iVisibleMinX, iVisibleMinY, iVisibleMaxX, iVisibleMaxY);
   
diff --git a/Src/Gtk2/Preferences.cpp b/Src/Gtk2/Preferences.cpp
index 8b5badc..76bd318 100644
--- a/Src/Gtk2/Preferences.cpp
+++ b/Src/Gtk2/Preferences.cpp
@@ -39,7 +39,6 @@ BoolTranslation sBoolTranslationTable[] = {
   {BP_DRAW_MOUSE, "showmousebutton", NULL},
   {BP_SHOW_SLIDER, "speedsliderbutton", NULL},
   {APP_BP_SHOW_TOOLBAR, "toolbarbutton", NULL},
-  {BP_OUTLINE_MODE, "outlinebutton", NULL},
   {BP_CONTROL_MODE, "control_controlmode", NULL},
   {APP_BP_TIME_STAMP, "timestampbutton", NULL},
   {APP_BP_DOCK, "dockbutton", NULL},