diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2015-05-18 10:58:20 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2015-05-18 10:58:20 +0000 |
| commit | 6c2374a5e4f15e5b6a673a0cfdb856c4b0e86f10 (patch) | |
| tree | 3cc78e5548b5a4fef797803f4a8452d0e3db7587 /src/extension/param/parameter.cpp | |
| parent | Latvian translation update (diff) | |
| parent | fixed: color icc selector - extra rows on startup (diff) | |
| download | inkscape-6c2374a5e4f15e5b6a673a0cfdb856c4b0e86f10.tar.gz inkscape-6c2374a5e4f15e5b6a673a0cfdb856c4b0e86f10.zip | |
Merge in Tomasz's fill-n-stroke-cppify branch
after fixing inkscape.pot file and conflicts with adding files.
(bzr r14160)
Diffstat (limited to 'src/extension/param/parameter.cpp')
| -rw-r--r-- | src/extension/param/parameter.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp index 202b8110f..8c99ee55d 100644 --- a/src/extension/param/parameter.cpp +++ b/src/extension/param/parameter.cpp @@ -15,6 +15,10 @@ # include "config.h" #endif +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H +#include <glibmm/threads.h> +#endif + #ifdef linux // does the dollar sign need escaping when passed as string parameter? # define ESCAPE_DOLLAR_COMMANDLINE #endif @@ -26,8 +30,7 @@ #include "document-private.h" #include "sp-object.h" #include <color.h> -#include "widgets/sp-color-selector.h" -#include "widgets/sp-color-notebook.h" +#include "ui/widget/color-notebook.h" #include "parameter.h" #include "bool.h" |