X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fdialog%2Ffilter-effects-dialog.h;h=ccffb2a67d78be6356540bf913328b11d05dcca2;hb=9acbda558d50be3b21e4b384be758bc12a461072;hp=16d684dd48be4d21a21f392e3268576af51b7557;hpb=2b3b5a2a04c62bc07b7f0740e7c705f142f9b173;p=inkscape.git

diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h
index 16d684dd4..ccffb2a67 100644
--- a/src/ui/dialog/filter-effects-dialog.h
+++ b/src/ui/dialog/filter-effects-dialog.h
@@ -1,7 +1,7 @@
-/**
- * \brief Filter Effects dialog
- *
- * Authors:
+/** @file
+ * @brief Filter Effects dialog
+ */
+/* Authors:
  *   Nicholas Bishop <nicholasbishop@gmail.com>
  *   Rodrigo Kumpera <kumpera@gmail.com>
  *
@@ -87,6 +87,7 @@ private:
         };
 
         static void on_activate_desktop(Application*, SPDesktop*, FilterModifier*);
+        static void on_deactivate_desktop(Application*, SPDesktop*, FilterModifier*);
         void on_document_replaced(SPDesktop*, SPDocument*)
         {
             update_filters();
@@ -223,16 +224,12 @@ private:
     void update_color_matrix();
     void update_primitive_infobox();
 
-    // Filter effect selection
-    FilterModifier _filter_modifier;
-
     // Primitives Info Box  
     Gtk::Label _infobox_desc;
     Gtk::Image _infobox_icon;
 
     // View/add primitives
     Gtk::VBox _primitive_box;
-    PrimitiveList _primitive_list;
     UI::Widget::ComboBoxEnum<NR::FilterPrimitiveType> _add_primitive_type;
     Gtk::Button _add_primitive;
 
@@ -268,6 +265,11 @@ private:
     bool _locked;
     bool _attr_lock;
 
+    // These go last since they depend on the prior initialization of
+    // other FilterEffectsDialog members
+    FilterModifier _filter_modifier;
+    PrimitiveList _primitive_list;
+
     FilterEffectsDialog(FilterEffectsDialog const &d);
     FilterEffectsDialog& operator=(FilterEffectsDialog const &d);
 };