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 2cae7938db17f0f892c18f35896030cc78a2c15a..708fb99ee5b8b2b072789933fbe296131fedf603 100644 (file)
--- a/src/kbsequence.C
+++ b/src/kbsequence.C
@@ -22,6 +22,7 @@
 #include "frontends/LyXKeySymFactory.h"
 
 using std::make_pair;
+using std::string;
 
 
 FuncRequest const &
@@ -136,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) {
@@ -156,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;
 }