Fix editor sizing issue introduced in 4dc65e66

[ardour.git] / gtk2_ardour / mouse_cursors.h

diff --git a/gtk2_ardour/mouse_cursors.h b/gtk2_ardour/mouse_cursors.h
index 55d5fd0c9db105eb90ae894a941ceca0782be853..da3317dffa5ffcb374b755f3cbfa12129732dc66 100644 (file)
--- a/gtk2_ardour/mouse_cursors.h
+++ b/gtk2_ardour/mouse_cursors.h
@@ -17,6 +17,9 @@
 
 */
 
+#ifndef __gtk2_ardour_mouse_cursors__
+#define __gtk2_ardour_mouse_cursors__
+
 /** @file Handling of bitmaps to be used for mouse cursors.
  *
  *  Held centrally by the Editor because some cursors are used in several places.
@@ -26,11 +29,18 @@ class MouseCursors
 {
 public:
        MouseCursors ();
+       ~MouseCursors ();
+
+       void set_cursor_set (const std::string& name);
+       std::string cursor_set() const { return _cursor_set; }
 
        Gdk::Cursor* cross_hair;
+       Gdk::Cursor* scissors;
        Gdk::Cursor* trimmer;
        Gdk::Cursor* right_side_trim;
+       Gdk::Cursor* anchored_right_side_trim;
        Gdk::Cursor* left_side_trim;
+       Gdk::Cursor* anchored_left_side_trim;
        Gdk::Cursor* right_side_trim_left_only;
        Gdk::Cursor* left_side_trim_right_only;
        Gdk::Cursor* fade_in;
@@ -38,7 +48,6 @@ public:
        Gdk::Cursor* selector;
        Gdk::Cursor* grabber;
        Gdk::Cursor* grabber_note;
-       Gdk::Cursor* grabber_edit_point;
        Gdk::Cursor* zoom_in;
        Gdk::Cursor* zoom_out;
        Gdk::Cursor* time_fx;
@@ -63,4 +72,24 @@ public:
        Gdk::Cursor* move;
        Gdk::Cursor* expand_left_right;
        Gdk::Cursor* expand_up_down;
+
+       /* This cursor is not intended to be used directly, it just
+          serves as an out-of-bounds value when we need to indicate
+          "no cursor". NULL/0 doesn't work for this, because it
+          is actually a valid value for a Gdk::Cursor - it indicates
+          "use the parent window's cursor"
+       */
+
+       static bool is_invalid (Gdk::Cursor* c) { if (!_invalid) { create_invalid(); } return c == _invalid; }
+       static Gdk::Cursor* invalid_cursor() { if (!_invalid) { create_invalid(); } return _invalid; }
+
+    private:
+       std::string _cursor_set;
+       void drop_all ();
+
+       Gdk::Cursor* make_cursor (const char* name, int hotspot_x = 0, int hotspot_y = 0);
+       static Gdk::Cursor* _invalid;
+       static void create_invalid ();
 };
+
+#endif /* __gtk2_ardour_mouse_cursors__ */