summaryrefslogtreecommitdiff
path: root/gtk2_ardour/tempo_dialog.h
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-02-17 17:49:38 +0000
committerDavid Robillard <d@drobilla.net>2008-02-17 17:49:38 +0000
commit8fed7470f5fb37ebd007410f4095851ba29ad2b4 (patch)
tree95edb188d98c6397ecd6be408f26524461270f85 /gtk2_ardour/tempo_dialog.h
parent859e9106e72a7908fa093d946111d148223225a0 (diff)
Merge with 2.0-ongoing R3077.
git-svn-id: svn://localhost/ardour2/branches/3.0@3078 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/tempo_dialog.h')
-rw-r--r--gtk2_ardour/tempo_dialog.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h
index c2053644a1..cbb237abb8 100644
--- a/gtk2_ardour/tempo_dialog.h
+++ b/gtk2_ardour/tempo_dialog.h
@@ -66,6 +66,7 @@ private:
void bpm_changed ();
bool bpm_button_press (GdkEventButton* );
bool bpm_button_release (GdkEventButton* );
+ bool entry_key_release (GdkEventKey* );
void note_types_change ();
};
@@ -78,10 +79,6 @@ struct MeterDialog : public ArdourDialog
Gtk::Button ok_button;
Gtk::Button cancel_button;
Gtk::Entry when_bar_entry;
- Gtk::Entry when_beat_entry;
- Gtk::Label when_bar_label;
- Gtk::Label when_beat_label;
- Gtk::Table when_table;
Gtk::Frame when_frame;
char buf[64];
@@ -94,8 +91,8 @@ struct MeterDialog : public ArdourDialog
private:
void init (const ARDOUR::BBT_Time&, double, double, bool);
- bool bpb_key_press (GdkEventKey* );
- bool bpb_key_release (GdkEventKey* );
+ bool entry_key_press (GdkEventKey* );
+ bool entry_key_release (GdkEventKey* );
void note_types_change ();
};