make fontcache globally available

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index e914bce096ee9010b790f556c241eb7a518cabe0..9770d0d08727eb69d5a144e84a799baa5c36e6da 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -28,6 +28,8 @@
 #include <simgear/structure/commands.hxx>
 #include <simgear/misc/sg_path.hxx>
 
+#include <GUI/new_gui.hxx>
+
 #include "globals.hxx"
 #include "renderer.hxx"
 #include "viewmgr.hxx"
@@ -80,6 +82,7 @@ FGGlobals::FGGlobals() :
     scenery( NULL ),
     tile_mgr( NULL ),
     io( new FGIO ),
+    fontcache ( new FGFontCache ),
     navlist( NULL ),
     loclist( NULL ),
     gslist( NULL ),
@@ -102,6 +105,7 @@ FGGlobals::~FGGlobals()
     delete props;
     delete commands;
     delete io;
+    delete fontcache;
     delete renderer;
     delete initial_waypoints;
 }

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index cc8f280fb72fb1a7778161caa9fa08263046e6b2..e1cef63dde81515b605e0647c7568d3ab42e7624 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -85,6 +85,7 @@ class FGTileMgr;
 class FGViewMgr;
 class FGViewer;
 class FGRenderer;
+class FGFontCache;
 
 
 /**
@@ -197,6 +198,8 @@ private:
     // Input/Ouput subsystem
     FGIO *io;
 
+    FGFontCache *fontcache;
+
     // Navigational Aids
     FGNavList *navlist;
     FGNavList *loclist;
@@ -350,6 +353,7 @@ public:
     inline void set_tile_mgr ( FGTileMgr *t ) { tile_mgr = t; }
 
     inline FGIO* get_io() const { return io; }
+    inline FGFontCache *get_fontcache() const { return fontcache; }
     
     inline FGNavList *get_navlist() const { return navlist; }
     inline void set_navlist( FGNavList *n ) { navlist = n; }