aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-04-17 14:17:33 (GMT)
committerfluxgen <fluxgen>2003-04-17 14:17:33 (GMT)
commita492a409235445b52cbb7b4a7146b2a86e5f39ab (patch)
tree7d1f216491ee543943566daaa3b613605bbbf1fa
parentc4d1f735f6cccfec39750af36886dc66a3ce7ba3 (diff)
downloadfluxbox-a492a409235445b52cbb7b4a7146b2a86e5f39ab.zip
fluxbox-a492a409235445b52cbb7b4a7146b2a86e5f39ab.tar.bz2
disabling delete of non internal menu
-rw-r--r--src/FbTk/Menu.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index e12b248..886ad0e 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.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: Menu.cc,v 1.11 2003/02/23 01:00:02 fluxgen Exp $ 25// $Id: Menu.cc,v 1.12 2003/04/17 14:17:33 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -209,7 +209,7 @@ int Menu::remove(unsigned int index) {
209 209
210 if (item) { 210 if (item) {
211 menuitems.erase(it); 211 menuitems.erase(it);
212 if ((! internal_menu) && (item->submenu())) { 212 /*if ((! internal_menu) && (item->submenu())) {
213 Menu *tmp = item->submenu(); 213 Menu *tmp = item->submenu();
214 214
215 if (! tmp->internal_menu) { 215 if (! tmp->internal_menu) {
@@ -217,6 +217,7 @@ int Menu::remove(unsigned int index) {
217 } else 217 } else
218 tmp->internal_hide(); 218 tmp->internal_hide();
219 } 219 }
220 */
220 221
221 delete item; 222 delete item;
222 } 223 }