summaryrefslogtreecommitdiffstats
path: root/src/extension
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2013-06-06 13:44:11 +0000
committerJon A. Cruz <jon@joncruz.org>2013-06-06 13:44:11 +0000
commit72d8e897c6b67e46b2a613c4743ef9c13de25059 (patch)
tree8aa472fc661f6cacb075274a8f9579dfe8c3c841 /src/extension
parentFixes r12348 and r12350. (diff)
downloadinkscape-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')
-rw-r--r--src/extension/execution-env.cpp2
-rw-r--r--src/extension/extension.cpp2
-rw-r--r--src/extension/implementation/script.cpp2
-rw-r--r--src/extension/internal/grid.cpp2
-rw-r--r--src/extension/internal/pdf-input-cairo.h2
-rw-r--r--src/extension/internal/pdfinput/pdf-input.h2
-rw-r--r--src/extension/param/bool.cpp2
-rw-r--r--src/extension/param/color.cpp2
-rw-r--r--src/extension/param/description.cpp2
-rw-r--r--src/extension/param/enum.cpp2
-rw-r--r--src/extension/param/float.cpp2
-rw-r--r--src/extension/param/int.cpp2
-rw-r--r--src/extension/param/notebook.cpp2
-rw-r--r--src/extension/param/radiobutton.cpp2
-rw-r--r--src/extension/param/string.cpp2
-rw-r--r--src/extension/prefdialog.h2
16 files changed, 32 insertions, 0 deletions
diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index 14b397532..343f87cdb 100644
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -10,7 +10,9 @@
#include <config.h>
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include "gtkmm/messagedialog.h"
diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index 43d3d9cc6..d63ec7485 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -19,7 +19,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/implementation/script.cpp b/src/extension/implementation/script.cpp
index ce18d2108..f0fd3711b 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -19,7 +19,9 @@
# include <config.h>
#endif
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include <gtkmm/messagedialog.h>
#include <gtkmm/main.h>
diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp
index 474f8b08d..812c383b4 100644
--- a/src/extension/internal/grid.cpp
+++ b/src/extension/internal/grid.cpp
@@ -11,7 +11,9 @@
* Released under GNU GPL, read the file 'COPYING' for more information
*/
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include <gtkmm/box.h>
#include <gtkmm/adjustment.h>
diff --git a/src/extension/internal/pdf-input-cairo.h b/src/extension/internal/pdf-input-cairo.h
index ee2dc4cee..b65d22f48 100644
--- a/src/extension/internal/pdf-input-cairo.h
+++ b/src/extension/internal/pdf-input-cairo.h
@@ -16,7 +16,9 @@
# include <config.h>
#endif
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include <gtkmm/dialog.h>
#include <gtkmm/button.h>
diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h
index 24924adb9..f22a783ff 100644
--- a/src/extension/internal/pdfinput/pdf-input.h
+++ b/src/extension/internal/pdfinput/pdf-input.h
@@ -16,7 +16,9 @@
#ifdef HAVE_POPPLER
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include <gtkmm/dialog.h>
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>
diff --git a/src/extension/prefdialog.h b/src/extension/prefdialog.h
index eb57fb6f2..4761b2100 100644
--- a/src/extension/prefdialog.h
+++ b/src/extension/prefdialog.h
@@ -10,7 +10,9 @@
#ifndef INKSCAPE_EXTENSION_DIALOG_H__
#define INKSCAPE_EXTENSION_DIALOG_H__
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include <gtkmm/dialog.h>
#include <glibmm/value.h>
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-18 23:04:15 +0000