remove extraneous 'r' from rec-enable buttons

[ardour.git] / gtk2_ardour / cairo_widget.h

diff --git a/gtk2_ardour/cairo_widget.h b/gtk2_ardour/cairo_widget.h
index ff0533643be43aa2ba33926345090b64fc4529e1..d3eac0bb0227c10f6a1fbbff3098c16ba568b6a3 100644 (file)
--- a/gtk2_ardour/cairo_widget.h
+++ b/gtk2_ardour/cairo_widget.h
@@ -21,10 +21,9 @@
 #define __gtk2_ardour_cairo_widget_h__
 
 #include <gtkmm/eventbox.h>
+#include "gtkmm2ext/widget_state.h"
 
-/** A parent class for widgets that are made up of a pixmap rendered using Cairo.
- *  The pixmap is painted to screen on GTK expose events, but the rendering
- *  is only done after set_dirty() has been called.
+/** A parent class for widgets that are rendered using Cairo.
  */
 
 class CairoWidget : public Gtk::EventBox
@@ -35,28 +34,12 @@ public:
 
        void set_dirty ();
 
-       /* widget states: unlike GTK, visual states like "Selected" or "Prelight"
-          are orthogonal to active states. 
-       */
-
-       enum ActiveState {
-               Active = 1,
-               Mid,
-       };
-       
-       enum VisualState {
-               /* these can be OR-ed together */
-               Selected = 0x1,
-               Prelight = 0x2,
-               Insensitive = 0x4,
-       };
-
-       ActiveState active_state() const { return _active_state; }
-       VisualState visual_state() const { return _visual_state; }
-       virtual void set_active_state (ActiveState);
-       virtual void set_visual_state (VisualState);
-       virtual void unset_active_state () { set_active_state (ActiveState (0)); }
-       virtual void unset_visual_state () { set_visual_state (VisualState (0)); }
+       Gtkmm2ext::ActiveState active_state() const { return _active_state; }
+       Gtkmm2ext::VisualState visual_state() const { return _visual_state; }
+       virtual void set_active_state (Gtkmm2ext::ActiveState);
+       virtual void set_visual_state (Gtkmm2ext::VisualState);
+       virtual void unset_active_state () { set_active_state (Gtkmm2ext::ActiveState (0)); }
+       virtual void unset_visual_state () { set_visual_state (Gtkmm2ext::VisualState (0)); }
 
        sigc::signal<void> StateChanged;
 
@@ -65,16 +48,16 @@ protected:
        virtual void render (cairo_t *) = 0;
        virtual bool on_expose_event (GdkEventExpose *);
        void on_size_allocate (Gtk::Allocation &);
+       void on_state_changed (Gtk::StateType);
        Gdk::Color get_parent_bg ();
 
        int _width; ///< pixmap width
        int _height; ///< pixmap height
-       ActiveState _active_state;
-       VisualState _visual_state;
+       Gtkmm2ext::ActiveState _active_state;
+       Gtkmm2ext::VisualState _visual_state;
 
 private:
        GdkPixmap* _pixmap; ///< our pixmap
-       bool _dirty; ///< true if the pixmap requires re-rendering
 };
 
 #endif