Warning cleanup

[inkscape.git] / src / ui / dialog / filter-effects-dialog.h

diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h
index ac7b96fd664609f06033c25a4d602e19ff6a04a7..d1a5039e3ed708a7cb8703279a7af2962e5497fe 100644 (file)
--- a/src/ui/dialog/filter-effects-dialog.h
+++ b/src/ui/dialog/filter-effects-dialog.h
@@ -40,11 +40,14 @@ class DualSpinButton;
 class MultiSpinButton;
 class FilterEffectsDialog : public Dialog {
 public:
+
+    FilterEffectsDialog(Behavior::BehaviorFactory behavior_factory);
     ~FilterEffectsDialog();
 
-    void set_attrs_locked(const bool);
+    static FilterEffectsDialog *create(Behavior::BehaviorFactory behavior_factory)
+    { return new FilterEffectsDialog(behavior_factory); }
 
-    static FilterEffectsDialog *create() { return new FilterEffectsDialog(); }
+    void set_attrs_locked(const bool);
 private:
     class SignalObserver;
 
@@ -77,26 +80,6 @@ private:
             Gtk::TreeModelColumn<int> sel;
         };
 
-        class CellRendererSel : public Gtk::CellRenderer
-        {
-        public:
-            CellRendererSel();
-
-            Glib::PropertyProxy<int> property_sel()
-            {
-                return _sel.get_proxy();
-            }
-        protected:
-            virtual void get_size_vfunc(Gtk::Widget&, const Gdk::Rectangle*,
-                                    int*, int*, int*, int*) const;
-            virtual void render_vfunc(const Glib::RefPtr<Gdk::Drawable>& win, Gtk::Widget& w,
-                                      const Gdk::Rectangle& bg_area, const Gdk::Rectangle& cell_area,
-                                      const Gdk::Rectangle& expose_area, Gtk::CellRendererState flags);
-        private:
-            const int _size;
-            Glib::Property<int> _sel;
-        };
-
         static void on_activate_desktop(Application*, SPDesktop*, FilterModifier*);
         void on_document_replaced(SPDesktop*, SPDocument*)
         {
@@ -108,8 +91,10 @@ private:
         void update_selection(Selection *);
         void on_filter_selection_changed();
 
+        void on_name_edited(const Glib::ustring&, const Glib::ustring&);
+        void on_selection_toggled(const Glib::ustring&);
+
         void update_filters();
-        void filter_list_button_press(GdkEventButton*);
         void filter_list_button_release(GdkEventButton*);
         void add_filter();
         void remove_filter();
@@ -123,7 +108,7 @@ private:
         Gtk::TreeView _list;
         Glib::RefPtr<Gtk::ListStore> _model;
         Columns _columns;
-        CellRendererSel _cell_sel;
+        Gtk::CellRendererToggle _cell_toggle;
         Gtk::Button _add;
         Glib::RefPtr<Gtk::Menu> _menu;
         sigc::signal<void> _signal_filter_changed;
@@ -259,6 +244,7 @@ private:
 
     // For controlling setting sensitivity
     Gtk::Widget* _k1, *_k2, *_k3, *_k4;
+    Gtk::Widget* _ct_table, *_ct_slope, *_ct_intercept, *_ct_amplitude, *_ct_exponent, *_ct_offset;
 
     // To prevent unwanted signals
     bool _locked;