fix (mostly) measure lines and click box text and meter markings

[ardour.git] / gtk2_ardour / gain_meter.h

diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index 49c7d611bf1a47940ccb3fe4c6cba8a884dbdd99..597cb06cb387753f7d12a921e0e3aa8fdbb24cd0 100644 (file)
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -23,9 +23,17 @@
 
 #include <vector>
 
+#include <gtkmm/box.h>
+#include <gtkmm/adjustment.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/button.h>
+#include <gtkmm/table.h>
+#include <gtkmm/drawingarea.h>
+
+
 #include <ardour/types.h>
 
-#include <gtkmm.h>
 #include <gtkmm2ext/slider_controller.h>
 #include <gtkmm2ext/click_box.h>
 
@@ -42,6 +50,9 @@ namespace Gtkmm2ext {
        class BarController;
        class Pix;
 }
+namespace Gtk {
+       class Menu;
+}
 
 class GainMeter : public Gtk::VBox
 {
@@ -59,8 +70,8 @@ class GainMeter : public Gtk::VBox
        void set_width (Width);
        void setup_meters ();
 
-       void set_meter_strip_name (string name);
-       void set_fader_name (string name);
+       void set_meter_strip_name (const char * name);
+       void set_fader_name (const char * name);
 
   private:
        ARDOUR::IO& _io;
@@ -131,8 +142,6 @@ class GainMeter : public Gtk::VBox
        gint start_gain_touch (GdkEventButton*);
        gint end_gain_touch (GdkEventButton*);
 
-       gint entry_focus_event (GdkEventFocus* ev);
-
        void set_mix_group_meter_point (ARDOUR::Route&, ARDOUR::MeterPoint);
        void set_meter_point (ARDOUR::Route&, ARDOUR::MeterPoint);
        gint meter_release (GdkEventButton*);