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 87a41cceb8eab9cdd5dfae1290638e27e9f79027..ddff923cc32a444315ea5371ce0752dbb980bb91 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -35,13 +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/xform_helpers.h" // for XformColor
 
 using std::endl;
 
@@ -58,6 +59,7 @@ extern LyXServer * lyxserver;
 extern bool finished;  // flag, that we are quitting the program
 extern BufferList bufferlist;
 extern GUIRunTime guiruntime;
+extern string user_lyxdir;
 
 FL_CMD_OPT cmdopt[] =
 {
@@ -131,14 +133,14 @@ LyXGUI::LyXGUI(LyX * owner, int * argc, char * argv[], bool GUI)
        if (height < 400) height = 400;
        
        // If width is not set by geometry, check it against monitor width
-       if ( !(geometryBitmask & 4) ) {
+       if (!(geometryBitmask & 4)) {
                Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen); //DefaultScreen(fl_get_display());
                if (WidthOfScreen(scr) - 8 < width)
                        width = WidthOfScreen(scr) - 8;
        }
 
        // If height is not set by geometry, check it against monitor height
-       if ( !(geometryBitmask & 8) ) {
+       if (!(geometryBitmask & 8)) {
                Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen); //DefaultScreen(fl_get_display());
                if (HeightOfScreen(scr) - 24 < height)
                        height = HeightOfScreen(scr) - 24;
@@ -165,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
 }
@@ -340,7 +342,7 @@ void LyXGUI::create_forms()
        // build up the combox entries
        combo_language2->addline(_("No change"));
        combo_language2->addline(_("Reset"));
-       for(Languages::const_iterator cit = languages.begin();
+       for (Languages::const_iterator cit = languages.begin();
            cit != languages.end(); ++cit) {
 #ifdef DO_USE_DEFAULT_LANGUAGE
            if ((*cit).second.lang() != "default")
@@ -368,6 +370,13 @@ void LyXGUI::create_forms()
        fl_set_form_atclose(fd_latex_log->LaTeXLog,
                            CancelCloseBoxCB, 0);
 
+       // This is probably as good a time as any to map the xform colours,
+       // should a mapping exist.
+       {
+               string filename = AddName(user_lyxdir, "preferences.xform");
+               XformColor::read( filename );
+       }
+       
        // Show the main & title form
        int main_placement = FL_PLACE_CENTER | FL_FREE_SIZE;
        int title_placement = FL_PLACE_CENTER;