merge from trunk (r12209)

(bzr r11668.1.58)

19 files changed, 78 insertions, 20 deletions

diff --git a/src/ui/dialog/desktop-tracker.h b/src/ui/dialog/desktop-tracker.h
index 0c8af66bf..c219e8d98 100644
--- a/src/ui/dialog/desktop-tracker.h
+++ b/src/ui/dialog/desktop-tracker.h
@@ -16,7 +16,7 @@ class SPDesktop;
 
 namespace Inkscape {
 
-class Application;
+struct Application;
 
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/dialog.h b/src/ui/dialog/dialog.h
index 025e9eb58..ec5d203bc 100644
--- a/src/ui/dialog/dialog.h
+++ b/src/ui/dialog/dialog.h
@@ -21,7 +21,7 @@ class SPDesktop;
 
 namespace Inkscape {
 class Selection;
-class Application;
+struct Application;
 }
 
 namespace Inkscape {
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 603786742..66c9e6ed0 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -22,14 +22,21 @@
 
 #include <gtkmm/box.h>
 #include <gtkmm/buttonbox.h>
-#include <gtkmm/label.h>
-#include <gtkmm/widget.h>
-#include <gtkmm/togglebutton.h>
+#include <gtkmm/dialog.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/image.h>
-#include <gtkmm/stockid.h>
+#include <gtkmm/label.h>
+#include <gtkmm/spinbutton.h>
 #include <gtkmm/stock.h>
-#include <gtkmm/table.h>
+#include <gtkmm/stockid.h>
+#if WITH_GTKMM_3_0
+# include <gtkmm/grid.h>
+#else
+# include <gtkmm/table.h>
+#endif
+#include <gtkmm/togglebutton.h>
+#include <gtkmm/widget.h>
+
 #ifdef WITH_GNOME_VFS
 # include <libgnomevfs/gnome-vfs-init.h>  // gnome_vfs_initialized
 #endif
diff --git a/src/ui/dialog/export.h b/src/ui/dialog/export.h
index 5dca9cfa5..202443a78 100644
--- a/src/ui/dialog/export.h
+++ b/src/ui/dialog/export.h
@@ -14,10 +14,12 @@
 
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
+
+#include <gtkmm/comboboxtext.h>
 #include <gtkmm/expander.h>
 #include <gtkmm/frame.h>
+#include <gtkmm/progressbar.h>
 #include <gtkmm/textview.h>
-#include <gtkmm/comboboxtext.h>
 
 #include "desktop.h"
 #include "ui/dialog/desktop-tracker.h"
@@ -25,6 +27,10 @@
 #include "ui/widget/button.h"
 #include "ui/widget/entry.h"
 
+namespace Gtk {
+class Dialog;
+}
+
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp
index 8de2da18b..19b873d54 100644
--- a/src/ui/dialog/fill-and-stroke.cpp
+++ b/src/ui/dialog/fill-and-stroke.cpp
@@ -132,14 +132,24 @@ void
 FillAndStroke::_layoutPageFill()
 {
     fillWdgt = manage(sp_fill_style_widget_new());
+
+#if WITH_GTKMM_3_0
     _page_fill->table().attach(*fillWdgt, 0, 0, 1, 1);
+#else
+    _page_fill->table().attach(*fillWdgt, 0, 1, 0, 1);
+#endif
 }
 
 void
 FillAndStroke::_layoutPageStrokePaint()
 {
     strokeWdgt = manage(sp_stroke_style_paint_widget_new());
+
+#if WITH_GTKMM_3_0
     _page_stroke_paint->table().attach(*strokeWdgt, 0, 0, 1, 1);
+#else
+    _page_stroke_paint->table().attach(*strokeWdgt, 0, 1, 0, 1);
+#endif
 }
 
 void
@@ -148,7 +158,12 @@ FillAndStroke::_layoutPageStrokeStyle()
     //Gtk::Widget *strokeStyleWdgt = manage(Glib::wrap(sp_stroke_style_line_widget_new()));
     //Gtk::Widget *strokeStyleWdgt = static_cast<Gtk::Widget *>(sp_stroke_style_line_widget_new());
     strokeStyleWdgt = sp_stroke_style_line_widget_new();
+
+#if WITH_GTKMM_3_0
     _page_stroke_style->table().attach(*strokeStyleWdgt, 0, 0, 1, 1);
+#else
+    _page_stroke_style->table().attach(*strokeStyleWdgt, 0, 1, 0, 1);
+#endif
 }
 
 void
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index d3ce99b00..def7b5bdb 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -15,7 +15,10 @@
 #endif
 
 #include "find.h"
+
+#include <gtkmm/entry.h>
 #include <gtkmm/widget.h>
+
 #include "verbs.h"
 
 #include "message-stack.h"
@@ -56,6 +59,7 @@
 #include "xml/attribute-record.h"
 
 #include <glibmm/i18n.h>
+#include <glibmm/regex.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/find.h b/src/ui/dialog/find.h
index 77a6c9d02..14d54b8d4 100644
--- a/src/ui/dialog/find.h
+++ b/src/ui/dialog/find.h
@@ -21,7 +21,11 @@
 #include "ui/widget/entry.h" 
 #include "ui/widget/frame.h"
 #include <glib.h>
-#include <gtkmm.h>
+
+#include <gtkmm/box.h>
+#include <gtkmm/buttonbox.h>
+#include <gtkmm/expander.h>
+#include <gtkmm/label.h>
 
 #include "desktop.h"
 #include "ui/dialog/desktop-tracker.h"
diff --git a/src/ui/dialog/glyphs.h b/src/ui/dialog/glyphs.h
index 6571af0a4..3d0571244 100644
--- a/src/ui/dialog/glyphs.h
+++ b/src/ui/dialog/glyphs.h
@@ -20,7 +20,7 @@ class Label;
 class ListStore;
 }
 
