diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-02-12 16:55:11 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-02-12 16:55:11 +0000 |
| commit | c241f36817b43e02baa4b164b603063d827e939f (patch) | |
| tree | 57a19cdb29d3b7e1f0736896e61f43c6ebde5d8c /gtk2_ardour/editor.cc | |
| parent | 8bfbf5bda11fcdae12f28bf6fc6bca910aaec411 (diff) | |
fix up compile issues; add new grabber_edit_point cursor
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3040 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor.cc')
| -rw-r--r-- | gtk2_ardour/editor.cc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index dfd560f467..b2a327c8c9 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -170,6 +170,7 @@ Gdk::Cursor* Editor::cross_hair_cursor = 0; Gdk::Cursor* Editor::selector_cursor = 0; Gdk::Cursor* Editor::trimmer_cursor = 0; Gdk::Cursor* Editor::grabber_cursor = 0; +Gdk::Cursor* Editor::grabber_edit_point_cursor = 0; Gdk::Cursor* Editor::zoom_cursor = 0; Gdk::Cursor* Editor::time_fx_cursor = 0; Gdk::Cursor* Editor::fader_cursor = 0; @@ -1305,21 +1306,14 @@ Editor::build_cursors () transparent_cursor = new Gdk::Cursor (bits, bits, c, c, 0, 0); } - Glib::RefPtr<Gdk::Pixbuf> grabber_edit_point_pixbuf (::get_icon ("grabber_edit_point")); grabber_cursor = new Gdk::Cursor (HAND2); -#ifdef GTKOSX { - - Glib::RefPtr<Gdk::Pixbuf> hand2 (grabber_cursor->get_image()); - hand2->save ("hand.png", "png"); + Glib::RefPtr<Gdk::Pixbuf> grabber_edit_point_pixbuf (::get_icon ("grabber_edit_point")); + grabber_edit_point_cursor = new Gdk::Cursor (Gdk::Display::get_default(), grabber_edit_point_pixbuf, 5, 17); } - - grabber_edit_point_cursor = new Gdk::Cursor (Gdk::Display::get_default(), grabber_edit_point_pixbuf); -#endif - cross_hair_cursor = new Gdk::Cursor (CROSSHAIR); trimmer_cursor = new Gdk::Cursor (SB_H_DOUBLE_ARROW); selector_cursor = new Gdk::Cursor (XTERM); @@ -2149,6 +2143,8 @@ Editor::set_edit_point_preference (EditPoint ep) edit_point_selector.set_active_text (str); } + set_canvas_cursor (); + if (!changed) { return; } @@ -2175,7 +2171,7 @@ Editor::set_edit_point_preference (EditPoint ep) break; } } - + instant_save (); } |