diff options
author | fluxgen <fluxgen> | 2003-04-18 12:51:14 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-04-18 12:51:14 (GMT) |
commit | 430f07a5a64f8239efce305fe6eace2338a8f61b (patch) | |
tree | 67e14ee234d6eebf9313cdcd4ce3642372d5eabb | |
parent | a492a409235445b52cbb7b4a7146b2a86e5f39ab (diff) | |
download | fluxbox_lack-430f07a5a64f8239efce305fe6eace2338a8f61b.zip fluxbox_lack-430f07a5a64f8239efce305fe6eace2338a8f61b.tar.bz2 |
delete rootmenu
-rw-r--r-- | src/Screen.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 196170e..80466df 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Screen.cc,v 1.126 2003/04/16 16:17:56 rathnor Exp $ | 25 | // $Id: Screen.cc,v 1.127 2003/04/18 12:51:14 fluxgen Exp $ |
26 | 26 | ||
27 | 27 | ||
28 | #include "Screen.hh" | 28 | #include "Screen.hh" |
@@ -641,7 +641,7 @@ BScreen::BScreen(ResourceManager &rm, | |||
641 | 641 | ||
642 | m_configmenu.reset(createMenuFromScreen(*this)); | 642 | m_configmenu.reset(createMenuFromScreen(*this)); |
643 | setupConfigmenu(*m_configmenu.get()); | 643 | setupConfigmenu(*m_configmenu.get()); |
644 | // m_configmenu->setInternalMenu(); | 644 | m_configmenu->setInternalMenu(); |
645 | 645 | ||
646 | workspacemenu->setItemSelected(2, true); | 646 | workspacemenu->setItemSelected(2, true); |
647 | 647 | ||
@@ -1631,10 +1631,14 @@ void BScreen::initMenu() { | |||
1631 | } | 1631 | } |
1632 | rootmenuList.clear(); | 1632 | rootmenuList.clear(); |
1633 | */ | 1633 | */ |
1634 | rootmenuList.erase(rootmenuList.begin(), rootmenuList.end()); | 1634 | while (!rootmenuList.empty()) { |
1635 | 1635 | delete rootmenuList.back(); | |
1636 | rootmenuList.pop_back(); | ||
1637 | } | ||
1638 | |||
1636 | while (m_rootmenu->numberOfItems()) | 1639 | while (m_rootmenu->numberOfItems()) |
1637 | m_rootmenu->remove(0); | 1640 | m_rootmenu->remove(0); |
1641 | |||
1638 | } else | 1642 | } else |
1639 | m_rootmenu.reset(createMenuFromScreen(*this)); | 1643 | m_rootmenu.reset(createMenuFromScreen(*this)); |
1640 | 1644 | ||