diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/editor_canvas.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/editor_route_list.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/sndfilesource.cc | 1 | ||||
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/slider_controller.h | 4 | ||||
| -rw-r--r-- | libs/gtkmm2ext/slider_controller.cc | 9 | ||||
| -rw-r--r-- | libs/libgnomecanvasmm/SConscript | 9 |
7 files changed, 23 insertions, 11 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index ce4a12f330..833dc8512f 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -374,11 +374,9 @@ ARDOUR_UI::finish() if (session && session->dirty()) { switch (ask_about_saving_session(_("quit"))) { case -1: - cerr << "dialog return -1\n"; return; break; case 1: - cerr << "dialog return +1\n"; /* use the default name */ if (save_state_canfail ("")) { /* failed - don't quit */ @@ -392,10 +390,7 @@ If you still wish to quit, please use the\n\n\ } break; case 0: - cerr << "dialog return 0\n"; break; - default: - cerr << "dialog return other\n"; } } Config->save_state(); diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 41350a1da4..e8ba2b8a60 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -128,7 +128,7 @@ Editor::initialize_canvas () time_line_group = new ArdourCanvas::Group (*track_canvas.root(), 0.0, 0.0); cursor_group = new ArdourCanvas::Group (*track_canvas.root(), 0.0, 0.0); - + time_canvas.set_name ("EditorTimeCanvas"); time_canvas.add_events (Gdk::POINTER_MOTION_HINT_MASK); time_canvas.set_flags (CAN_FOCUS); diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc index 2e036f5001..95ac358095 100644 --- a/gtk2_ardour/editor_route_list.cc +++ b/gtk2_ardour/editor_route_list.cc @@ -263,6 +263,10 @@ Editor::redisplay_route_list () } + /* make sure the cursors stay on top of every newly added track */ + + cursor_group->raise_to_top (); + reset_scrolling_region (); } diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index b3ce33a2e6..118bdd77cf 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -244,7 +244,6 @@ SndFileSource::open () /* if the file has data but no broadcast info, then clearly, there is no broadcast info */ if (_length) { - error << "SndFileSource: file has no broadcast info" << endmsg; free (_broadcast_info); _broadcast_info = 0; _flags = Flag (_flags & ~Broadcast); diff --git a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h index 8054fdd1b7..f0f645eab7 100644 --- a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h +++ b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h @@ -50,9 +50,7 @@ class SliderController : public Gtkmm2ext::PixScroller Gtk::SpinButton& get_spin_button () { return spin; } - bool on_button_press_event (GdkEventButton *ev) { - return binding_proxy.button_press_handler (ev); - } + bool on_button_press_event (GdkEventButton *ev); protected: BindingProxy binding_proxy; diff --git a/libs/gtkmm2ext/slider_controller.cc b/libs/gtkmm2ext/slider_controller.cc index aba58724eb..e524eba1cb 100644 --- a/libs/gtkmm2ext/slider_controller.cc +++ b/libs/gtkmm2ext/slider_controller.cc @@ -50,6 +50,15 @@ SliderController::set_value (float v) adj.set_value (v); } +bool +SliderController::on_button_press_event (GdkEventButton *ev) +{ + if (binding_proxy.button_press_handler (ev)) { + return true; + } + return PixScroller::on_button_press_event (ev); +} + VSliderController::VSliderController (Glib::RefPtr<Gdk::Pixbuf> slide, Glib::RefPtr<Gdk::Pixbuf> rail, Gtk::Adjustment *adj, diff --git a/libs/libgnomecanvasmm/SConscript b/libs/libgnomecanvasmm/SConscript index 1d5f3e0050..d9620dc378 100644 --- a/libs/libgnomecanvasmm/SConscript +++ b/libs/libgnomecanvasmm/SConscript @@ -8,7 +8,14 @@ gnomecanvasmm_files = glob.glob('libgnomecanvasmm/*.cc') Import('env libraries install_prefix') gnomecanvasmm = env.Copy() -gnomecanvasmm.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], libraries['pangomm'], libraries['atkmm'], libraries['gdkmm2'], libraries['gtkmm2'], libraries['libgnomecanvas2'] ]) +gnomecanvasmm.Merge([libraries['glibmm2'], + libraries['gtk2'], + libraries['sigc2'], + libraries['pangomm'], + libraries['atkmm'], + libraries['gdkmm2'], + libraries['gtkmm2'], + libraries['libgnomecanvas2'] ]) libgnomecanvasmm = gnomecanvasmm.SharedLibrary('libgnomecanvasmm', gnomecanvasmm_files) Default(libgnomecanvasmm) |