diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-05-23 00:06:16 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-05-23 00:06:16 +0000 |
| commit | 376c5381edca72ce25a04d449e7df39ecbc0d4d0 (patch) | |
| tree | cf163ca297c469144da3dc2874b0473f61de5444 /gtk2_ardour/audio_clock.h | |
| parent | dc348fb613bef955c674dfd27624625d2934bbf4 (diff) | |
(merge from 2.0-ongoing -r1911:1912) fix audio clock handling of key press; fix crash bug caused by mapping over a region list selection that includes rows without regions; also merge sampo's redirect undo/state fixes from 2.0-ongoing
git-svn-id: svn://localhost/ardour2/trunk@1913 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_clock.h')
| -rw-r--r-- | gtk2_ardour/audio_clock.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h index 27b36d7b3e..16156625c8 100644 --- a/gtk2_ardour/audio_clock.h +++ b/gtk2_ardour/audio_clock.h @@ -62,6 +62,8 @@ class AudioClock : public Gtk::HBox static sigc::signal<void> ModeChanged; static std::vector<AudioClock*> clocks; + static bool has_focus() { return _has_focus; } + private: ARDOUR::Session *session; Mode _mode; @@ -173,9 +175,11 @@ class AudioClock : public Gtk::HBox bool field_button_press_event (GdkEventButton *ev, Field); bool field_button_release_event (GdkEventButton *ev, Field); bool field_button_scroll_event (GdkEventScroll *ev, Field); + bool field_key_press_event (GdkEventKey *, Field); bool field_key_release_event (GdkEventKey *, Field); bool field_focus_in_event (GdkEventFocus *, Field); bool field_focus_out_event (GdkEventFocus *, Field); + bool drop_focus_handler (GdkEventFocus*); void set_smpte (nframes_t, bool); void set_bbt (nframes_t, bool); @@ -198,6 +202,8 @@ class AudioClock : public Gtk::HBox void set_size_requests (); static const uint32_t field_length[(int)AudioFrames+1]; + static bool _has_focus; + }; #endif /* __audio_clock_h__ */ |