projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sams icons, bsd fixups, lv2 deps
[goodguy/history.git]
/
cinelerra-5.1
/
guicast
/
bcpopupmenu.C
diff --git
a/cinelerra-5.1/guicast/bcpopupmenu.C
b/cinelerra-5.1/guicast/bcpopupmenu.C
index be17a0a311403824ec130180a18e2cf7f7b767bd..4c639fe27d25890f96bd4289cc77c21c651ca569 100644
(file)
--- a/
cinelerra-5.1/guicast/bcpopupmenu.C
+++ b/
cinelerra-5.1/guicast/bcpopupmenu.C
@@
-369,6
+369,7
@@
int BC_PopupMenu::repeat_event(int64_t duration)
int BC_PopupMenu::button_press_event()
{
int BC_PopupMenu::button_press_event()
{
+ int result = 0;
if(get_buttonpress() == 1 &&
is_event_win() &&
use_title)
if(get_buttonpress() == 1 &&
is_event_win() &&
use_title)
@@
-404,17
+405,18
@@
int BC_PopupMenu::button_press_event()
BC_MenuItem *tmp = menu_popup->menu_items.values[theval];
set_text(tmp->get_text());
BC_MenuItem *tmp = menu_popup->menu_items.values[theval];
set_text(tmp->get_text());
- if (!tmp->handle_event())
- this->handle_event();
+ result = tmp->handle_event();
+ if( !result )
+ result = this->handle_event();
}
if(popup_down)
{
// Menu is down so dispatch to popup.
menu_popup->dispatch_button_press();
}
if(popup_down)
{
// Menu is down so dispatch to popup.
menu_popup->dispatch_button_press();
- re
turn
1;
+ re
sult =
1;
}
}
- return
0
;
+ return
result
;
}
int BC_PopupMenu::button_release_event()
}
int BC_PopupMenu::button_release_event()