Fixed icon loading, cacheing and fallback to use stock mechanisms.

[inkscape.git] / src / display / nr-svgfonts.h

diff --git a/src/display/nr-svgfonts.h b/src/display/nr-svgfonts.h
index a0cc56ccdd9630a65b8e33ee07c36999bd442725..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>
 
@@ -26,8 +24,10 @@
 #include "../sp-glyph.h"
 #include "../sp-missing-glyph.h"
 #include "../sp-font.h"
+#include "../sp-glyph-kerning.h"
 
 class SvgFont;
+struct SPFont;
 
 class UserFont{
 public:
@@ -52,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