projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
overlay/motion fixes, update es.po
[goodguy/history.git]
/
cinelerra-5.1
/
guicast
/
bcmenupopup.C
diff --git
a/cinelerra-5.1/guicast/bcmenupopup.C
b/cinelerra-5.1/guicast/bcmenupopup.C
index 0d418cb8c4f442b3657d55eea63fb4a87cb42b38..03068020e204ae572b6766e071f39d1b7623b537 100644
(file)
--- a/
cinelerra-5.1/guicast/bcmenupopup.C
+++ b/
cinelerra-5.1/guicast/bcmenupopup.C
@@
-112,7
+112,13
@@
int BC_MenuPopup::add_item(BC_MenuItem *item)
return 0;
}
return 0;
}
-int BC_MenuPopup::remove_item(BC_MenuItem *item, int recursive)
+int BC_MenuPopup::remove_item(BC_MenuItem *item)
+{
+ menu_items.remove(item);
+ return 0;
+}
+
+int BC_MenuPopup::del_item(BC_MenuItem *item)
{
if(!item && menu_items.size() > 0)
{
{
if(!item && menu_items.size() > 0)
{
@@
-121,9
+127,9
@@
int BC_MenuPopup::remove_item(BC_MenuItem *item, int recursive)
if(item)
{
if(item)
{
-
menu_items.remove
(item);
+
remove_item
(item);
item->menu_popup = 0;
item->menu_popup = 0;
-
if(!recursive)
delete item;
+ delete item;
}
return 0;
}
}
return 0;
}