More fixes to insettabular/text (and some missing features added).

[lyx.git] / src / lyx_gui.C

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index de20292b77e46a6430769de8343984ea538cf468..ddff923cc32a444315ea5371ce0752dbb980bb91 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -35,14 +35,14 @@
 #include "lyxrc.h"
 #include "gettext.h"
 #include "lyx_gui_misc.h"
-#if FL_REVISION < 89
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
 #include "lyxlookup.h"
 #endif
 #include "bufferlist.h"
 #include "language.h"
 #include "ColorHandler.h"
 #include "frontends/GUIRunTime.h"
-#include "frontends/xforms/Color.h"
+#include "frontends/xforms/xform_helpers.h" // for XformColor
 
 using std::endl;
 
@@ -167,7 +167,7 @@ LyXGUI::~LyXGUI()
        delete lyxserver;
        lyxserver = 0;
        delete lyxViews;
-#if FL_REVISION < 89
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
        CloseLyXLookup();
 #endif
 }
@@ -373,7 +373,7 @@ void LyXGUI::create_forms()
        // This is probably as good a time as any to map the xform colours,
        // should a mapping exist.
        {
-               string filename = user_lyxdir + "/preferences.xform";
+               string filename = AddName(user_lyxdir, "preferences.xform");
                XformColor::read( filename );
        }