From 9b9816178f8c606724d7f8ee45c70aff9aa9b055 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Wed, 15 Feb 2012 11:19:00 +0000
Subject: Move gtkmm headers that internally re-enable deprecated gtk symbols
 to top.  Hides many GTK deprecation errors that we can't fix in Inkscape

(bzr r10982)
---
 src/dialogs/clonetiler.cpp | 7 +++++--
 src/dialogs/export.cpp     | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/dialogs')

diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
index f3621bbdd..bd4364cc1 100644
--- a/src/dialogs/clonetiler.cpp
+++ b/src/dialogs/clonetiler.cpp
@@ -17,8 +17,10 @@
 #endif
 
 #include <climits>
+
+#include "ui/widget/color-picker.h"
+
 #include <glib.h>
-#include <gtk/gtk.h>
 #include <glibmm/i18n.h>
 #include <2geom/transforms.h>
 #include <gtkmm/adjustment.h>
@@ -49,7 +51,6 @@
 #include "svg/svg-color.h"
 #include "svg/svg.h"
 #include "ui/icon-names.h"
-#include "ui/widget/color-picker.h"
 #include "ui/widget/spinbutton.h"
 #include "unclump.h"
 #include "verbs.h"
@@ -57,6 +58,8 @@
 #include "xml/repr.h"
 #include "sp-root.h"
 
+#include <gtk/gtk.h>
+
 using Inkscape::DocumentUndo;
 
 #define MIN_ONSCREEN_DISTANCE 50
diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index b52616d1a..85149ccaa 100644
--- a/src/dialogs/export.cpp
+++ b/src/dialogs/export.cpp
@@ -22,7 +22,6 @@
 // This has to be included prior to anything that includes setjmp.h, it croaks otherwise
 #include <png.h>
 
-#include <gtk/gtk.h>
 #include <gtkmm/box.h>
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/label.h>
@@ -71,6 +70,8 @@
 #include <gdk/gdkwin32.h>
 #endif
 
+#include <gtk/gtk.h>
+
 using Inkscape::DocumentUndo;
 
 #define SP_EXPORT_MIN_SIZE 1.0
-- 
cgit v1.2.3