merge

3 files changed, 6 insertions, 6 deletions

diff --git a/dw/findtext.cc b/dw/findtext.cc
index f3e0ba20..bce6f565 100644
--- a/dw/findtext.cc
+++ b/dw/findtext.cc
@@ -37,7 +37,7 @@ FindtextState::FindtextState ()
 FindtextState::~FindtextState ()
 {
    if (key)
-      delete key;
+      free(key);
    if (nexttab)
       delete[] nexttab;
    if (iterator)
@@ -52,7 +52,7 @@ void FindtextState::setWidget (Widget *widget)
 
    // A widget change will restart the search.
    if (key)
-      delete key;
+      free(key);
    key = NULL;
    if (nexttab)
       delete[] nexttab;
@@ -81,7 +81,7 @@ FindtextState::Result FindtextState::search (const char *key, bool caseSens,
        strcmp (this->key, key) != 0) {
       newKey = true;
       if (this->key)
-         delete this->key;
+         free(this->key);
       this->key = strdup (key);
       this->caseSens = caseSens;
 
@@ -147,7 +147,7 @@ void FindtextState::resetSearch ()
    unhighlight ();
 
    if (key)
-      delete key;
+      free(key);
    key = NULL;
 }
 
diff --git a/dw/layout.cc b/dw/layout.cc
index a02c87b7..b502ae65 100644
--- a/dw/layout.cc
+++ b/dw/layout.cc
@@ -534,7 +534,7 @@ void Layout::setAnchor (const char *anchor)
    _MSG("setAnchor (%s)\n", anchor);
 
    if (requestedAnchor)
-      delete requestedAnchor;
+      free(requestedAnchor);
    requestedAnchor = anchor ? strdup (anchor) : NULL;
    updateAnchor ();
 }
diff --git a/lout/misc.cc b/lout/misc.cc
index 78f758fd..f45a3450 100644
--- a/lout/misc.cc
+++ b/lout/misc.cc
@@ -144,7 +144,7 @@ void StringBuffer::clear ()
    Node *node, *nextNode;
    for (node = firstNode; node; node = nextNode) {
       nextNode = node->next;
-      delete node->data;
+      free(node->data);
       delete node;
    }
    firstNode = lastNode = NULL;