Header tidying, suppress all gdk deprecation errors in gtkmm

(bzr r11030)

15 files changed, 30 insertions, 29 deletions

diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index ecc9405d9..676cb9b59 100644
--- a/src/widgets/button.cpp
+++ b/src/widgets/button.cpp
@@ -17,19 +17,12 @@
 # include "config.h"
 #endif
 
-
-#if HAVE_STRING_H
-#endif
-
-
-
-
+#include "icon.h"
 #include "shortcuts.h"
 #include "interface.h"
 
 #include <gdk/gdkkeysyms.h>
 
-#include "icon.h"
 #include "button.h"
 
 static void sp_button_class_init (SPButtonClass *klass);
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index 29af8bd75..798b65abd 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -12,9 +12,7 @@
  *      ? -2004
  */
 
-#include <gtk/gtk.h>
-
-#include "sp-object.h"
+#include <gtkmm/window.h>
 #include "message.h"
 #include "ui/view/view-widget.h"
 #include "ui/view/edit-widget-interface.h"
@@ -26,7 +24,9 @@
 // forward declaration
 typedef struct _EgeColorProfTracker EgeColorProfTracker;
 struct SPCanvas;
+class SPDesktop;
 class SPDesktopWidget;
+class SPObject;
 
 
 #define SP_TYPE_DESKTOP_WIDGET SPDesktopWidget::getType()
diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp
index d5c796776..d9d818643 100644
--- a/src/widgets/fill-style.cpp
+++ b/src/widgets/fill-style.cpp
@@ -24,6 +24,9 @@
 
 #include <glibmm/i18n.h>
 #include <gtkmm/box.h>
+
+#include "verbs.h"
+
 #include <gtk/gtk.h>
 
 #include "desktop.h"
diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp
index 08f98a49f..1644008d1 100644
--- a/src/widgets/font-selector.cpp
+++ b/src/widgets/font-selector.cpp
@@ -20,8 +20,8 @@
 # include "config.h"
 #endif
 
-#include <libnrtype/font-instance.h>
 #include <libnrtype/font-lister.h>
+#include <libnrtype/font-instance.h>
 
 #include <2geom/transforms.h>
 
diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp
index c5f463121..6443e09cb 100644
--- a/src/widgets/gradient-toolbar.cpp
+++ b/src/widgets/gradient-toolbar.cpp
@@ -16,6 +16,7 @@
 # include "config.h"
 #endif
 
+#include "verbs.h"
 #include <gtk/gtk.h>
 
 #include "macros.h"
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 829f865ed..eb421ade6 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -24,6 +24,9 @@
 #endif
 #ifdef HAVE_STRING_H
 #endif
+#include "ui/widget/color-preview.h"
+#include "gradient-vector.h"
+#include "verbs.h"
 #include <gtk/gtk.h>
 #include "macros.h"
 #include <glibmm/i18n.h>
@@ -31,7 +34,6 @@
 #include "../inkscape.h"
 #include "../document-private.h"
 #include "../gradient-chemistry.h"
-#include "gradient-vector.h"
 #include "../helper/window.h"
 
 #include "xml/repr.h"
@@ -425,7 +427,6 @@ void SPGradientVectorSelector::setSwatched()
   ##################################################################*/
 
 #include "../widgets/sp-color-notebook.h"
-#include "ui/widget/color-preview.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/node-event-vector.h"
 #include "../svg/svg-color.h"
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index 930412e55..7f027870d 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -16,11 +16,11 @@
 # include "config.h"
 #endif
 
+#include <gtkmm/icontheme.h>
 #include <cstring>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
-#include <gtkmm/icontheme.h>
 #include <gtkmm/image.h>
 #include <gdkmm/pixbuf.h>
 #include <glibmm/fileutils.h>
diff --git a/src/widgets/icon.h b/src/widgets/icon.h
index f04d2f8da..3f6aa2455 100644
--- a/src/widgets/icon.h
+++ b/src/widgets/icon.h
@@ -14,15 +14,16 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
-
+#include <gtkmm/widget.h>
 #include "icon-size.h"
 
 #define SP_TYPE_ICON SPIcon::getType()
 #define SP_ICON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_ICON, SPIcon))
 #define SP_IS_ICON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SP_TYPE_ICON))
 
