BC_PopupMenu::~BC_PopupMenu()
{
- if(menu_popup) delete menu_popup;
+ use_title = 0;
+ deactivate();
+ delete menu_popup;
for(int i = 0; i < TOTAL_IMAGES; i++)
{
if(images[i]) delete images[i];
int BC_PopupMenu::repeat_event(int64_t duration)
{
- if( status == BUTTON_HI && !tooltip_done &&
+ if( status == BUTTON_HI &&
tooltip_text && tooltip_text[0] != 0 &&
duration == top_level->get_resources()->tooltip_delay )
{
show_tooltip();
- tooltip_done = 1;
return 1;
}
return 0;
{
if(is_event_win() && use_title)
{
- tooltip_done = 0;
if(top_level->button_down)
{
status = BUTTON_DN;
int result = 0;
// This menu is down.
- if(popup_down)
- {
+ if(popup_down) {
result = menu_popup->dispatch_motion_event();
}
- if(!result && use_title && top_level->event_win == win)
- {
- if(highlighted)
- {
- if(!cursor_inside())
- {
+ if(!result && use_title && is_event_win()) {
+ if(highlighted) {
+ if(!cursor_inside()) {
highlighted = 0;
draw_title(1);
}
}
- else
- {
- if(cursor_inside())
- {
+ else {
+ if(cursor_inside()) {
highlighted = 1;
draw_title(1);
result = 1;