small changes to ButtonController usage

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 94a287c9ae4bd040c07e098f98a6f664047dd2e2..c359d127f85d778c13fbf293c93d8ad0251cf28d 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -316,7 +316,7 @@ int LyXFunc::processKeySym(KeySym keysym, unsigned int state)
 } 
 
 
-#if FL_REVISION < 89
+#if 0
 int LyXFunc::processKeyEvent(XEvent * ev)
 {
        char s_r[10];
@@ -620,7 +620,13 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
 
        if (buf) {
                func_status box = LyXFunc::ToggleOff;
-               LyXFont font = owner->view()->text->real_current_font;
+               LyXFont font;
+               if (owner->view()->the_locking_inset &&
+                   owner->view()->the_locking_inset->getLyXText(owner->view()))
+                   font = owner->view()->the_locking_inset->
+                       getLyXText(owner->view())->real_current_font;
+               else
+                   font = owner->view()->text->real_current_font;
                switch (action) {
                case LFUN_EMPH:
                        if (font.emph() == LyXFont::ON)