X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner_ui.h;h=b028510de34e7f0613f3260c534bff1458561ff4;hb=aaa44a37aaf585b9bcd9268a9551a005e6269bdb;hp=4a4078bb7447bb2049c70d8bb21864db5c6db06f;hpb=209d967b1bb80a9735d690d8f4f0455ecb9970ca;p=ardour.git

diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index 4a4078bb74..b028510de3 100644
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -22,9 +22,9 @@
 #define __ardour_gtk_panner_ui_h__
 
 #include <vector>
-#include <gtk--.h>
-#include <gtkmmext/slider_controller.h>
-#include <gtkmmext/click_box.h>
+#include <gtkmm.h>
+#include <gtkmm2ext/slider_controller.h>
+#include <gtkmm2ext/click_box.h>
 
 #include "enums.h"
 
@@ -34,7 +34,7 @@ namespace ARDOUR {
 	class IO;
 	class Session;
 }
-namespace Gtkmmext {
+namespace Gtkmm2ext {
 	class FastMeter;
 	class BarController;
 }
@@ -67,6 +67,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 +89,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 +108,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;