diff options
| author | Jesse Chappell <jesse@essej.net> | 2006-07-06 13:00:20 +0000 |
|---|---|---|
| committer | Jesse Chappell <jesse@essej.net> | 2006-07-06 13:00:20 +0000 |
| commit | ee58e757e9beb551669ebf843448e2eb839b24f1 (patch) | |
| tree | 90c9bcba3272d62c1b0e94673761ce42b1f4ac96 | |
| parent | 118175a3a281c7f70649c74f0e1727cbb65010e8 (diff) | |
- 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
| -rw-r--r-- | gtk2_ardour/editor.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/fft_graph.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/fft_graph.h | 2 | ||||
| -rw-r--r-- | gtk2_ardour/selectable.h | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 08c716d442..2512c082db 100644 --- 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 c2d81abf3c..7c8b4b4095 100644 --- 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 80c78180a6..73636b989d 100644 --- 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 b4be7090e2..b52214c9c9 100644 --- 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 */ } } |