cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / kbsequence.C

diff --git a/src/kbsequence.C b/src/kbsequence.C
index c8b236a917f51fad37ccbc6327b9daf1ee32b6fc..708fb99ee5b8b2b072789933fbe296131fedf603 100644 (file)
--- a/src/kbsequence.C
+++ b/src/kbsequence.C
@@ -12,20 +12,22 @@
 
 #include <config.h>
 
-#include "gettext.h"
-
-#include "frontends/mouse_state.h"
-#include "frontends/LyXKeySymFactory.h"
 #include "kbsequence.h"
+
+#include "gettext.h"
 #include "kbmap.h"
 #include "lfuns.h"
-#include "debug.h"
+
+#include "frontends/LyXKeySym.h"
+#include "frontends/LyXKeySymFactory.h"
 
 using std::make_pair;
+using std::string;
 
 
-int kb_sequence::addkey(LyXKeySymPtr key,
-                       key_modifier::state mod, key_modifier::state nmod)
+FuncRequest const &
+kb_sequence::addkey(LyXKeySymPtr key,
+                   key_modifier::state mod, key_modifier::state nmod)
 {
        // adding a key to a deleted sequence
        // starts a new sequence
@@ -42,7 +44,8 @@ int kb_sequence::addkey(LyXKeySymPtr key,
                return curmap->lookup(key, mod, this);
        }
 
-       return LFUN_UNKNOWN_ACTION;
+       static FuncRequest unknown(LFUN_UNKNOWN_ACTION);
+       return unknown;
 }
 
 
@@ -134,7 +137,7 @@ string const kb_sequence::print() const
        KeySequence::size_type i, length = sequence.size();
 
        for (i = 0; i < length; ++i) {
-               buf += kb_keymap::printKeysym(sequence[i], modifiers[i].first);
+               buf += sequence[i]->print(modifiers[i].first);
 
                // append a blank
                if (i + 1 < length) {
@@ -154,7 +157,7 @@ string const kb_sequence::printOptions() const
        if (!curmap)
                return buf;
 
-       buf += _("   options: ");
+       buf += lyx::to_utf8(_("   options: "));
        buf += curmap->print();
        return buf;
 }