use newly factored canvas in gtk2_ardour

[ardour.git] / gtk2_ardour / group_tabs.h

diff --git a/gtk2_ardour/group_tabs.h b/gtk2_ardour/group_tabs.h
index 059f3ce60b9296a26207c310349d782be4ba471f..ff231e8a681c89a8105f0bb1eef91ab4be5fd150 100644 (file)
--- a/gtk2_ardour/group_tabs.h
+++ b/gtk2_ardour/group_tabs.h
@@ -19,7 +19,7 @@
 
 #include <gtkmm/menu.h>
 #include "editor_component.h"
-#include "cairo_widget.h"
+#include "gtkmm2ext/cairo_widget.h"
 
 namespace ARDOUR {
        class Session;
@@ -50,9 +50,9 @@ public:
 
        void run_new_group_dialog (ARDOUR::RouteList const &);
 
-       static void set_group_color (ARDOUR::RouteGroup *, Gdk::Color);
+       static void set_group_color (ARDOUR::RouteGroup *, uint32_t);
        static std::string group_gui_id (ARDOUR::RouteGroup *);
-       static Gdk::Color group_color (ARDOUR::RouteGroup *);
+       static uint32_t group_color (ARDOUR::RouteGroup *);
 
 protected:
 
@@ -61,7 +61,7 @@ protected:
 
                double from;
                double to;
-               Gdk::Color color; ///< color
+               uint32_t color; ///< color
                ARDOUR::RouteGroup* group; ///< route group
        };
 
@@ -92,7 +92,6 @@ private:
 
        virtual void add_menu_items (Gtk::Menu *, ARDOUR::RouteGroup *) {}
        virtual PBD::PropertyList default_properties () const = 0;
-       virtual std::string order_key () const = 0;
        virtual ARDOUR::RouteList selected_routes () const = 0;
        virtual void sync_order_keys () = 0;
 
@@ -104,11 +103,12 @@ private:
        void set_activation (ARDOUR::RouteGroup *, bool);
        void edit_group (ARDOUR::RouteGroup *);
        void subgroup (ARDOUR::RouteGroup *, bool, ARDOUR::Placement);
+        void un_subgroup (ARDOUR::RouteGroup *);
        void activate_all ();
        void disable_all ();
        void remove_group (ARDOUR::RouteGroup *);
 
-       void render (cairo_t *);
+       void render (cairo_t *, cairo_rectangle_t*);
        void on_size_request (Gtk::Requisition *);
        bool on_button_press_event (GdkEventButton *);
        bool on_motion_notify_event (GdkEventMotion *);