X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcpopupmenu.C;h=bfcca0693939b42fa0497a4f315979740c025eb7;hb=0b78779e9e75131eee81d2e4689b98df0e91c092;hp=cefaea7f48e22be0e9667cb4f376d84e794d5509;hpb=21b49090a36821cfe97bdfc573c7fbacc80653d1;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/bcpopupmenu.C b/cinelerra-5.1/guicast/bcpopupmenu.C
index cefaea7f..bfcca069 100644
--- a/cinelerra-5.1/guicast/bcpopupmenu.C
+++ b/cinelerra-5.1/guicast/bcpopupmenu.C
@@ -208,7 +208,13 @@ int BC_PopupMenu::add_item(BC_MenuItem *item)
 
 int BC_PopupMenu::remove_item(BC_MenuItem *item)
 {
-	menu_popup->remove_item(item, 0);
+	menu_popup->remove_item(item);
+	return 0;
+}
+
+int BC_PopupMenu::del_item(BC_MenuItem *item)
+{
+	menu_popup->del_item(item);
 	return 0;
 }
 
@@ -295,7 +301,6 @@ int BC_PopupMenu::activate_menu()
 			button_press_y = top_level->cursor_y;
 		}
 
-		button_releases = 0;
 		if(use_title)
 		{
 			Window tempwin;
@@ -406,8 +411,6 @@ int BC_PopupMenu::button_release_event()
 // try the title
 	int result = 0;
 
-	button_releases++;
-
 	if(is_event_win() && use_title)
 	{
 		hide_tooltip();
@@ -421,75 +424,16 @@ int BC_PopupMenu::button_release_event()
 	if( !use_title && status == BUTTON_DN ) {
 		result = 1;
 	}
-	else if(popup_down)
-	{
+	else if(popup_down) {
 // Menu is down so dispatch to popup.
 		result = menu_popup->dispatch_button_release();
 	}
-
-	if(popup_down && button_releases >= 2)
-	{
+// released outside popup
+	if( !result && popup_down ) {
 		deactivate();
-	}
-
-	if(!result && use_title && cursor_inside() && is_event_win())
-	{
-		hide_tooltip();
-		result = 1;
-	}
-	else
-	if(!result && !use_title && popup_down && button_releases < 2)
-	{
-		result = 1;
-	}
-
-
-	if(!result && popup_down)
-	{
-// Button was released outside any menu.
-		deactivate();
-		result = 1;
-	}
-
-	return result;
-
-
-
-
-
-
-
-
-
-
-	if(popup_down)
-	{
-// Menu is down so dispatch to popup.
-		result = menu_popup->dispatch_button_release();
-	}
-
-	if(!result && use_title && cursor_inside() && top_level->event_win == win)
-	{
-// Inside title
-		if(button_releases >= 2)
-		{
-			highlighted = 1;
-			deactivate();
-		}
-		result = 1;
-	}
-	else
-	if(!result && !use_title && button_releases < 2)
-	{
-// First release outside a floating menu
-// Released outside a fictitious title area
-// 		if(top_level->cursor_x < button_press_x - 5 ||
-// 			top_level->cursor_y < button_press_y - 5 ||
-// 			top_level->cursor_x > button_press_x + 5 ||
-// 			top_level->cursor_y > button_press_y + 5)
-			deactivate();
 		result = 1;
 	}
+	hide_tooltip();
 
 	return result;
 }