new focus code! working better than ever!

[chaz/openbox] / src / Basemenu.cc

diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index e6cb4d1216728c539eaad83d7c6cb610d5e9d553..689d20181a6d2b97b543909b5c041a561936402a 100644 (file)
--- a/src/Basemenu.cc
+++ b/src/Basemenu.cc
@@ -43,7 +43,8 @@
 #endif // HAVE_STRING_H
 
 #include <algorithm>
-using namespace std;
+using std::min;
+using std::max;
 
 #include "i18n.h"
 #include "openbox.h"
@@ -158,10 +159,8 @@ Basemenu::~Basemenu(void) {
   if (shown && shown->getWindowID() == getWindowID())
     shown = (Basemenu *) 0;
 
-  while (!menuitems.empty()) {
-    delete menuitems[0];
-    menuitems.erase(menuitems.begin());
-  }
+  while (!menuitems.empty())
+    remove(0);
 
   if (menu.label)
     delete [] menu.label;