Fixed compilation when the new SVG font stuff is not enabled.

diff --git a/src/display/nr-arena-glyphs.cpp b/src/display/nr-arena-glyphs.cpp
index 63af4787adbf14cf14641f126cc8a61ddd7a413b..7ca6d9aa157fb2a42ca33aa6c41b04dff9705df9 100644 (file)
--- a/src/display/nr-arena-glyphs.cpp
+++ b/src/display/nr-arena-glyphs.cpp
@@ -37,7 +37,9 @@
 void nr_pixblock_render_shape_mask_or(NRPixBlock &m, Shape *theS);
 #endif
 
+#ifdef ENABLE_SVG_FONTS
 #include "nr-svgfonts.h"
+#endif //#ifdef ENABLE_SVG_FONTS
 
 static void nr_arena_glyphs_class_init(NRArenaGlyphsClass *klass);
 static void nr_arena_glyphs_init(NRArenaGlyphs *glyphs);

diff --git a/src/display/nr-svgfonts.h b/src/display/nr-svgfonts.h
index fc4a2b94e56baca1fd56d6011a399db989984df9..58840e414e729711d7256146837a9a339bdcc9c2 100644 (file)
--- a/src/display/nr-svgfonts.h
+++ b/src/display/nr-svgfonts.h
@@ -1,7 +1,6 @@
 #include "config.h"
-#ifdef ENABLE_SVG_FONTS
-#ifndef __SVGFONTS_H__
-#define __SVGFONTS_H__
+#ifndef NR_SVGFONTS_H_SEEN
+#define NR_SVGFONTS_H_SEEN
 /*
  * SVGFonts rendering headear
  *
@@ -14,7 +13,6 @@
  * Read the file 'COPYING' for more information.
  */
 
-#include "../sp-font.h"
 #include "cairo.h"
 #include <gtkmm.h>
 
@@ -29,6 +27,7 @@
 #include "../sp-glyph-kerning.h"
 
 class SvgFont;
+struct SPFont;
 
 class UserFont{
 public:
@@ -53,6 +52,4 @@ SPMissingGlyph* missingglyph;
 bool drawing_expose_cb (Gtk::Widget *widget, GdkEventExpose *event, gpointer data);
 };
 
-#endif //#ifndef __SVGFONTS_H__
-#endif //#ifdef ENABLE_SVG_FONTS
-
+#endif //#ifndef NR_SVGFONTS_H_SEEN

diff --git a/src/sp-font.cpp b/src/sp-font.cpp
index 8667af4cb264dcdf8e08503938355f6390d9bf0c..c99d5a1b66814da6e93812de1539702be92a1620 100644 (file)
--- a/src/sp-font.cpp
+++ b/src/sp-font.cpp
@@ -3,7 +3,6 @@
 #endif
 
 #ifdef ENABLE_SVG_FONTS
-#define __SP_FONT_C__
 
 /*
  * SVG <font> element implementation

diff --git a/src/sp-font.h b/src/sp-font.h
index 7f54e21a0615494fd4479dcd390ad05442e18896..fad7ead42bbdfb3568f549f3e7effd3237154c4f 100644 (file)
--- a/src/sp-font.h
+++ b/src/sp-font.h
@@ -2,9 +2,8 @@
 # include <config.h>
 #endif
 
-#ifdef ENABLE_SVG_FONTS
-#ifndef __SP_FONT_H__
-#define __SP_FONT_H__
+#ifndef SP_FONT_H_SEEN
+#define SP_FONT_H_SEEN
 
 /*
  * SVG <font> element implementation
@@ -35,10 +34,9 @@ struct SPFont : public SPObject {
 };
 
 struct SPFontClass {
-       SPObjectClass parent_class;
+    SPObjectClass parent_class;
 };
 
 GType sp_font_get_type (void);
 
-#endif //#ifndef __SP_FONT_H__
-#endif //#ifdef ENABLE_SVG_FONTS
+#endif //#ifndef SP_FONT_H_SEEN

diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index a2b839607e7fb2f81a08564ccef970e5189dcf13..0005de1478c37196594c2e4063d958cadb470ee5 100644 (file)
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -33,7 +33,9 @@
 #include "ui/dialog/memory.h"
 #include "ui/dialog/messages.h"
 #include "ui/dialog/scriptdialog.h"
+#ifdef ENABLE_SVG_FONTS
 #include "ui/dialog/svg-fonts-dialog.h"
+#endif // ENABLE_SVG_FONTS
 #include "ui/dialog/text-properties.h"
 #include "ui/dialog/tracedialog.h"
 #include "ui/dialog/transformation.h"

diff --git a/src/ui/dialog/svg-fonts-dialog.h b/src/ui/dialog/svg-fonts-dialog.h
index 5b5f5c02fe3986c7e0c29e5a141a40059593313b..415aa8f7ed5621fdbb1383bbeff97a2116da8528 100644 (file)
--- a/src/ui/dialog/svg-fonts-dialog.h
+++ b/src/ui/dialog/svg-fonts-dialog.h
@@ -24,7 +24,7 @@
 #include <gtkmm/entry.h>
 #include <gtkmm/box.h>
 
-using namespace Inkscape::UI::Widget;
+struct SPFont;
 
 namespace Inkscape {
 namespace UI {