summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog
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/ui/dialog
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/ui/dialog')
-rw-r--r--src/ui/dialog/aboutbox.h2
-rw-r--r--src/ui/dialog/calligraphic-profile-rename.h2
-rw-r--r--src/ui/dialog/color-item.cpp2
-rw-r--r--src/ui/dialog/debug.cpp2
-rw-r--r--src/ui/dialog/export.cpp2
-rw-r--r--src/ui/dialog/filedialogimpl-gtkmm.h2
-rw-r--r--src/ui/dialog/filedialogimpl-win32.h3
-rw-r--r--src/ui/dialog/floating-behavior.cpp2
-rw-r--r--src/ui/dialog/font-substitution.cpp2
-rw-r--r--src/ui/dialog/guides.h3
-rw-r--r--src/ui/dialog/icon-preview.cpp2
-rw-r--r--src/ui/dialog/layer-properties.h2
-rw-r--r--src/ui/dialog/layers.h2
-rw-r--r--src/ui/dialog/livepatheffect-add.h2
-rw-r--r--src/ui/dialog/messages.h2
-rw-r--r--src/ui/dialog/ocaldialogs.h2
-rw-r--r--src/ui/dialog/spellcheck.h2
-rw-r--r--src/ui/dialog/symbols.cpp2
-rw-r--r--src/ui/dialog/text-edit.h2
-rw-r--r--src/ui/dialog/tile.h2
-rw-r--r--src/ui/dialog/transformation.cpp2
21 files changed, 44 insertions, 0 deletions
diff --git a/src/ui/dialog/aboutbox.h b/src/ui/dialog/aboutbox.h
index e4a87f265..cd58c8988 100644
--- a/src/ui/dialog/aboutbox.h
+++ b/src/ui/dialog/aboutbox.h
@@ -15,7 +15,9 @@
#ifndef INKSCAPE_UI_DIALOG_ABOUTBOX_H
#define INKSCAPE_UI_DIALOG_ABOUTBOX_H
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include <gtkmm/dialog.h>
diff --git a/src/ui/dialog/calligraphic-profile-rename.h b/src/ui/dialog/calligraphic-profile-rename.h
index d2e09f075..3256338eb 100644
--- a/src/ui/dialog/calligraphic-profile-rename.h
+++ b/src/ui/dialog/calligraphic-profile-rename.h
@@ -15,7 +15,9 @@
# include "config.h"
#endif
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include <gtkmm/dialog.h>
#include <gtkmm/entry.h>
diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp
index 762a534d9..633b3f4c5 100644
--- a/src/ui/dialog/color-item.cpp
+++ b/src/ui/dialog/color-item.cpp
@@ -13,7 +13,9 @@
#include <errno.h>
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include <gtkmm/label.h>
#include <glibmm/i18n.h>
diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp
index 20865bce6..9e2287f80 100644
--- a/src/ui/dialog/debug.cpp
+++ b/src/ui/dialog/debug.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/dialog.h>
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index fa9f57e48..a851503fe 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -20,7 +20,9 @@
// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
#include <png.h>
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include <gtkmm/box.h>
#include <gtkmm/buttonbox.h>
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.h b/src/ui/dialog/filedialogimpl-gtkmm.h
index 2b1b7c200..79007596f 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.h
+++ b/src/ui/dialog/filedialogimpl-gtkmm.h
@@ -17,7 +17,9 @@
#ifndef __FILE_DIALOGIMPL_H__
#define __FILE_DIALOGIMPL_H__
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include <glibmm/threads.h>
diff --git a/src/ui/dialog/filedialogimpl-win32.h b/src/ui/dialog/filedialogimpl-win32.h
index 0839be8a8..2e6bb4bb8 100644
--- a/src/ui/dialog/filedialogimpl-win32.h
+++ b/src/ui/dialog/filedialogimpl-win32.h
@@ -15,8 +15,11 @@
#ifdef WIN32
#if WITH_GLIBMM_2_32
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
# include <glibmm/threads.h>
#endif
+
+#endif
#include "gc-core.h"
#include <windows.h>
#include "filedialogimpl-gtkmm.h"
diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp
index f8ddaac06..f0c799adf 100644
--- a/src/ui/dialog/floating-behavior.cpp
+++ b/src/ui/dialog/floating-behavior.cpp
@@ -10,7 +10,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/dialog.h>
#include <gtkmm/stock.h>
diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp
index 124a1970a..bf9133086 100644
--- a/src/ui/dialog/font-substitution.cpp
+++ b/src/ui/dialog/font-substitution.cpp
@@ -10,7 +10,9 @@
# include <config.h>
#endif
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include <gtkmm/messagedialog.h>
#include <gtkmm/checkbutton.h>
diff --git a/src/ui/dialog/guides.h b/src/ui/dialog/guides.h
index 2be6e5aed..422fed7fe 100644
--- a/src/ui/dialog/guides.h
+++ b/src/ui/dialog/guides.h
@@ -15,7 +15,10 @@
# include <config.h>
#endif
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
+
#include <gtkmm/dialog.h>
#if WITH_GTKMM_3_0
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 5cfc883c8..468e85d36 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -17,7 +17,9 @@
# include <config.h>
#endif
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include <gtkmm/buttonbox.h>
#include <boost/scoped_ptr.hpp>
diff --git a/src/ui/dialog/layer-properties.h b/src/ui/dialog/layer-properties.h
index b94cdf878..d38b8edf5 100644
--- a/src/ui/dialog/layer-properties.h
+++ b/src/ui/dialog/layer-properties.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/entry.h>
diff --git a/src/ui/dialog/layers.h b/src/ui/dialog/layers.h
index befecf9d6..1f3f7c377 100644
--- a/src/ui/dialog/layers.h
+++ b/src/ui/dialog/layers.h
@@ -12,7 +12,9 @@
#ifndef SEEN_LAYERS_PANEL_H
#define SEEN_LAYERS_PANEL_H
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include <gtkmm/box.h>
#include <gtkmm/treeview.h>
diff --git a/src/ui/dialog/livepatheffect-add.h b/src/ui/dialog/livepatheffect-add.h
index 7a41b8351..41b1bdd2b 100644
--- a/src/ui/dialog/livepatheffect-add.h
+++ b/src/ui/dialog/livepatheffect-add.h
@@ -11,7 +11,9 @@
#ifndef INKSCAPE_DIALOG_LIVEPATHEFFECT_ADD_H
#define INKSCAPE_DIALOG_LIVEPATHEFFECT_ADD_H
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include <gtkmm/dialog.h>
#include <gtkmm/liststore.h>
diff --git a/src/ui/dialog/messages.h b/src/ui/dialog/messages.h
index c5797dc34..92ada9046 100644
--- a/src/ui/dialog/messages.h
+++ b/src/ui/dialog/messages.h
@@ -16,7 +16,9 @@
#ifndef INKSCAPE_UI_DIALOG_MESSAGES_H
#define INKSCAPE_UI_DIALOG_MESSAGES_H
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include <gtkmm/box.h>
#include <gtkmm/textview.h>
diff --git a/src/ui/dialog/ocaldialogs.h b/src/ui/dialog/ocaldialogs.h
index 592d5144c..72d184969 100644
--- a/src/ui/dialog/ocaldialogs.h
+++ b/src/ui/dialog/ocaldialogs.h
@@ -13,7 +13,9 @@
#ifndef __OCAL_DIALOG_H__
#define __OCAL_DIALOG_H__
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
//Gtk includes
#include <gtkmm/box.h>
diff --git a/src/ui/dialog/spellcheck.h b/src/ui/dialog/spellcheck.h
index 026f2a349..f08c0669f 100644
--- a/src/ui/dialog/spellcheck.h
+++ b/src/ui/dialog/spellcheck.h
@@ -12,7 +12,9 @@
#ifndef SEEN_SPELLCHECK_H
#define SEEN_SPELLCHECK_H
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include <gtkmm/box.h>
#include <gtkmm/button.h>
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 8e7f45514..3468d984d 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -18,7 +18,9 @@
#include <functional>
#include <sstream>
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include <gtkmm/buttonbox.h>
#include <gtkmm/label.h>
diff --git a/src/ui/dialog/text-edit.h b/src/ui/dialog/text-edit.h
index e409ad73b..eb0811e5d 100644
--- a/src/ui/dialog/text-edit.h
+++ b/src/ui/dialog/text-edit.h
@@ -18,7 +18,9 @@
#ifndef INKSCAPE_UI_DIALOG_TEXT_EDIT_H
#define INKSCAPE_UI_DIALOG_TEXT_EDIT_H
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include <gtkmm/box.h>
#include <gtkmm/notebook.h>
diff --git a/src/ui/dialog/tile.h b/src/ui/dialog/tile.h
index 5724596c5..6e41723fd 100644
--- a/src/ui/dialog/tile.h
+++ b/src/ui/dialog/tile.h
@@ -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/notebook.h>
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index d2604553d..4aa972296 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -15,7 +15,9 @@
# include <config.h>
#endif
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
#include <glibmm/threads.h>
+#endif
#include <gtkmm/dialog.h>
#include <gtkmm/stock.h>
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-02 20:12:25 +0000