cleanups from John and Juergen, bib files parsing fix from Herbert

[lyx.git] / src / lyx_gui.C

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index 9bb2bf2b82eb95cb7495defce2e53ea5370e9902..21312bad5d878105fabfdc674cdd84bab1d82b04 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -88,7 +88,7 @@ int LyX_XErrHandler(Display * display, XErrorEvent * xeev)
        // Get the reason for the crash.
        char etxt[513];
        XGetErrorText(display, xeev->error_code, etxt, 512);
-       lyxerr << etxt << endl;
+       lyxerr << etxt << " id: " << xeev->resourceid << endl;
        // By doing an abort we get a nice backtrace. (hopefully)
        lyx::abort();
        return 0; // Solaris CC wants us to return something
@@ -115,7 +115,7 @@ LyXGUI::LyXGUI(LyX * owner, int * argc, char * argv[], bool GUI)
        fl_get_app_resources(res, num_res);
 
        static const int geometryBitmask =
-               XParseGeometry( geometry,
+               XParseGeometry(geometry,
                                &xpos,
                                &ypos,
                                reinterpret_cast<unsigned int *>(&width),
@@ -241,6 +241,11 @@ void LyXGUI::init()
        fl_setpup_fontsize(FL_NORMAL_SIZE);
        fl_setpup_color(FL_MCOL, FL_BLACK);
        fl_set_goodies_font(FL_NORMAL_STYLE, FL_NORMAL_SIZE);
+#if FL_REVISION < 89 
+       fl_set_oneliner_font(FL_NORMAL_STYLE, FL_NORMAL_SIZE);
+#else
+       fl_set_tooltip_font(FL_NORMAL_STYLE, FL_NORMAL_SIZE);
+#endif
 
         // all lyxrc settings has to be done here as lyxrc has not yet
         // been read when the GUI is created (Jug)
@@ -297,7 +302,7 @@ void LyXGUI::create_forms()
        // This is probably as good a time as any to map the xform colours,
        // should a mapping exist.
        string const filename = AddName(user_lyxdir, "preferences.xform");
-       XformsColor::read( filename );
+       XformsColor::read(filename);
        
        // Show the main & title form
        int main_placement = FL_PLACE_CENTER | FL_FREE_SIZE;