diff options
| author | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-08-04 06:19:46 +0000 |
|---|---|---|
| committer | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-08-04 06:19:46 +0000 |
| commit | e0728cfe3dcf882045af5295ffd7c2725b6a430f (patch) | |
| tree | 3289217df16f6f73a2950cd3d40d24a9c856cae1 /src/ui/widget/selected-style.cpp | |
| parent | Add functionality to add and delete CSS property in CSS panel (diff) | |
| parent | Add legacy verb SP_VERB_SELECTION_OUTLINE_LEGACY as pointed in bug 1556592#14 (diff) | |
| download | inkscape-e0728cfe3dcf882045af5295ffd7c2725b6a430f.tar.gz inkscape-e0728cfe3dcf882045af5295ffd7c2725b6a430f.zip | |
Merge changes from trunk
(bzr r14949.1.62)
Diffstat (limited to 'src/ui/widget/selected-style.cpp')
| -rw-r--r-- | src/ui/widget/selected-style.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index f7fd63f51..7bbfa08db 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -10,11 +10,10 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include "selected-style.h" -#include <gtkmm/separatormenuitem.h> #include "widgets/spw-utilities.h" #include "ui/widget/color-preview.h" @@ -31,19 +30,14 @@ #include "ui/dialog/dialog-manager.h" #include "ui/dialog/fill-and-stroke.h" #include "ui/dialog/panel-dialog.h" -#include "xml/repr.h" -#include "document.h" #include "document-undo.h" #include "widgets/widget-sizes.h" #include "widgets/spinbutton-events.h" #include "widgets/gradient-image.h" -#include "sp-gradient.h" #include "svg/svg-color.h" #include "svg/css-ostringstream.h" #include "ui/tools/tool-base.h" #include "message-context.h" -#include "verbs.h" -#include "color.h" #include <display/sp-canvas.h> #include "pixmaps/cursor-adj-h.xpm" #include "pixmaps/cursor-adj-s.xpm" @@ -51,7 +45,8 @@ #include "pixmaps/cursor-adj-a.xpm" #include "sp-cursor.h" #include "gradient-chemistry.h" -#include "util/units.h" + +#include <gtkmm/separatormenuitem.h> using Inkscape::Util::unit_table; |