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 30f3f06dfe4fa880da351b0c2a12c5f9b80c5a9a..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),
@@ -194,16 +194,16 @@ void LyXGUI::init()
 
        create_forms();
 
-       if (lyxrc.font_norm_menu.empty())
-               lyxrc.font_norm_menu = lyxrc.font_norm;
+       if (lyxrc.popup_font_encoding.empty())
+               lyxrc.popup_font_encoding = lyxrc.font_norm;
        // Set the font name for popups and menus
-        string boldfontname = lyxrc.menu_font_name 
+        string boldfontname = lyxrc.popup_bold_font
                               + "-*-*-*-?-*-*-*-*-"  
-                              + lyxrc.font_norm_menu;
+                              + lyxrc.popup_font_encoding;
                // "?" means "scale that font"
-        string fontname = lyxrc.popup_font_name 
+        string fontname = lyxrc.popup_normal_font 
                               + "-*-*-*-?-*-*-*-*-"  
-                              + lyxrc.font_norm_menu;
+                              + lyxrc.popup_font_encoding;
 
        int bold = fl_set_font_name(FL_BOLD_STYLE, boldfontname.c_str());
        int normal = fl_set_font_name(FL_NORMAL_STYLE, fontname.c_str());
@@ -237,10 +237,15 @@ void LyXGUI::init()
        // in setDefaults() (Matthias 140496)
        // Moved from ::LyXGUI to ::init to allow popup font customization 
        // (petr 120997).
-       fl_setpup_fontstyle(FL_BOLD_STYLE);
+       fl_setpup_fontstyle(FL_NORMAL_STYLE);
        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;