size-based scrolling and right-click pages for editor notebook

[ardour.git] / gtk2_ardour / tempo_dialog.h

diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h
index b091007c7dc46274cab63eec78e9aa7ffd60ca5e..f5412d07861e7bc609a65463199dbdb4eeb3b27a 100644 (file)
--- a/gtk2_ardour/tempo_dialog.h
+++ b/gtk2_ardour/tempo_dialog.h
@@ -1,7 +1,15 @@
 #ifndef __ardour_gtk_tempo_dialog_h__
 #define __ardour_gtk_tempo_dialog_h__
 
-#include <gtk--.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/label.h>
+#include <gtkmm/table.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/comboboxtext.h>
+
 #include <ardour/types.h>
 #include <ardour/tempo.h>
 
@@ -25,8 +33,8 @@ struct TempoDialog : public ArdourDialog
     Gtk::Frame   when_frame;
     char buf[64];
     
-    TempoDialog (ARDOUR::TempoMap&, jack_nframes_t, string action);
-    TempoDialog (ARDOUR::TempoSection&, string action);
+    TempoDialog (ARDOUR::TempoMap&, jack_nframes_t, ARDOUR::stringcr_t action);
+    TempoDialog (ARDOUR::TempoSection&, ARDOUR::stringcr_t action);
 
     double get_bpm ();
     bool   get_bbt_time (ARDOUR::BBT_Time&);
@@ -38,8 +46,8 @@ struct TempoDialog : public ArdourDialog
 struct MeterDialog : public ArdourDialog 
 {
     Gtk::Entry   bpb_entry;
-    Gtk::Combo   note_types;
-    vector<const gchar *> strings;
+    Gtk::ComboBoxText note_types;
+    vector<string> strings;
     Gtk::Frame   note_frame;
     Gtk::Frame   bpb_frame;
     Gtk::VBox    vpacker;
@@ -56,8 +64,8 @@ struct MeterDialog : public ArdourDialog
     Gtk::Frame   when_frame;
     char buf[64];
     
-    MeterDialog (ARDOUR::TempoMap&, jack_nframes_t, string action);
-    MeterDialog (ARDOUR::MeterSection&, string action);
+    MeterDialog (ARDOUR::TempoMap&, jack_nframes_t, ARDOUR::stringcr_t action);
+    MeterDialog (ARDOUR::MeterSection&, ARDOUR::stringcr_t action);
 
     double get_bpb ();
     double get_note_type ();