r228@gwythaint (orig r768): fugalh | 2006-08-09 08:14:55 -0600

[ardour.git] / gtk2_ardour / meter_bridge.h

diff --git a/gtk2_ardour/meter_bridge.h b/gtk2_ardour/meter_bridge.h
index 3cb72a1629f7c0c2e54308effc8e19b7cc5ae9b2..6ceb7402fcb73ec44c0fb6291195d45318dc1699 100644 (file)
--- a/gtk2_ardour/meter_bridge.h
+++ b/gtk2_ardour/meter_bridge.h
@@ -23,12 +23,12 @@
 
 #include <list>
 
-#include <gtk--/eventbox.h>
-#include <gtk--/viewport.h>
-#include <gtk--/scrolledwindow.h>
-#include <gtk--/box.h>
-#include <gtk--/fixed.h>
-#include <gtk--/frame.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/viewport.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/box.h>
+#include <gtkmm/fixed.h>
+#include <gtkmm/frame.h>
 
 #include "keyboard_target.h"
 #include "ardour_dialog.h"
@@ -54,12 +54,13 @@ class MeterBridge : public ArdourDialog
        void toggle_metering ();
 
   protected:
-       gint map_event_impl (GdkEventAny *);
-       gint unmap_event_impl (GdkEventAny *);
+       void on_map ();
+       void on_unmap ();
 
   private:
        /* diskstream/recorder display */
-
+       Gtk::Adjustment          hadjustment;
+       Gtk::Adjustment          vadjustment;
        Gtk::Viewport            meter_viewport;
        Gtk::ScrolledWindow      meter_scroller;
        Gtk::EventBox            meter_scroll_base;
@@ -78,7 +79,7 @@ class MeterBridge : public ArdourDialog
        list<MeterBridgeStrip*>  meters;
        
        bool                    metering;
-       SigC::Connection        metering_connection;
+       sigc::connection        metering_connection;
 
        void update ();