1 files changed, 8 insertions, 17 deletions

diff --git a/src/FbTk/MenuItem.hh b/src/FbTk/MenuItem.hh
index 320d065..4bbfcf3 100644
--- a/src/FbTk/MenuItem.hh
+++ b/src/FbTk/MenuItem.hh
@@ -47,8 +47,7 @@ public:
           m_enabled(true),
           m_selected(false),
           m_close_on_click(true),
-          m_toggle_item(false),
-          m_index(0)
+          m_toggle_item(false)
     { }
 
     explicit MenuItem(const BiDiString &label)
@@ -58,8 +57,7 @@ public:
           m_enabled(true),
           m_selected(false),
           m_close_on_click(true),
-          m_toggle_item(false),
-          m_index(0)
+          m_toggle_item(false)
     { }
 
     MenuItem(const BiDiString &label, Menu &host_menu)
@@ -69,8 +67,7 @@ public:
           m_enabled(true),
           m_selected(false),
           m_close_on_click(true),
-          m_toggle_item(false),
-          m_index(0)
+          m_toggle_item(false)
     { }
     /// create a menu item with a specific command to be executed on click
     MenuItem(const BiDiString &label, RefCount<Command<void> > &cmd, Menu *menu = 0)
@@ -81,8 +78,7 @@ public:
           m_enabled(true),
           m_selected(false),
           m_close_on_click(true),
-          m_toggle_item(false),
-          m_index(0)
+          m_toggle_item(false)
     { }
 
     MenuItem(const BiDiString &label, Menu *submenu, Menu *host_menu = 0)
@@ -92,10 +88,9 @@ public:
           m_enabled(true),
           m_selected(false),
           m_close_on_click(true),
-          m_toggle_item(false),
-          m_index(0)
+          m_toggle_item(false)
     { }
-    virtual ~MenuItem() { }
+    virtual ~MenuItem();
 
     void setCommand(RefCount<Command<void> > &cmd) { m_command = cmd; }
     virtual void setSelected(bool selected) { m_selected = selected; }
@@ -119,14 +114,12 @@ public:
     virtual bool isToggleItem() const { return m_toggle_item; }
 
     // iType functions
-    virtual void setIndex(int index) { m_index = index; }
-    virtual int getIndex() { return m_index; }
     const FbString &iTypeString() const { return m_label.visual(); }
     virtual void drawLine(FbDrawable &draw,
                       const FbTk::ThemeProxy<MenuTheme> &theme,
-                      size_t size,
+                      size_t n_chars,
                       int text_x, int text_y,
-                      unsigned int width) const;
+                      unsigned int width, size_t skip_chars = 0) const;
 
     virtual unsigned int width(const FbTk::ThemeProxy<MenuTheme> &theme) const;
     virtual unsigned int height(const FbTk::ThemeProxy<MenuTheme> &theme) const;
@@ -160,14 +153,12 @@ private:
     RefCount<Command<void> > m_command; ///< command to be executed
     bool m_enabled, m_selected;
     bool m_close_on_click, m_toggle_item;
-    int m_index;
 
     struct Icon {
         std::auto_ptr<PixmapWithMask> pixmap;
         std::string filename;
     };
     std::auto_ptr<Icon> m_icon;
-
 };
 
 } // end namespace FbTk