- fixed editor forced minimum size issue

- fixed thinko in selectable
- fixed incorrect virtual method signature in fft_graph

git-svn-id: svn://localhost/ardour2/trunk@665 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 08c716d4422751d6d9d09a7660a9ca7faa670cc5..2512c082db78a43c9596b252f386e7594dd7bc36 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2184,7 +2184,6 @@ Editor::set_state (const XMLNode& node)
                yoff = atoi(geometry->property("y_off")->value());
        }
 
-       set_geometry_hints (vpacker, g, Gdk::HINT_BASE_SIZE);
        set_default_size (g.base_width, g.base_height);
        move (x, y);
 

diff --git a/gtk2_ardour/fft_graph.cc b/gtk2_ardour/fft_graph.cc
index c2d81abf3ce1ab4ad045873d69d936e020667ee4..7c8b4b4095a0f47d6154f082e77e8b0a711c0fcd 100644 (file)
--- a/gtk2_ardour/fft_graph.cc
+++ b/gtk2_ardour/fft_graph.cc
@@ -384,7 +384,7 @@ FFTGraph::on_size_request(Gtk::Requisition* requisition)
 }
 
 void
-FFTGraph::on_size_allocate(Gtk::Allocation alloc)
+FFTGraph::on_size_allocate(Gtk::Allocation & alloc)
 {
        width = alloc.get_width();
        height = alloc.get_height();

diff --git a/gtk2_ardour/fft_graph.h b/gtk2_ardour/fft_graph.h
index 80c78180a6c8a934709a2af0ff5bc0a7bd5e0509..73636b989d802d36007a36e3e522cbfdf270b04d 100644 (file)
--- a/gtk2_ardour/fft_graph.h
+++ b/gtk2_ardour/fft_graph.h
@@ -51,7 +51,7 @@ class FFTGraph : public Gtk::DrawingArea
                bool on_expose_event (GdkEventExpose* event);
                
                void on_size_request(Gtk::Requisition* requisition);
-               void on_size_allocate(Gtk::Allocation alloc);
+               void on_size_allocate(Gtk::Allocation & alloc);
                FFTResult *prepareResult(Gdk::Color color, std::string trackname);
                
        private:

diff --git a/gtk2_ardour/selectable.h b/gtk2_ardour/selectable.h
index b4be7090e25609b695398244033607630d9a7694..b52214c9c9610e14e5f4257f5ccd2bf2e09dc1db 100644 (file)
--- a/gtk2_ardour/selectable.h
+++ b/gtk2_ardour/selectable.h
@@ -34,7 +34,7 @@ class Selectable : public virtual sigc::trackable
 
        virtual void set_selected (bool yn) {
                if (yn != _selected) {
-                       _selected = true;
+                       _selected = yn;
                        Selected (_selected); /* EMIT_SIGNAL */
                }
        }