lock trace bug, missed optimize in dvd_create, cin_quality=-1, motion plugin gui...

[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 6279bc6f0f4727b63fc4633bc21be3e0e4e4cf27..c66dc93f923b0440eef9f02194ea37645724b3e6 100644 (file)
--- a/cinelerra-5.1/guicast/bcmenuitem.C
+++ b/cinelerra-5.1/guicast/bcmenuitem.C
@@ -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;
        }
@@ -402,14 +404,14 @@ int BC_MenuItem::draw()
                {
 //                     menu_popup->get_popup()->draw_check(10 + offset, y + 2 + offset);
                        menu_popup->get_popup()->draw_pixmap(menu_popup->check,
-                               offset, 
+                               offset,
                                y + (this->h - menu_popup->check->get_h()) / 2 + offset);
                        menu_popup->get_popup()->set_font(MEDIUMFONT);
-                       menu_popup->get_popup()->draw_text(menu_popup->check->get_w() + offset, 
-                               y + h - text_line - 2 + offset, 
+                       menu_popup->get_popup()->draw_text(menu_popup->check->get_w() + offset,
+                               y + h - text_line - 2 + offset,
                                text);
-                       menu_popup->get_popup()->draw_text(menu_popup->get_key_x() + offset, 
-                               y + h - text_line - 2 + offset, 
+                       menu_popup->get_popup()->draw_text(menu_popup->get_key_x() + offset,
+                               y + h - text_line - 2 + offset,
                                hotkey_text);
                }
                else
@@ -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;