sync with bb-cvs

[chaz/openbox] / src / Basemenu.hh

diff --git a/src/Basemenu.hh b/src/Basemenu.hh
index 46a8d52821f5bf9e598273ac930218695cd3b94b..d7339f0d33e9380751a58333864cc0b9dec04443 100644 (file)
--- a/src/Basemenu.hh
+++ b/src/Basemenu.hh
@@ -57,8 +57,7 @@ private:
     Window window, frame, title;
 
     std::string label;
-    int x, y, x_move, y_move, x_shift, y_shift, sublevels, persub, minsub,
-      grab_x, grab_y;
+    int x, y, x_move, y_move, x_shift, y_shift, sublevels, persub, minsub;
     unsigned int width, height, title_h, frame_h, item_w, item_h, bevel_w,
       bevel_h;
   } menu;
@@ -163,8 +162,6 @@ public:
                                                      f(0), enabled(1),
                                                      selected(0) {}
 
-  ~BasemenuItem(void);
-
   inline const char *exec(void) const { return e.c_str(); }
   inline const char *label(void) const { return l.c_str(); }
   inline int function(void) const { return f; }