From ef951d8fabfa365f8ccc8510b912d904ac94a331 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 14 Mar 2013 01:33:10 +0000 Subject: Kill ancient gcc version check in configure.ac and fix a load of broken forward declarations (bzr r12203) --- src/ui/dialog/xml-tree.h | 2 +- src/ui/tool/path-manipulator.h | 2 +- src/ui/view/view-widget.h | 2 +- src/ui/widget/object-composite-settings.h | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/ui') diff --git a/src/ui/dialog/xml-tree.h b/src/ui/dialog/xml-tree.h index 9d2fac71f..0a6e3a786 100644 --- a/src/ui/dialog/xml-tree.h +++ b/src/ui/dialog/xml-tree.h @@ -28,7 +28,7 @@ #include "ui/dialog/desktop-tracker.h" #include "message.h" -struct SPDesktop; +class SPDesktop; struct SPObject; struct SPXMLViewAttrList; struct SPXMLViewContent; diff --git a/src/ui/tool/path-manipulator.h b/src/ui/tool/path-manipulator.h index a51b8c410..cb4f69b9a 100644 --- a/src/ui/tool/path-manipulator.h +++ b/src/ui/tool/path-manipulator.h @@ -21,7 +21,7 @@ #include "ui/tool/manipulator.h" struct SPCanvasItem; -struct SPCurve; +class SPCurve; struct SPPath; namespace Inkscape { diff --git a/src/ui/view/view-widget.h b/src/ui/view/view-widget.h index 668f9d19a..295e7932b 100644 --- a/src/ui/view/view-widget.h +++ b/src/ui/view/view-widget.h @@ -23,7 +23,7 @@ class View; } // namespace Inkscape class SPViewWidget; -class SPNamedView; +struct SPNamedView; #define SP_TYPE_VIEW_WIDGET (sp_view_widget_get_type ()) #define SP_VIEW_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_VIEW_WIDGET, SPViewWidget)) diff --git a/src/ui/widget/object-composite-settings.h b/src/ui/widget/object-composite-settings.h index d3a208525..c7c09a816 100644 --- a/src/ui/widget/object-composite-settings.h +++ b/src/ui/widget/object-composite-settings.h @@ -21,6 +21,8 @@ #include "ui/widget/filter-effect-chooser.h" #include "ui/widget/spinbutton.h" +class SPDesktop; + namespace Inkscape { class Application; -- cgit v1.2.3 From c2fc1ca64cb822e76211d145a2ebcd6ff62a66d2 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 14 Mar 2013 10:28:27 +0000 Subject: Fix another tonne of forward declaration tags (bzr r12204) --- src/ui/dialog/desktop-tracker.h | 2 +- src/ui/dialog/dialog.h | 2 +- src/ui/dialog/livepatheffect-editor.cpp | 2 -- src/ui/tool/control-point.h | 2 +- src/ui/widget/object-composite-settings.h | 2 +- src/ui/widget/style-subject.h | 2 +- src/ui/widget/style-swatch.h | 2 +- 7 files changed, 6 insertions(+), 8 deletions(-) (limited to 'src/ui') 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/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/tool/control-point.h b/src/ui/tool/control-point.h index 30efe8a27..27a0f8074 100644 --- a/src/ui/tool/control-point.h +++ b/src/ui/tool/control-point.h @@ -23,7 +23,7 @@ #include "enums.h" class SPDesktop; -class SPEventContext; +struct SPEventContext; namespace Inkscape { namespace UI { diff --git a/src/ui/widget/object-composite-settings.h b/src/ui/widget/object-composite-settings.h index c7c09a816..bee9f09b9 100644 --- a/src/ui/widget/object-composite-settings.h +++ b/src/ui/widget/object-composite-settings.h @@ -24,7 +24,7 @@ class SPDesktop; namespace Inkscape { -class Application; +struct Application; namespace UI { namespace Widget { diff --git a/src/ui/widget/style-subject.h b/src/ui/widget/style-subject.h index 47da91732..c2941d995 100644 --- a/src/ui/widget/style-subject.h +++ b/src/ui/widget/style-subject.h @@ -20,7 +20,7 @@ class SPDesktop; class SPObject; class SPCSSAttr; -class SPStyle; +struct SPStyle; namespace Inkscape { class Selection; diff --git a/src/ui/widget/style-swatch.h b/src/ui/widget/style-swatch.h index 7e385e3df..2b9c32b2e 100644 --- a/src/ui/widget/style-swatch.h +++ b/src/ui/widget/style-swatch.h @@ -27,7 +27,7 @@ #include "preferences.h" class SPUnit; -class SPStyle; +struct SPStyle; class SPCSSAttr; namespace Gtk { -- cgit v1.2.3 From 4c75974f2ac6bfe751e583fca37ffdd8b14ea84d Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 14 Mar 2013 23:24:17 +0000 Subject: Fix another load of forward declaration tags (bzr r12205) --- src/ui/dialog/layer-properties.h | 6 +++--- src/ui/dialog/xml-tree.h | 2 +- src/ui/tool/node-tool.h | 3 --- src/ui/widget/registered-widget.h | 2 +- src/ui/widget/selected-style.h | 2 +- src/ui/widget/style-swatch.h | 2 +- 6 files changed, 7 insertions(+), 10 deletions(-) (limited to 'src/ui') 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/xml-tree.h b/src/ui/dialog/xml-tree.h index 0a6e3a786..58ef3aef8 100644 --- a/src/ui/dialog/xml-tree.h +++ b/src/ui/dialog/xml-tree.h @@ -29,7 +29,7 @@ #include "message.h" class SPDesktop; -struct SPObject; +class SPObject; struct SPXMLViewAttrList; struct SPXMLViewContent; struct SPXMLViewTree; diff --git a/src/ui/tool/node-tool.h b/src/ui/tool/node-tool.h index 49b1496d4..bc5267bb2 100644 --- a/src/ui/tool/node-tool.h +++ b/src/ui/tool/node-tool.h @@ -25,9 +25,6 @@ #define INK_IS_NODE_TOOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INK_TYPE_NODE_TOOL)) #define INK_IS_NODE_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INK_TYPE_NODE_TOOL)) -class InkNodeTool; -class InkNodeToolClass; - namespace Inkscape { namespace Display { diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h index 2a7843a51..fa35b815e 100644 --- a/src/ui/widget/registered-widget.h +++ b/src/ui/widget/registered-widget.h @@ -32,7 +32,7 @@ #include -class SPUnit; +struct SPUnit; class SPDocument; namespace Gtk { diff --git a/src/ui/widget/selected-style.h b/src/ui/widget/selected-style.h index 6d5222429..9b78cb17f 100644 --- a/src/ui/widget/selected-style.h +++ b/src/ui/widget/selected-style.h @@ -40,7 +40,7 @@ #include "helper/units.h" class SPDesktop; -class SPUnit; +struct SPUnit; namespace Inkscape { namespace UI { diff --git a/src/ui/widget/style-swatch.h b/src/ui/widget/style-swatch.h index 2b9c32b2e..d7bab3732 100644 --- a/src/ui/widget/style-swatch.h +++ b/src/ui/widget/style-swatch.h @@ -26,7 +26,7 @@ #include "button.h" #include "preferences.h" -class SPUnit; +struct SPUnit; struct SPStyle; class SPCSSAttr; -- cgit v1.2.3 From 78b82d1a27484ccbfe5fe2d7e14a486b8275ac3a Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Fri, 15 Mar 2013 00:39:02 +0000 Subject: Fix even more forward declaration tags (bzr r12206) --- src/ui/dialog/export.cpp | 17 ++++++++++++----- src/ui/dialog/export.h | 8 +++++++- src/ui/dialog/find.cpp | 3 +++ src/ui/dialog/find.h | 6 +++++- src/ui/dialog/input.cpp | 2 ++ src/ui/dialog/object-properties.cpp | 6 ++++++ src/ui/dialog/object-properties.h | 8 ++++++++ src/ui/dialog/svg-fonts-dialog.h | 4 ++-- src/ui/tool/path-manipulator.h | 2 +- src/ui/widget/entry.cpp | 2 ++ src/ui/widget/entry.h | 6 +++--- src/ui/widget/frame.h | 8 +++----- 12 files changed, 54 insertions(+), 18 deletions(-) (limited to 'src/ui') 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 #include -#include -#include -#include +#include #include #include -#include +#include +#include #include -#include +#include +#if WITH_GTKMM_3_0 +# include +#else +# include +#endif +#include +#include + #ifdef WITH_GNOME_VFS # include // 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 #include + +#include #include #include +#include #include -#include #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/find.cpp b/src/ui/dialog/find.cpp index d3ce99b00..c2e521aa3 100644 --- a/src/ui/dialog/find.cpp +++ b/src/ui/dialog/find.cpp @@ -15,7 +15,10 @@ #endif #include "find.h" + +#include #include + #include "verbs.h" #include "message-stack.h" 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 -#include + +#include +#include +#include +#include #include "desktop.h" #include "ui/dialog/desktop-tracker.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 #include + #include +#include #include #include #include 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 +#if WITH_GTKMM_3_0 +# include +#else +# include +#endif + namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/object-properties.h b/src/ui/dialog/object-properties.h index b49293ea1..7e3775d30 100644 --- a/src/ui/dialog/object-properties.h +++ b/src/ui/dialog/object-properties.h @@ -46,6 +46,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/tool/path-manipulator.h b/src/ui/tool/path-manipulator.h index cb4f69b9a..1444272e8 100644 --- a/src/ui/tool/path-manipulator.h +++ b/src/ui/tool/path-manipulator.h @@ -22,7 +22,7 @@ struct SPCanvasItem; class SPCurve; -struct SPPath; +class SPPath; namespace Inkscape { namespace XML { class Node; } diff --git a/src/ui/widget/entry.cpp b/src/ui/widget/entry.cpp index 173e014d9..64d28119a 100644 --- a/src/ui/widget/entry.cpp +++ b/src/ui/widget/entry.cpp @@ -13,6 +13,8 @@ #include "entry.h" +#include + namespace Inkscape { namespace UI { namespace Widget { diff --git a/src/ui/widget/entry.h b/src/ui/widget/entry.h index 53b848fc9..de5cceadd 100644 --- a/src/ui/widget/entry.h +++ b/src/ui/widget/entry.h @@ -11,10 +11,10 @@ #define INKSCAPE_UI_WIDGET_ENTRY__H #include "labelled.h" -#include -#include -#include +namespace Gtk { +class Entry; +} namespace Inkscape { namespace UI { diff --git a/src/ui/widget/frame.h b/src/ui/widget/frame.h index cf736d8a1..a04666651 100644 --- a/src/ui/widget/frame.h +++ b/src/ui/widget/frame.h @@ -10,11 +10,9 @@ #ifndef INKSCAPE_UI_WIDGET_FRAME_H #define INKSCAPE_UI_WIDGET_FRAME_H -#include - -namespace Gtk { -class Frame; -} +#include +#include +#include namespace Inkscape { namespace UI { -- cgit v1.2.3 From 947e710daa96049ff0e825fcc6392de6b39ac124 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Fri, 15 Mar 2013 00:44:05 +0000 Subject: Fix table layout in fill and stroke dialog in Gtk+ 2 (bzr r12207) --- src/ui/dialog/fill-and-stroke.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/ui') 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(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 -- cgit v1.2.3 From be604f252f3f917a4b9fba73867980f81b3c8530 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Fri, 15 Mar 2013 01:08:49 +0000 Subject: Fix remaining forward declaration tags (except for unavoidable internal errors in Gtkmm headers) (bzr r12208) --- src/ui/dialog/glyphs.h | 2 +- src/ui/dialog/text-edit.h | 2 +- src/ui/tool/control-point.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/ui') 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/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/tool/control-point.cpp b/src/ui/tool/control-point.cpp index 8c4924f26..069dcc67b 100644 --- a/src/ui/tool/control-point.cpp +++ b/src/ui/tool/control-point.cpp @@ -7,8 +7,8 @@ */ #include +#include #include -#include #include <2geom/point.h> #include "desktop.h" #include "desktop-handles.h" -- cgit v1.2.3 From bbed1f9dd7d55af001daf43393b974fe85618672 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Fri, 15 Mar 2013 12:24:39 +0000 Subject: Fix missing Gtkmm/Glib headers for Gtk+ 3 build (bzr r12209) --- src/ui/dialog/find.cpp | 1 + src/ui/dialog/icon-preview.cpp | 4 ++++ src/ui/dialog/object-properties.h | 2 ++ src/ui/dialog/text-edit.cpp | 1 + src/ui/dialog/tracedialog.cpp | 1 + 5 files changed, 9 insertions(+) (limited to 'src/ui') diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp index c2e521aa3..def7b5bdb 100644 --- a/src/ui/dialog/find.cpp +++ b/src/ui/dialog/find.cpp @@ -59,6 +59,7 @@ #include "xml/attribute-record.h" #include +#include namespace Inkscape { namespace UI { 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 #include #include + #include +#include +#include + #include #include #include diff --git a/src/ui/dialog/object-properties.h b/src/ui/dialog/object-properties.h index 7e3775d30..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 #include #include #include 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 +#include #include "unit-constants.h" 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 #include "ui/widget/spinbutton.h" #include "ui/widget/frame.h" +#include #include #include //for GTK_RESPONSE* types -- cgit v1.2.3