merge

5 files changed, 14 insertions, 11 deletions

diff --git a/dw/fltkui.cc b/dw/fltkui.cc
index 9ce5a816..a7da10d9 100644
--- a/dw/fltkui.cc
+++ b/dw/fltkui.cc
@@ -235,7 +235,7 @@ FltkLabelButtonResource::FltkLabelButtonResource (FltkPlatform *platform,
 
 FltkLabelButtonResource::~FltkLabelButtonResource ()
 {
-   delete label;
+   free((char *)label);
 }
 
 Fl_Widget *FltkLabelButtonResource::createNewWidget (core::Allocation
@@ -448,9 +448,9 @@ FltkEntryResource::FltkEntryResource (FltkPlatform *platform, int maxLength,
 FltkEntryResource::~FltkEntryResource ()
 {
    if (initText)
-      delete initText;
+      free((char *)initText);
    if (label)
-      delete label;
+      free(label);
 }
 
 Fl_Widget *FltkEntryResource::createNewWidget (core::Allocation
@@ -533,7 +533,7 @@ const char *FltkEntryResource::getText ()
 void FltkEntryResource::setText (const char *text)
 {
    if (initText)
-      delete initText;
+      free((char *)initText);
    initText = strdup (text);
 
    ((Fl_Input*)widget)->value (initText);
@@ -885,7 +885,7 @@ FltkOptionMenuResource::~FltkOptionMenuResource ()
       if (menu[i].text)
          free((char *) menu[i].text);
    }
-   delete menu;
+   delete[] menu;
 }
 
 void FltkOptionMenuResource::setWidgetStyle (Fl_Widget *widget,
@@ -961,7 +961,7 @@ void FltkOptionMenuResource::enlargeMenu ()
    newMenu = new Fl_Menu_Item[itemsAllocated];
    memcpy(newMenu, menu, itemsUsed * sizeof(Fl_Menu_Item));
    memset(newMenu + itemsUsed, 0, 0x10 * sizeof(Fl_Menu_Item));
-   delete menu;
+   delete[] menu;
    menu = newMenu;
    ch->menu(menu);
    ch->value(selected);
diff --git a/dw/image.cc b/dw/image.cc
index cab40ed5..23e2dc84 100644
--- a/dw/image.cc
+++ b/dw/image.cc
@@ -157,7 +157,7 @@ Image::Image(const char *altText)
 Image::~Image()
 {
    if (altText)
-      delete altText;
+      free(altText);
    if (buffer)
       buffer->unref ();
    if (mapKey)
diff --git a/dw/layout.cc b/dw/layout.cc
index 8a439ae6..b430eaa1 100644
--- a/dw/layout.cc
+++ b/dw/layout.cc
@@ -174,7 +174,7 @@ bool Layout::LinkEmitter::emitClick (Widget *widget, int link, int img,
 
 Layout::Anchor::~Anchor ()
 {
-   delete name;
+   free(name);
 }
 
 // ---------------------------------------------------------------------
diff --git a/lout/object.cc b/lout/object.cc
index d72b1eec..08ea0452 100644
--- a/lout/object.cc
+++ b/lout/object.cc
@@ -224,7 +224,7 @@ String::String (const char *str): ConstString (str ? strdup(str) : NULL)
 String::~String ()
 {
   if (str)
-    delete str;
+    free((char *)str);
 }
 
 // ------------
diff --git a/src/ui.cc b/src/ui.cc
index cd9147a9..27303115 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -200,7 +200,7 @@ public:
    CustProgressBox(int x, int y, int w, int h, const char *l=0) :
       Fl_Box(x,y,w,h,l) { padding = 0; };
    void update_label(const char *lbl) {
-      int w,h;
+      int w = 0, h = 0;
       if (!padding) {
          copy_label("W");
          measure_label(w, h);
@@ -520,7 +520,7 @@ void UI::make_progress_bars(int wide, int thin_up)
 Fl_Widget *UI::make_filemenu_button()
 {
    Fl_Button *btn;
-   int w,h, padding;
+   int w = 0, h = 0, padding;
 
    FileButton = btn = new Fl_Button(p_xpos,0,0,0,"W");
    btn->labeltype(FL_FREE_LABELTYPE);
@@ -754,6 +754,9 @@ UI::~UI()
 {
    _MSG("UI::~UI()\n");
    dFree(TabTooltip);
+
+   if (!FindBarSpace)
+      delete FindBar;
 }
 
 /*