John's Layout Tabular UI improvements and Martins fixes to clearing the

[lyx.git] / src / FontLoader.h

diff --git a/src/FontLoader.h b/src/FontLoader.h
index 83169d0d4a3486e019adc3dd89a53a99f5898102..66e1676068c11b54cb620892b4e68bd305bddf34 100644 (file)
--- a/src/FontLoader.h
+++ b/src/FontLoader.h
@@ -16,10 +16,7 @@
 #pragma interface
 #endif
 
-#define USE_PAINTER 1
-
-
-#include FORMS_H_LOCATION
+#include <X11/Xlib.h>
 #include "lyxfont.h"
 #include "LString.h"
 
@@ -51,12 +48,15 @@ public:
                else
                        return doLoad(family, series, shape, size);
        };
+       /// Do we have anything matching?
+       bool available(LyXFont const & f);
+       
 private:
        /// Array of font structs
-       XFontStruct * fontstruct[4][2][4][10];
+       XFontStruct * fontstruct[LyXFont::NUM_FAMILIES][2][4][10];
 
        /// Array of font infos
-       FontInfo * fontinfo[4][2][4];
+       FontInfo * fontinfo[LyXFont::NUM_FAMILIES][2][4];
 
        /// Reset font handler
        void reset();
@@ -75,4 +75,8 @@ private:
                             LyXFont::FONT_SHAPE shape, 
                             LyXFont::FONT_SIZE size);
 };
+
+///
+extern FontLoader fontloader;
+
 #endif