-#include <gtk/gtk.h>
+namespace Glib {
+class ustring;
+}
 
 struct SPIconClass {
     GtkWidgetClass parent_class;
@@ -45,8 +46,6 @@ struct SPIcon {
 
 GtkWidget *sp_icon_new( Inkscape::IconSize size, const gchar *name );
 
-#include <glibmm/ustring.h>
-#include <gtkmm/widget.h>
 
 // Might return a wrapped SPIcon, or Gtk::Image
 Gtk::Widget *sp_icon_get_icon( const Glib::ustring &oid, Inkscape::IconSize size = Inkscape::ICON_SIZE_BUTTON );
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index ecc3cc197..f8d0052db 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -16,13 +16,13 @@
 # include "config.h"
 #endif
 
+#include "ui/widget/spinbutton.h"
 #include <gtk/gtk.h>
 
 #include "widgets/button.h"
 #include "widgets/spw-utilities.h"
 #include "widgets/widget-sizes.h"
 #include "widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
 #include "widgets/icon.h"
 #include "widgets/sp-widget.h"
 
diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index 8e3d16da5..a1702a864 100644
--- a/src/widgets/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
@@ -13,6 +13,8 @@
  */
 
 #include <glibmm/i18n.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/label.h>
 #include <sigc++/functors/ptr_fun.h>
 #include <sigc++/adaptors/bind.h>
 
diff --git a/src/widgets/sp-attribute-widget.h b/src/widgets/sp-attribute-widget.h
index 98f44b4f8..fb8a74632 100644
--- a/src/widgets/sp-attribute-widget.h
+++ b/src/widgets/sp-attribute-widget.h
@@ -15,14 +15,14 @@
 #ifndef SEEN_DIALOGS_SP_ATTRIBUTE_WIDGET_H
 #define SEEN_DIALOGS_SP_ATTRIBUTE_WIDGET_H
 
-#include <gtk/gtk.h>
-#include <glib.h>
-#include <gtkmm/entry.h>
 #include <gtkmm/table.h>
 #include <gtkmm/widget.h>
 #include <stddef.h>
 #include <sigc++/connection.h>
 
+namespace Gtk {
+class Entry;
+}
 
 namespace Inkscape {
 namespace XML {
diff --git a/src/widgets/sp-xmlview-content.cpp b/src/widgets/sp-xmlview-content.cpp
index d6ff5276d..d30f0bbe6 100644
--- a/src/widgets/sp-xmlview-content.cpp
+++ b/src/widgets/sp-xmlview-content.cpp
@@ -19,6 +19,7 @@
 #include "document-private.h"
 #include "document-undo.h"
 #include "inkscape.h"
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/widgets/spw-utilities.h b/src/widgets/spw-utilities.h
index 334aa7ce1..263abbcaf 100644
--- a/src/widgets/spw-utilities.h
+++ b/src/widgets/spw-utilities.h
@@ -18,15 +18,11 @@
    SPObject, that reacts to modification.
 */
 
-#include <glib.h>
-#include <gtk/gtk.h>      /* GtkWidget */
-#include <gtkmm/widget.h>
-#include <gtkmm/table.h>
-
 namespace Gtk {
   class Label;
   class Table;
   class HBox;
+  class Widget;
 }
 
 Gtk::Label *
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 0f5fc0b97..5508d8cca 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -17,6 +17,7 @@
 
 #define noSP_SS_VERBOSE
 
+#include <gtkmm/table.h>
 #include <glib.h>
 #include <glibmm/i18n.h>
 #include "widgets/dash-selector.h"
@@ -59,6 +60,7 @@
 #include "fill-n-stroke-factory.h"
 
 #include <gtkmm/optionmenu.h>
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 4ea9c9344..5f8714324 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -31,6 +31,9 @@
 
 #include <cstring>
 #include <string>
+#include <gtkmm/action.h>
+#include <gtkmm/actiongroup.h>
+#include <gtkmm/toolitem.h>
 
 #include "../libnrtype/font-lister.h"
 #include <iostream>