Store menus if smart pointers (RefCount)

This was originally intended to be a bugfix for an memory error reported by valgrind (accessing
freed memory). While debugging it, I found the menu ownership semantics confusing
(setInternalMenu() et al.), so I decided to get rid of it and store it in smart pointers
everywhere.
Looking back, I'm not sure if this was worth all the trouble, but the good news is that the
valgrind error disappeared. :)

1 files changed, 4 insertions, 4 deletions

diff --git a/src/Slit.hh b/src/Slit.hh
index 9384ad6..f12a740 100644
--- a/src/Slit.hh
+++ b/src/Slit.hh
@@ -117,7 +117,7 @@ public:
     Placement placement() const { return *m_rc_placement; }
     int getOnHead() const { return *m_rc_on_head; }
     void saveOnHead(int head);
-    FbTk::Menu &menu() { return m_slitmenu; }
+    FbTk::Menu &menu() { return *m_slitmenu; }
 
     const FbTk::FbWindow &window() const { return frame.window; }
 
@@ -147,10 +147,10 @@ private:
     BScreen &m_screen;
     FbTk::Timer m_timer;
 
-    std::auto_ptr<LayerMenu> m_layermenu;
-    FbMenu m_clientlist_menu, m_slitmenu;
+    FbTk::RefCount<LayerMenu> m_layermenu;
+    FbTk::RefCount<FbMenu> m_clientlist_menu, m_slitmenu;
 #ifdef XINERAMA
-    XineramaHeadMenu<Slit> *m_xineramaheadmenu;
+    FbTk::RefCount<XineramaHeadMenu<Slit> > m_xineramaheadmenu;
 #endif // XINERAMA
 
     struct frame {