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)

12 files changed, 31 insertions, 24 deletions

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
diff --git a/src/file.cpp b/src/file.cpp
index e6a744d1b..536dc9ebb 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -30,10 +30,7 @@
 # include "config.h"
 #endif
 
-#include <gtk/gtk.h>
-#include <glib.h>
-#include <glibmm/i18n.h>
-
+#include "ui/dialog/ocaldialogs.h"
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "dialogs/export.h"
@@ -62,11 +59,14 @@
 #include "selection.h"
 #include "sp-namedview.h"
 #include "style.h"
-#include "ui/dialog/ocaldialogs.h"
 #include "ui/view/view-widget.h"
 #include "uri.h"
 #include "xml/rebase-hrefs.h"
 
+#include <gtk/gtk.h>
+#include <glib.h>
+#include <glibmm/i18n.h>
+
 using Inkscape::DocumentUndo;
 
 #ifdef WITH_GNOME_VFS
diff --git a/src/help.cpp b/src/help.cpp
index 8bae656c5..02a1930f4 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -16,12 +16,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include "path-prefix.h"
 
+#include "ui/dialog/aboutbox.h"
+#include "path-prefix.h"
 #include "help.h"
 #include "file.h"
 
-#include "ui/dialog/aboutbox.h"
 
 void
 sp_help_about (void)
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index b97c0eb83..4792d85d3 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -37,8 +37,8 @@
 #include <glib/gstdio.h>
 #include <glib.h>
 #include <glibmm/i18n.h>
-#include <gtk/gtk.h>
 #include <gtkmm/messagedialog.h>
+#include <gtk/gtk.h>
 #include <signal.h>
 #include <string>
 #include "desktop.h"
diff --git a/src/print.cpp b/src/print.cpp
index a93ce0ab6..c120e8d1f 100644
--- a/src/print.cpp
+++ b/src/print.cpp
@@ -15,6 +15,8 @@
 # include "config.h"
 #endif
 
+#include "ui/dialog/print.h"
+#include "print.h"
 #include "display/drawing.h"
 #include "display/drawing-item.h"
 #include "inkscape.h"
@@ -22,10 +24,8 @@
 #include "sp-item.h"
 #include "extension/print.h"
 #include "extension/system.h"
-#include "print.h"
 #include "sp-root.h"
 
-#include "ui/dialog/print.h"
 
 unsigned int
 sp_print_bind(SPPrintContext *ctx, Geom::Affine const &transform, float opacity)
diff --git a/src/spray-context.cpp b/src/spray-context.cpp
index a94a92157..89da66b8f 100644
--- a/src/spray-context.cpp
+++ b/src/spray-context.cpp
@@ -20,12 +20,10 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <glibmm/i18n.h>
-
 #include <numeric>
 
+#include "ui/dialog/dialog-manager.h"
+
 #include "svg/svg.h"
 
 #include <glib.h>
@@ -65,12 +63,15 @@
 #include "filter-chemistry.h"
 
 #include "spray-context.h"
-#include "ui/dialog/dialog-manager.h"
 #include "helper/action.h"
 #include "verbs.h"
 
 #include <iostream>
 
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include <glibmm/i18n.h>
+
 using Inkscape::DocumentUndo;
 using namespace std;
 
diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp
index a91ccf196..e940a3f55 100644
--- a/src/ui/dialog/print.cpp
+++ b/src/ui/dialog/print.cpp
@@ -18,8 +18,8 @@
 #include <windows.h>
 #endif
 
-#include <gtkmm/stock.h>
 #include "print.h"
+#include <gtkmm/stock.h>
 
 #include "extension/internal/cairo-render-context.h"
 #include "extension/internal/cairo-renderer.h"
diff --git a/src/ui/dialog/print.h b/src/ui/dialog/print.h
index bfa6bbe97..f81829d86 100644
--- a/src/ui/dialog/print.h
+++ b/src/ui/dialog/print.h
@@ -11,12 +11,12 @@
 #ifndef INKSCAPE_UI_DIALOG_PRINT_H
 #define INKSCAPE_UI_DIALOG_PRINT_H
 
+#include "ui/widget/rendering-options.h"
 #include <gtkmm/printoperation.h> // GtkMM
 
 class SPItem;
 class SPDocument;
 
-#include "ui/widget/rendering-options.h"
 
 /*
  * gtk 2.12.0 has a bug (http://bugzilla.gnome.org/show_bug.cgi?id=482089)
diff --git a/src/ui/widget/color-picker.h b/src/ui/widget/color-picker.h
index cece8a361..e20212615 100644
--- a/src/ui/widget/color-picker.h
+++ b/src/ui/widget/color-picker.h
@@ -14,8 +14,8 @@
 #define __COLOR_PICKER_H__
 
 #include <stddef.h>
-#include <gtkmm/button.h>
 #include <gtkmm/dialog.h>
+#include <gtkmm/button.h>
 #include <sigc++/sigc++.h>
 #include "ui/widget/color-preview.h"
 
diff --git a/src/ui/widget/combo-enums.h b/src/ui/widget/combo-enums.h
index d2f6fc43b..4678ab83b 100644
--- a/src/ui/widget/combo-enums.h
+++ b/src/ui/widget/combo-enums.h
@@ -11,9 +11,9 @@
 #ifndef INKSCAPE_UI_WIDGET_COMBO_ENUMS_H
 #define INKSCAPE_UI_WIDGET_COMBO_ENUMS_H
 
+#include "ui/widget/labelled.h"
 #include <gtkmm/combobox.h>
 #include <gtkmm/liststore.h>
-#include "ui/widget/labelled.h"
 #include "attr-widget.h"
 #include "util/enums.h"
 
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 2d6d8fca8..8d411b96a 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -30,11 +30,11 @@
 #endif
 
 #include <cstring>
-#include <gtk/gtk.h>
+#include <string>
+
 #include <gtkmm/filechooserdialog.h>
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/stock.h>
-#include <string>
 
 #include "bind/javabind.h"
 #include "desktop.h"
@@ -83,6 +83,8 @@
 #include "ui/icon-names.h"
 #include "ui/tool/node-tool.h"
 
+#include <gtk/gtk.h>
+
 using Inkscape::DocumentUndo;
 
 //#ifdef WITH_INKBOARD