-class SPFontSelector;
+struct SPFontSelector;
 class font_instance;
 
 
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index de213ca85..801ab2922 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -20,7 +20,11 @@
 #include <gtkmm/buttonbox.h>
 #include <boost/scoped_ptr.hpp>
 #include <glib.h>
+
 #include <glibmm/i18n.h>
+#include <glibmm/main.h>
+#include <glibmm/timer.h>
+
 #include <gtkmm/alignment.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/frame.h>
diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp
index 9c9f7faa3..82e65435d 100644
--- a/src/ui/dialog/input.cpp
+++ b/src/ui/dialog/input.cpp
@@ -17,7 +17,9 @@
 
 #include <glib/gprintf.h>
 #include <glibmm/i18n.h>
+
 #include <gtkmm/alignment.h>
+#include <gtkmm/buttonbox.h>
 #include <gtkmm/cellrenderercombo.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/comboboxtext.h>
diff --git a/src/ui/dialog/layer-properties.h b/src/ui/dialog/layer-properties.h
index 9de303f89..0e2f8ed94 100644
--- a/src/ui/dialog/layer-properties.h
+++ b/src/ui/dialog/layer-properties.h
@@ -80,9 +80,9 @@ protected:
         void perform(LayerPropertiesDialog &dialog);
     };
 
-    friend class Rename;
-    friend class Create;
-    friend class Move;
+    friend struct Rename;
+    friend struct Create;
+    friend struct Move;
 
     Strategy *_strategy;
     SPDesktop *_desktop;
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index 7ecb6d5cd..e6bb9b43d 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -48,8 +48,6 @@
 #include "livepatheffect-add.h"
 
 namespace Inkscape {
-class Application;
-
 namespace UI {
 namespace Dialog {
 
diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp
index 114204961..8a2b0299a 100644
--- a/src/ui/dialog/object-properties.cpp
+++ b/src/ui/dialog/object-properties.cpp
@@ -38,6 +38,12 @@
 #include "sp-item.h"
 #include <glibmm/i18n.h>
 
+#if WITH_GTKMM_3_0
+# include <gtkmm/grid.h>
+#else
+# include <gtkmm/table.h>
+#endif
+
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/object-properties.h b/src/ui/dialog/object-properties.h
index b49293ea1..624a18246 100644
--- a/src/ui/dialog/object-properties.h
+++ b/src/ui/dialog/object-properties.h
@@ -35,6 +35,8 @@
 
 #include "ui/widget/panel.h"
 #include "ui/widget/frame.h"
+
+#include <gtkmm/checkbutton.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/expander.h>
 #include <gtkmm/frame.h>
@@ -46,6 +48,14 @@ class SPAttributeTable;
 class SPDesktop;
 class SPItem;
 
+namespace Gtk {
+#if WITH_GTKMM_3_0
+class Grid;
+#else
+class Table;
+#endif
+}
+
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/svg-fonts-dialog.h b/src/ui/dialog/svg-fonts-dialog.h
index 9be984820..01f70654a 100644
--- a/src/ui/dialog/svg-fonts-dialog.h
+++ b/src/ui/dialog/svg-fonts-dialog.h
@@ -34,8 +34,8 @@ class HScale;
 #endif
 }
 
-class SPGlyph;
-class SPGlyphKerning;
+struct SPGlyph;
+struct SPGlyphKerning;
 class SvgFont;
 
 class SvgFontDrawingArea : Gtk::DrawingArea{
diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp
index a71227861..67c6578f9 100644
--- a/src/ui/dialog/text-edit.cpp
+++ b/src/ui/dialog/text-edit.cpp
@@ -57,6 +57,7 @@ extern "C" {
 #include "widgets/icon.h"
 #include "widgets/font-selector.h"
 #include <glibmm/i18n.h>
+#include <glibmm/markup.h>
 #include "unit-constants.h"
 
 
diff --git a/src/ui/dialog/text-edit.h b/src/ui/dialog/text-edit.h
index 3fdeea05d..f27fdfc87 100644
--- a/src/ui/dialog/text-edit.h
+++ b/src/ui/dialog/text-edit.h
@@ -30,7 +30,7 @@
 #include "ui/dialog/desktop-tracker.h"
 
 class SPItem;
-class SPFontSelector;
+struct SPFontSelector;
 class font_instance;
 class SPCSSAttr;
 
diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp
index 1ad827a56..bd467555e 100644
--- a/src/ui/dialog/tracedialog.cpp
+++ b/src/ui/dialog/tracedialog.cpp
@@ -20,6 +20,7 @@
 #include <gtkmm/frame.h>
 #include "ui/widget/spinbutton.h"
 #include "ui/widget/frame.h"
+#include <gtkmm/radiobutton.h>
 #include <gtkmm/stock.h>
 
 #include <gtk/gtk.h> //for GTK_RESPONSE* types
diff --git a/src/ui/dialog/xml-tree.h b/src/ui/dialog/xml-tree.h
index 9d2fac71f..58ef3aef8 100644
--- a/src/ui/dialog/xml-tree.h
+++ b/src/ui/dialog/xml-tree.h
@@ -28,8 +28,8 @@
 #include "ui/dialog/desktop-tracker.h"
 #include "message.h"
 
-struct SPDesktop;
-struct SPObject;
+class SPDesktop;
+class SPObject;
 struct SPXMLViewAttrList;
 struct SPXMLViewContent;
 struct SPXMLViewTree;