remove v4l/lml/buz, add symbolic folders, more xlat update, yuyv fixes, v4l2 upgrades

[goodguy/history.git] / cinelerra-5.1 / guicast / bcmenuitem.C

diff --git a/cinelerra-5.1/guicast/bcmenuitem.C b/cinelerra-5.1/guicast/bcmenuitem.C
index 66f869532b4ba1f8a7673659e2f698f2a278d49c..86a1e005bfa0ed14f13f49bea72e92c2c1843b59 100644 (file)
--- a/cinelerra-5.1/guicast/bcmenuitem.C
+++ b/cinelerra-5.1/guicast/bcmenuitem.C
@@ -68,8 +68,8 @@ BC_MenuItem::~BC_MenuItem()
        hotkey_text = 0;
        if(submenu) delete submenu;
        submenu = 0;
-// deletes this
-       if(menu_popup) menu_popup->remove_item(this, 1);
+       if(menu_popup)
+               menu_popup->remove_item(this);
 }
 
 void BC_MenuItem::reset()
@@ -130,6 +130,7 @@ int BC_MenuItem::deactivate_submenus(BC_MenuPopup *exclude)
        {
                submenu->deactivate_submenus(exclude);
                submenu->deactivate_menu();
+               submenu->popup_menu = 0;
                highlighted = 0;
        }
        return 0;
@@ -149,6 +150,7 @@ int BC_MenuItem::activate_submenu()
                        &new_x,
                        &new_y,
                        &tempwin);
+               submenu->popup_menu = menu_popup->popup_menu;
                submenu->activate_menu(new_x + 5, new_y, menu_popup->w - 10, h, 0, 0);
                highlighted = 1;
        }
@@ -430,6 +432,11 @@ int BC_MenuItem::add_submenu(BC_SubMenu *submenu)
        return 0;
 }
 
+BC_SubMenu* BC_MenuItem::get_submenu()
+{
+       return submenu;
+}
+
 char* BC_MenuItem::get_text()
 {
        return text;