rationalize destruction pathway (some more); tidy-ify some ImageFrame code

[ardour.git] / gtk2_ardour / axis_view.cc

diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc
index f22b0d2dc7adb3fcd8d89e4033c5659a31ee22b6..eb3ef23bc64a05925746f8c824478158e6f94917 100644 (file)
--- a/gtk2_ardour/axis_view.cc
+++ b/gtk2_ardour/axis_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2003 Paul Davis 
+    Copyright (C) 2003 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,26 +25,28 @@
 
 #include <list>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/selector.h>
 #include <gtkmm2ext/gtk_ui.h>
 
-#include <ardour/session.h>
-#include <ardour/utils.h>
+#include "ardour/session.h"
+#include "ardour/utils.h"
 
 #include "public_editor.h"
 #include "axis_view.h"
 #include "i18n.h"
 
+using namespace std;
 using namespace Gtk;
 using namespace Gtkmm2ext;
-
+using namespace ARDOUR;
 
 list<Gdk::Color> AxisView::used_colors;
 
-AxisView::AxisView (ARDOUR::Session& sess) : _session(sess)
+AxisView::AxisView (ARDOUR::Session* sess) 
+       : SessionHandlePtr (sess)
 {
        _selected = false;
        _marked_for_display = false;
@@ -52,14 +54,13 @@ AxisView::AxisView (ARDOUR::Session& sess) : _session(sess)
 
 AxisView::~AxisView()
 {
-
 }
 
 Gdk::Color
 AxisView::unique_random_color()
 {
        Gdk::Color newcolor;
-       
+
        while (1) {
 
                /* avoid neon/glowing tones by limiting them to the
@@ -76,11 +77,11 @@ AxisView::unique_random_color()
                        used_colors.push_back (newcolor);
                        return newcolor;
                }
-               
+
                for (list<Gdk::Color>::iterator i = used_colors.begin(); i != used_colors.end(); ++i) {
                  Gdk::Color c = *i;
                        float rdelta, bdelta, gdelta;
-                       
+
                        rdelta = newcolor.get_red() - c.get_red();
                        bdelta = newcolor.get_blue() - c.get_blue();
                        gdelta = newcolor.get_green() - c.get_green();