Plugin output meters are now vertical. It still needs a rotateable text

[ardour.git] / gtk2_ardour / panner_ui.h

diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index 4a4078bb7447bb2049c70d8bb21864db5c6db06f..a1435973b758f3dab43810321b02ab012a468943 100644 (file)
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -22,9 +22,17 @@
 #define __ardour_gtk_panner_ui_h__
 
 #include <vector>
-#include <gtk--.h>
-#include <gtkmmext/slider_controller.h>
-#include <gtkmmext/click_box.h>
+
+#include <gtkmm/box.h>
+#include <gtkmm/adjustment.h>
+#include <gtkmm/viewport.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/arrow.h>
+#include <gtkmm/togglebutton.h>
+#include <gtkmm/button.h>
+
+#include <gtkmm2ext/slider_controller.h>
+#include <gtkmm2ext/click_box.h>
 
 #include "enums.h"
 
@@ -34,11 +42,16 @@ namespace ARDOUR {
        class IO;
        class Session;
 }
-namespace Gtkmmext {
+namespace Gtkmm2ext {
        class FastMeter;
        class BarController;
 }
 
+namespace Gtk {
+       class Menu;
+       class Menuitem;
+}
+
 class PannerUI : public Gtk::HBox
 {
   public:
@@ -67,6 +80,8 @@ class PannerUI : public Gtk::HBox
        Panner2d*   panner;
 
        Gtk::VBox           pan_bar_packer;
+       Gtk::Adjustment     hAdjustment;
+       Gtk::Adjustment     vAdjustment;
        Gtk::Viewport       panning_viewport;
        Gtk::EventBox       panning_up;
        Gtk::Arrow          panning_up_arrow;
@@ -87,7 +102,7 @@ class PannerUI : public Gtk::HBox
        void panning_link_direction_clicked ();
 
        vector<Gtk::Adjustment*> pan_adjustments;
-       vector<Gtkmmext::BarController*> pan_bars;
+       vector<Gtkmm2ext::BarController*> pan_bars;
 
        void pan_adjustment_changed (uint32_t which);
        void pan_value_changed (uint32_t which);
@@ -106,8 +121,6 @@ class PannerUI : public Gtk::HBox
        gint start_pan_touch (GdkEventButton*);
        gint end_pan_touch (GdkEventButton*);
 
-       gint entry_focus_event (GdkEventFocus* ev);
-
        gint pan_button_event (GdkEventButton*, uint32_t which);
        Gtk::Menu* pan_menu;
        Gtk::CheckMenuItem* bypass_menu_item;