Fix fuer #209

[lyx.git] / src / lyx_gui.C

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index 80807e657f0fd55b708083908c7ae5f076e87dcc..50ebac4742f04aa117abf3ecc2a87a34e46ce975 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -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());
@@ -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)