diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2013-06-06 13:44:11 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2013-06-06 13:44:11 +0000 |
| commit | 72d8e897c6b67e46b2a613c4743ef9c13de25059 (patch) | |
| tree | 8aa472fc661f6cacb075274a8f9579dfe8c3c841 /src/extension/param | |
| parent | Fixes r12348 and r12350. (diff) | |
| download | inkscape-72d8e897c6b67e46b2a613c4743ef9c13de25059.tar.gz inkscape-72d8e897c6b67e46b2a613c4743ef9c13de25059.zip | |
Added configure/ifdef guards to only bring in the needed #include if glibmm has it.
(bzr r12353)
Diffstat (limited to 'src/extension/param')
| -rw-r--r-- | src/extension/param/bool.cpp | 2 | ||||
| -rw-r--r-- | src/extension/param/color.cpp | 2 | ||||
| -rw-r--r-- | src/extension/param/description.cpp | 2 | ||||
| -rw-r--r-- | src/extension/param/enum.cpp | 2 | ||||
| -rw-r--r-- | src/extension/param/float.cpp | 2 | ||||
| -rw-r--r-- | src/extension/param/int.cpp | 2 | ||||
| -rw-r--r-- | src/extension/param/notebook.cpp | 2 | ||||
| -rw-r--r-- | src/extension/param/radiobutton.cpp | 2 | ||||
| -rw-r--r-- | src/extension/param/string.cpp | 2 |
9 files changed, 18 insertions, 0 deletions
diff --git a/src/extension/param/bool.cpp b/src/extension/param/bool.cpp index 354ac6f64..548dec4fa 100644 --- a/src/extension/param/bool.cpp +++ b/src/extension/param/bool.cpp @@ -10,7 +10,9 @@ # include "config.h" #endif +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H #include <glibmm/threads.h> +#endif #include <gtkmm/adjustment.h> #include <gtkmm/box.h> diff --git a/src/extension/param/color.cpp b/src/extension/param/color.cpp index 0da3d4a28..0a2598c56 100644 --- a/src/extension/param/color.cpp +++ b/src/extension/param/color.cpp @@ -14,7 +14,9 @@ #include <iostream> #include <sstream> +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H #include <glibmm/threads.h> +#endif #include <gtkmm/adjustment.h> #include <gtkmm/box.h> diff --git a/src/extension/param/description.cpp b/src/extension/param/description.cpp index a43fd624d..c9cea73d4 100644 --- a/src/extension/param/description.cpp +++ b/src/extension/param/description.cpp @@ -13,7 +13,9 @@ # include "config.h" #endif +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H #include <glibmm/threads.h> +#endif #include <gtkmm/box.h> #include <gtkmm/label.h> diff --git a/src/extension/param/enum.cpp b/src/extension/param/enum.cpp index 9cdc05049..bb50c06e1 100644 --- a/src/extension/param/enum.cpp +++ b/src/extension/param/enum.cpp @@ -18,7 +18,9 @@ # include "config.h" #endif +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H #include <glibmm/threads.h> +#endif #include <gtkmm/box.h> #include <gtkmm/comboboxtext.h> diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp index e9c02e91b..464938f03 100644 --- a/src/extension/param/float.cpp +++ b/src/extension/param/float.cpp @@ -10,7 +10,9 @@ # include "config.h" #endif +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H #include <glibmm/threads.h> +#endif #include <gtkmm/adjustment.h> #include <gtkmm/box.h> diff --git a/src/extension/param/int.cpp b/src/extension/param/int.cpp index 7898b66b1..819c75693 100644 --- a/src/extension/param/int.cpp +++ b/src/extension/param/int.cpp @@ -10,7 +10,9 @@ # include "config.h" #endif +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H #include <glibmm/threads.h> +#endif #include <gtkmm/adjustment.h> #include <gtkmm/box.h> diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp index b887be717..97002e33f 100644 --- a/src/extension/param/notebook.cpp +++ b/src/extension/param/notebook.cpp @@ -16,7 +16,9 @@ # include "config.h" #endif +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H #include <glibmm/threads.h> +#endif #include <gtkmm/adjustment.h> #include <gtkmm/box.h> diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp index 15fc711d0..75d5a40e3 100644 --- a/src/extension/param/radiobutton.cpp +++ b/src/extension/param/radiobutton.cpp @@ -18,7 +18,9 @@ # include "config.h" #endif +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H #include <glibmm/threads.h> +#endif #include <gtkmm/box.h> #include <gtkmm/comboboxtext.h> diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp index cedc6b1a9..d6e438db5 100644 --- a/src/extension/param/string.cpp +++ b/src/extension/param/string.cpp @@ -10,7 +10,9 @@ # include "config.h" #endif +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H #include <glibmm/threads.h> +#endif #include <gtkmm/adjustment.h> #include <gtkmm/box.h> |