5 files changed, 22 insertions, 42 deletions

diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index fb1c7af..1930d4e 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -491,7 +491,7 @@ struct TextPropPtr {
 };
 }
 
-long FbWindow::cardinalProperty(Atom prop,bool*exists) const {
+long FbWindow::cardinalProperty(Atom prop, bool* exists) const {
     Atom type;
     int format;
     unsigned long nitems, bytes_after;
@@ -549,10 +549,8 @@ FbTk::FbString FbWindow::textProperty(Atom prop,bool*exists) const {
         ret = FbStringUtil::LocaleStrToFb(stringlist[0]);
     }
 
-    // they all use stringlist
-    if (stringlist) {
-        XFreeStringList(stringlist);
-    }
+    XFreeStringList(stringlist);
+
     if (exists) *exists=true;
     return ret;
 }
diff --git a/src/FbTk/FbWindow.hh b/src/FbTk/FbWindow.hh
index 3e1c05b..4b6b02f 100644
--- a/src/FbTk/FbWindow.hh
+++ b/src/FbTk/FbWindow.hh
@@ -170,7 +170,7 @@ public:
 
     void deleteProperty(Atom property);
 
-    long cardinalProperty(Atom property,bool*exists=NULL) const;
+    long cardinalProperty(Atom property, bool*exists=NULL) const;
     FbTk::FbString textProperty(Atom property,bool*exists=NULL) const;
 
     void addToSaveSet();
diff --git a/src/FbTk/MenuItem.hh b/src/FbTk/MenuItem.hh
index 2149559..320d065 100644
--- a/src/FbTk/MenuItem.hh
+++ b/src/FbTk/MenuItem.hh
@@ -47,8 +47,10 @@ public:
           m_enabled(true),
           m_selected(false),
           m_close_on_click(true),
-          m_toggle_item(false)
+          m_toggle_item(false),
+          m_index(0)
     { }
+
     explicit MenuItem(const BiDiString &label)
         : m_label(label),
           m_menu(0),
@@ -56,7 +58,8 @@ public:
           m_enabled(true),
           m_selected(false),
           m_close_on_click(true),
-          m_toggle_item(false)
+          m_toggle_item(false),
+          m_index(0)
     { }
 
     MenuItem(const BiDiString &label, Menu &host_menu)
@@ -66,7 +69,8 @@ public:
           m_enabled(true),
           m_selected(false),
           m_close_on_click(true),
-          m_toggle_item(false)
+          m_toggle_item(false),
+          m_index(0)
     { }
     /// create a menu item with a specific command to be executed on click
     MenuItem(const BiDiString &label, RefCount<Command<void> > &cmd, Menu *menu = 0)
@@ -77,7 +81,8 @@ public:
           m_enabled(true),
           m_selected(false),
           m_close_on_click(true),
-          m_toggle_item(false)
+          m_toggle_item(false),
+          m_index(0)
     { }
 
     MenuItem(const BiDiString &label, Menu *submenu, Menu *host_menu = 0)
@@ -87,7 +92,8 @@ public:
           m_enabled(true),
           m_selected(false),
           m_close_on_click(true),
-          m_toggle_item(false)
+          m_toggle_item(false),
+          m_index(0)
     { }
     virtual ~MenuItem() { }
 
diff --git a/src/FbTk/StringUtil.cc b/src/FbTk/StringUtil.cc
index d6f2c8f..63da383 100644
--- a/src/FbTk/StringUtil.cc
+++ b/src/FbTk/StringUtil.cc
@@ -21,37 +21,11 @@
 
 #include "StringUtil.hh"
 
-#ifdef HAVE_CSTDIO
-  #include <cstdio>
-#else
-  #include <stdio.h>
-#endif
-#ifdef HAVE_CSTDLIB
-  #include <cstdlib>
-#else
-  #include <stdlib.h>
-#endif
-#ifdef HAVE_CCTYPE
-  #include <cctype>
-#else
-  #include <ctype.h>
-#endif
-#ifdef HAVE_CASSERT
-  #include <cassert>
-#else
-  #include <assert.h>
-#endif
-#ifdef HAVE_CSTRING
-  #include <cstring>
-#else
-  #include <string.h>
-#endif
-
-#ifdef HAVE_CERRNO
-  #include <cerrno>
-#else
-  #include <errno.h>
-#endif
+#include <cstdio>
+#include <cctype>
+#include <cassert>
+#include <cstring>
+#include <cerrno>
 
 #ifndef _WIN32
 #include <unistd.h>
diff --git a/src/FbTk/TypeAhead.hh b/src/FbTk/TypeAhead.hh
index 289587a..119e3af 100644
--- a/src/FbTk/TypeAhead.hh
+++ b/src/FbTk/TypeAhead.hh
@@ -72,6 +72,8 @@ public:
     typedef std::vector < SearchResult > SearchResults;
     typedef typename Items::const_iterator ItemscIt;
 
+    TypeAhead() : m_ref(0) { }
+
     void init(Items const &items) { m_ref = &items; }
 
     size_t stringSize() const { return m_searchstr.size(); }