From ded4a143db069785aa33eeb6dc9da02770e3ae8e Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 22 Sep 2010 15:21:06 +0000 Subject: much craziness with canvas cursors; fix 0 beat cursor text when shortening notes; fix crash when trimming locked regions; don't show trim cursors when region is locked; partial version of enumwriter validation fix from 2.X (less necessary with 3.0; probably more ... git-svn-id: svn://localhost/ardour2/branches/3.0@7831 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_audio_import.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gtk2_ardour/editor_audio_import.cc') diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index d3a2dd6608..5a250a09b8 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -509,8 +509,8 @@ Editor::import_sndfiles (vector paths, ImportMode mode, SrcQuality quali import_status.target_regions = target_regions; import_status.track = track; import_status.replace = replace; - - track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH)); + + set_canvas_cursor (wait_cursor); gdk_flush (); /* start import thread for this spec. this will ultimately call Session::import_audiofiles() @@ -544,7 +544,7 @@ Editor::import_sndfiles (vector paths, ImportMode mode, SrcQuality quali } - track_canvas->get_window()->set_cursor (*current_canvas_cursor); + set_canvas_cursor (current_canvas_cursor); return 0; } @@ -560,7 +560,7 @@ Editor::embed_sndfiles (vector paths, bool multifile, int ret = 0; string path_to_use; - track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH)); + set_canvas_cursor (wait_cursor); gdk_flush (); for (vector::iterator p = paths.begin(); p != paths.end(); ++p) { @@ -671,7 +671,7 @@ Editor::embed_sndfiles (vector paths, bool multifile, } } - track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH)); + set_canvas_cursor (wait_cursor); for (int n = 0; n < finfo.channels; ++n) { try { @@ -712,7 +712,7 @@ Editor::embed_sndfiles (vector paths, bool multifile, ret = add_sources (paths, sources, pos, mode, target_regions, target_tracks, track, true); out: - track_canvas->get_window()->set_cursor (*current_canvas_cursor); + set_canvas_cursor (current_canvas_cursor); return ret; } -- cgit v1.2.3