projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update, build mods, update Features5.pdf
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
mwindowgui.C
diff --git
a/cinelerra-5.1/cinelerra/mwindowgui.C
b/cinelerra-5.1/cinelerra/mwindowgui.C
index 1a1c3bfe2dd9589f18d140cd8052ac36d0c8df5f..7c3b8575b72b25fd3210da539370e6ab37d226fd 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/mwindowgui.C
@@
-120,6
+120,7
@@
MWindowGUI::MWindowGUI(MWindow *mwindow)
plugin_menu = 0;
keyframe_menu = 0;
keyframe_hide = 0;
plugin_menu = 0;
keyframe_menu = 0;
keyframe_hide = 0;
+ keyvalue_popup = 0;
transition_menu = 0;
remote_control = 0;
cwindow_remote_handler = 0;
transition_menu = 0;
remote_control = 0;
cwindow_remote_handler = 0;
@@
-134,6
+135,7
@@
MWindowGUI::~MWindowGUI()
delete cwindow_remote_handler;
delete record_remote_handler;
delete remote_control;
delete cwindow_remote_handler;
delete record_remote_handler;
delete remote_control;
+ delete keyvalue_popup;
// delete samplescroll;
// delete trackscroll;
for(int i = 0; i < TOTAL_PANES; i++)
// delete samplescroll;
// delete trackscroll;
for(int i = 0; i < TOTAL_PANES; i++)
@@
-1108,19
+1110,13
@@
void MWindowGUI::default_positions()
}
}
-
-
-
-
-
-
-
-
-
-
-
-
-
+int MWindowGUI::button_release_event()
+{
+ if( keyvalue_popup ) {
+ delete keyvalue_popup; keyvalue_popup = 0;
+ }
+ return 0;
+}
int MWindowGUI::repeat_event(int64_t duration)
int MWindowGUI::repeat_event(int64_t duration)
@@
-1280,7
+1276,6
@@
int MWindowGUI::keypress_event()
return result;
}
return result;
}
-
int MWindowGUI::keyboard_listener(BC_WindowBase *wp)
{
return key_listener(wp->get_keypress());
int MWindowGUI::keyboard_listener(BC_WindowBase *wp)
{
return key_listener(wp->get_keypress());
@@
-1297,7
+1292,7
@@
int MWindowGUI::key_listener(int key)
record->record_gui->interrupt_thread->start(0);
break;
case KPHAND:
record->record_gui->interrupt_thread->start(0);
break;
case KPHAND:
- mwindow->quit(
0
);
+ mwindow->quit();
break;
#ifdef HAVE_DVB
case KPBOOK:
break;
#ifdef HAVE_DVB
case KPBOOK:
@@
-2270,7
+2265,6
@@
int PaneButton::cursor_motion_event()
int PaneButton::button_release_event()
{
mwindow->gui->stop_pane_drag();
int PaneButton::button_release_event()
{
mwindow->gui->stop_pane_drag();
-
int result = BC_Button::button_release_event();
return result;
}
int result = BC_Button::button_release_event();
return result;
}