Build with GDK_DISABLE_DEPRECATED for Gtk+ 2

Fixed bugs:
  - https://launchpad.net/bugs/943207

(bzr r11431)

17 files changed, 17 insertions, 17 deletions

diff --git a/src/widgets/arc-toolbar.cpp b/src/widgets/arc-toolbar.cpp
index e59a20d30..a421ef481 100644
--- a/src/widgets/arc-toolbar.cpp
+++ b/src/widgets/arc-toolbar.cpp
@@ -28,6 +28,7 @@
 # include "config.h"
 #endif
 
+#include "ui/widget/spinbutton.h"
 #include "toolbox.h"
 #include "arc-toolbar.h"
 
@@ -47,7 +48,6 @@
 
 #include "../widgets/button.h"
 #include "../widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
 #include "../widgets/spw-utilities.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/node-event-vector.h"
diff --git a/src/widgets/box3d-toolbar.cpp b/src/widgets/box3d-toolbar.cpp
index cf43295ed..74359aa5c 100644
--- a/src/widgets/box3d-toolbar.cpp
+++ b/src/widgets/box3d-toolbar.cpp
@@ -28,6 +28,7 @@
 # include "config.h"
 #endif
 
+#include "ui/widget/spinbutton.h"
 #include "toolbox.h"
 #include "box3d-toolbar.h"
 
@@ -47,7 +48,6 @@
 
 #include "../widgets/button.h"
 #include "../widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
 #include "../widgets/spw-utilities.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/node-event-vector.h"
diff --git a/src/widgets/connector-toolbar.cpp b/src/widgets/connector-toolbar.cpp
index 7112037f2..2b00856ec 100644
--- a/src/widgets/connector-toolbar.cpp
+++ b/src/widgets/connector-toolbar.cpp
@@ -29,6 +29,7 @@
 #endif
 
 
+#include "ui/widget/spinbutton.h"
 #include "toolbox.h"
 #include "connector-toolbar.h"
 
@@ -48,7 +49,6 @@
 
 #include "../widgets/button.h"
 #include "../widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
 #include "../widgets/spw-utilities.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/node-event-vector.h"
diff --git a/src/widgets/dropper-toolbar.cpp b/src/widgets/dropper-toolbar.cpp
index 462b45c01..f38fa719b 100644
--- a/src/widgets/dropper-toolbar.cpp
+++ b/src/widgets/dropper-toolbar.cpp
@@ -28,6 +28,7 @@
 # include "config.h"
 #endif
 
+#include "ui/widget/spinbutton.h"
 #include "toolbox.h"
 #include "dropper-toolbar.h"
 
@@ -46,7 +47,6 @@
 
 #include "../widgets/button.h"
 #include "../widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
 #include "../widgets/spw-utilities.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/node-event-vector.h"
diff --git a/src/widgets/erasor-toolbar.cpp b/src/widgets/erasor-toolbar.cpp
index 5d10b545f..e31e3aea7 100644
--- a/src/widgets/erasor-toolbar.cpp
+++ b/src/widgets/erasor-toolbar.cpp
@@ -29,6 +29,7 @@
 #endif
 
 
+#include "ui/widget/spinbutton.h"
 #include "toolbox.h"
 #include "erasor-toolbar.h"
 #include "calligraphy-toolbar.h"
@@ -48,7 +49,6 @@
 
 #include "../widgets/button.h"
 #include "../widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
 #include "../widgets/spw-utilities.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/node-event-vector.h"
diff --git a/src/widgets/measure-toolbar.cpp b/src/widgets/measure-toolbar.cpp
index a68d2f3fc..e114b94ea 100644
--- a/src/widgets/measure-toolbar.cpp
+++ b/src/widgets/measure-toolbar.cpp
@@ -28,6 +28,7 @@
 # include "config.h"
 #endif
 
+#include "ui/widget/spinbutton.h"
 #include "toolbox.h"
 #include "measure-toolbar.h"
 
@@ -45,7 +46,6 @@
 #include "../ink-comboboxentry-action.h"
 #include "../widgets/button.h"
 #include "../widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
 #include "../widgets/spw-utilities.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/repr.h"
diff --git a/src/widgets/mesh-toolbar.cpp b/src/widgets/mesh-toolbar.cpp
index 066e2a02a..99a34fbda 100644
--- a/src/widgets/mesh-toolbar.cpp
+++ b/src/widgets/mesh-toolbar.cpp
@@ -19,10 +19,10 @@
 #endif
 
 // REVIEW THESE AT END OF REWRITE
+#include "ui/widget/color-preview.h"
 #include "toolbox.h"
 #include "mesh-toolbar.h"
 
-#include "ui/widget/color-preview.h"
 #include "verbs.h"
 
 #include "macros.h"
diff --git a/src/widgets/node-toolbar.cpp b/src/widgets/node-toolbar.cpp
index baa1670a0..1be638359 100644
--- a/src/widgets/node-toolbar.cpp
+++ b/src/widgets/node-toolbar.cpp
@@ -28,6 +28,7 @@
 # include "config.h"
 #endif
 
+#include "ui/widget/spinbutton.h"
 #include "toolbox.h"
 #include "node-toolbar.h"
 
@@ -46,7 +47,6 @@
 #include "../ink-comboboxentry-action.h"
 #include "../widgets/button.h"
 #include "../widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
 #include "../widgets/spw-utilities.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/attribute-record.h"
diff --git a/src/widgets/paintbucket-toolbar.cpp b/src/widgets/paintbucket-toolbar.cpp
index 58308ded0..bedba0859 100644
--- a/src/widgets/paintbucket-toolbar.cpp
+++ b/src/widgets/paintbucket-toolbar.cpp
@@ -29,6 +29,7 @@
 #endif
 
 
