X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fdialog%2Ffill-and-stroke.cpp;h=a05c20b36da15491a45e8ca3f7418da10748a887;hb=9acbda558d50be3b21e4b384be758bc12a461072;hp=b9e1754ba08cc4e13ed61da1bdd0862d34dc28a2;hpb=17eb9e57e1550f744916bf486947162aa523bdda;p=inkscape.git

diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp
index b9e1754ba..a05c20b36 100644
--- a/src/ui/dialog/fill-and-stroke.cpp
+++ b/src/ui/dialog/fill-and-stroke.cpp
@@ -1,8 +1,9 @@
-/**
- * \brief Fill and Stroke dialog,
- * based on sp_object_properties_dialog
+/** @file
+ * @brief Fill and Stroke dialog - implementation
  *
- * Authors:
+ * Based on the old sp_object_properties_dialog.
+ */
+/* Authors:
  *   Bryce W. Harrington <bryce@bryceharrington.org>
  *   Gustav Broberg <broberg@kth.se>
  *
@@ -11,10 +12,6 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include "desktop-handles.h"
 #include "desktop-style.h"
 #include "document.h"
@@ -39,10 +36,11 @@ namespace UI {
 namespace Dialog {
 
 FillAndStroke::FillAndStroke()
-    : UI::Widget::Panel ("", "dialogs.fillstroke", SP_VERB_DIALOG_FILL_STROKE),
+    : UI::Widget::Panel ("", "/dialogs/fillstroke", SP_VERB_DIALOG_FILL_STROKE),
       _page_fill(1, 1, true, true),
       _page_stroke_paint(1, 1, true, true),
-      _page_stroke_style(1, 1, true, true)
+      _page_stroke_style(1, 1, true, true),
+      _composite_settings(SP_VERB_DIALOG_FILL_STROKE, "fillstroke", SimpleFilterModifier::BLUR)
 {
     Gtk::Box *contents = _getContents();
     contents->set_spacing(0);
@@ -86,7 +84,9 @@ FillAndStroke::_layoutPageStrokePaint()
 void
 FillAndStroke::_layoutPageStrokeStyle()
 {
-    Gtk::Widget *ssl = manage(Glib::wrap(sp_stroke_style_line_widget_new()));
+    //Gtk::Widget *ssl = manage(Glib::wrap(sp_stroke_style_line_widget_new()));
+    //Gtk::Widget *ssl = static_cast<Gtk::Widget *>(sp_stroke_style_line_widget_new());
+    Gtk::Widget *ssl = sp_stroke_style_line_widget_new();
     _page_stroke_style.table().attach(*ssl, 0, 1, 0, 1);
 }