fix merge conflict from master

[ardour.git] / libs / gtkmm2ext / gtkmm2ext / stateful_button.h

diff --git a/libs/gtkmm2ext/gtkmm2ext/stateful_button.h b/libs/gtkmm2ext/gtkmm2ext/stateful_button.h
index 00ae766645d4161822d4f7560b13db14090f6da9..5954d4de4563f08aa01f588b980f37ec2f9753c6 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/stateful_button.h
+++ b/libs/gtkmm2ext/gtkmm2ext/stateful_button.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __pbd_gtkmm_abutton_h__
@@ -33,51 +32,60 @@ class StateButton
        StateButton();
        virtual ~StateButton() {}
 
-       void set_colors (const std::vector<Gdk::Color>& colors);
        void set_visual_state (int);
        int  get_visual_state () { return visual_state; }
        void set_self_managed (bool yn) { _self_managed = yn; }
+       virtual void set_widget_name (const std::string& name) = 0;
 
   protected:
-       std::vector<Gdk::Color> colors;
        int  visual_state;
-       Gdk::Color saved_bg;
-       bool have_saved_bg;
        bool _self_managed;
+       bool _is_realized;
+        bool style_changing;
+        Gtk::StateType state_before_prelight;
+        bool is_toggle;
 
-       virtual void bg_modify (Gtk::StateType, Gdk::Color) = 0;
+       virtual std::string  get_widget_name() const = 0;
+        virtual Gtk::Widget* get_child_widget () = 0;
+
+        void avoid_prelight_on_style_changed (const Glib::RefPtr<Gtk::Style>& style, GtkWidget* widget);
+        void avoid_prelight_on_state_changed (Gtk::StateType old_state, GtkWidget* widget);
 };
 
 
 class StatefulToggleButton : public StateButton, public Gtk::ToggleButton
 {
    public:
-       StatefulToggleButton() {}
-       explicit StatefulToggleButton(const std::string &label) : Gtk::ToggleButton (label) {}
+       StatefulToggleButton();
+       explicit StatefulToggleButton(const std::string &label);
        ~StatefulToggleButton() {}
+       void set_widget_name (const std::string& name);
 
   protected:
        void on_realize ();
        void on_toggled ();
+        void on_style_changed (const Glib::RefPtr<Gtk::Style>& style);
+        void on_state_changed (Gtk::StateType old_state);
 
-       void bg_modify (Gtk::StateType state, Gdk::Color col) { 
-               modify_bg (state, col);
-       }
+        Gtk::Widget* get_child_widget ();
+       std::string get_widget_name() const { return get_name(); }
 };
 
 class StatefulButton : public StateButton, public Gtk::Button
 {
    public:
-       StatefulButton() {}
-       explicit StatefulButton(const std::string &label) : Gtk::Button (label) {}
+       StatefulButton();
+       explicit StatefulButton(const std::string &label);
        virtual ~StatefulButton() {}
-
+       void set_widget_name (const std::string& name);
+        
   protected:
        void on_realize ();
-
-       void bg_modify (Gtk::StateType state, Gdk::Color col) { 
-               modify_bg (state, col);
-       }
+        void on_style_changed (const Glib::RefPtr<Gtk::Style>& style);
+        void on_state_changed (Gtk::StateType old_state);
+        
+        Gtk::Widget* get_child_widget ();
+       std::string get_widget_name() const { return get_name(); }
 };
 
 };