+#include "ui/widget/spinbutton.h"
 #include "toolbox.h"
 #include "paintbucket-toolbar.h"
 
@@ -47,7 +48,6 @@
 #include "../ink-comboboxentry-action.h"
 #include "../widgets/button.h"
 #include "../widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
 #include "../widgets/spw-utilities.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/node-event-vector.h"
diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp
index e63186b36..61e506ebd 100644
--- a/src/widgets/pencil-toolbar.cpp
+++ b/src/widgets/pencil-toolbar.cpp
@@ -28,6 +28,7 @@
 # include "config.h"
 #endif
 
+#include "ui/widget/spinbutton.h"
 #include "toolbox.h"
 #include "pencil-toolbar.h"
 
@@ -53,7 +54,6 @@
 
 #include "../widgets/button.h"
 #include "../widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
 #include "../widgets/spw-utilities.h"
 #include "../widgets/widget-sizes.h"
 //#include "../xml/attribute-record.h"
diff --git a/src/widgets/rect-toolbar.cpp b/src/widgets/rect-toolbar.cpp
index 0a1e625c9..e12e77487 100644
--- a/src/widgets/rect-toolbar.cpp
+++ b/src/widgets/rect-toolbar.cpp
@@ -28,6 +28,7 @@
 # include "config.h"
 #endif
 
+#include "ui/widget/spinbutton.h"
 #include "toolbox.h"
 #include "rect-toolbar.h"
 
@@ -45,7 +46,6 @@
 #include "../ink-comboboxentry-action.h"
 #include "../widgets/button.h"
 #include "../widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
 #include "../widgets/spw-utilities.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/node-event-vector.h"
diff --git a/src/widgets/spiral-toolbar.cpp b/src/widgets/spiral-toolbar.cpp
index 8080c4f07..307c75252 100644
--- a/src/widgets/spiral-toolbar.cpp
+++ b/src/widgets/spiral-toolbar.cpp
@@ -28,6 +28,7 @@
 # include "config.h"
 #endif
 
+#include "ui/widget/spinbutton.h"
 #include "toolbox.h"
 #include "spiral-toolbar.h"
 
@@ -47,7 +48,6 @@
 #include "../ink-comboboxentry-action.h"
 #include "../widgets/button.h"
 #include "../widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
 #include "../widgets/spw-utilities.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/node-event-vector.h"
diff --git a/src/widgets/spray-toolbar.cpp b/src/widgets/spray-toolbar.cpp
index 38b8d35f4..1fd1b7f34 100644
--- a/src/widgets/spray-toolbar.cpp
+++ b/src/widgets/spray-toolbar.cpp
@@ -28,6 +28,7 @@
 # include "config.h"
 #endif
 
+#include "ui/widget/spinbutton.h"
 #include "toolbox.h"
 #include "spray-toolbar.h"
 
@@ -45,7 +46,6 @@
 #include "../ink-comboboxentry-action.h"
 #include "../widgets/button.h"
 #include "../widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
 #include "../widgets/spw-utilities.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/repr.h"
diff --git a/src/widgets/star-toolbar.cpp b/src/widgets/star-toolbar.cpp
index 0b9501bcc..9d48e8992 100644
--- a/src/widgets/star-toolbar.cpp
+++ b/src/widgets/star-toolbar.cpp
@@ -28,6 +28,7 @@
 # include "config.h"
 #endif
 
+#include "ui/widget/spinbutton.h"
 #include "toolbox.h"
 #include "star-toolbar.h"
 
@@ -45,7 +46,6 @@
 #include "../ink-comboboxentry-action.h"
 #include "../widgets/button.h"
 #include "../widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
 #include "../widgets/spw-utilities.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/node-event-vector.h"
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp
index 114fa0911..8f5be6068 100644
--- a/src/widgets/text-toolbar.cpp
+++ b/src/widgets/text-toolbar.cpp
@@ -29,6 +29,7 @@
 #endif
 
 
+#include "ui/widget/spinbutton.h"
 #include "toolbox.h"
 #include "text-toolbar.h"
 
@@ -48,7 +49,6 @@
 #include "../ink-comboboxentry-action.h"
 #include "../widgets/button.h"
 #include "../widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
 #include "../widgets/spw-utilities.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/node-event-vector.h"
diff --git a/src/widgets/tweak-toolbar.cpp b/src/widgets/tweak-toolbar.cpp
index 9552b2283..d1c71db44 100644
--- a/src/widgets/tweak-toolbar.cpp
+++ b/src/widgets/tweak-toolbar.cpp
@@ -28,6 +28,7 @@
 # include "config.h"
 #endif
 
+#include "ui/widget/spinbutton.h"
 #include "toolbox.h"
 #include "tweak-toolbar.h"
 
@@ -45,7 +46,6 @@
 #include "../ink-comboboxentry-action.h"
 #include "../widgets/button.h"
 #include "../widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
 #include "../widgets/spw-utilities.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/repr.h"
diff --git a/src/widgets/zoom-toolbar.cpp b/src/widgets/zoom-toolbar.cpp
index 3b799e925..7d7f2c774 100644
--- a/src/widgets/zoom-toolbar.cpp
+++ b/src/widgets/zoom-toolbar.cpp
@@ -28,6 +28,7 @@
 # include "config.h"
 #endif
 
+#include "ui/widget/spinbutton.h"
 #include "toolbox.h"
 #include "zoom-toolbar.h"
 
@@ -45,7 +46,6 @@
 #include "../ink-comboboxentry-action.h"
 #include "../widgets/button.h"
 #include "../widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
 #include "../widgets/spw-utilities.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/repr.h"