X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fce04ebed510a97e17f019a35c327dce78b6d916..59f9f67261d0e6018293871d00cbd12572fbb4c7:/lib/gui/einput.cpp diff --git a/lib/gui/einput.cpp b/lib/gui/einput.cpp index 62a77c5d..5cde53bb 100644 --- a/lib/gui/einput.cpp +++ b/lib/gui/einput.cpp @@ -55,7 +55,7 @@ int eInput::event(int event, void *data, void *data2) eDebug("cursor is %d", cursor); para->setFont(m_font); - para->renderString(text, 0); + para->renderString(text.empty()?0:text.c_str(), 0); int glyphs = para->size(); if (m_have_focus) @@ -94,9 +94,9 @@ int eInput::event(int event, void *data, void *data2) case evtAction: if (isVisible()) { - if ((int)data == ASCII_ACTIONS) + if ((long)data == ASCII_ACTIONS) { - if ((int)data2 == gotAsciiCode) + if ((long)data2 == gotAsciiCode) { if (m_content) { @@ -105,9 +105,9 @@ int eInput::event(int event, void *data, void *data2) } } } - else if ((int)data == INPUT_ACTIONS) + else if ((long)data == INPUT_ACTIONS) { - switch((int)data2) + switch((long)data2) { case moveLeft: if (m_content) @@ -146,8 +146,8 @@ int eInput::event(int event, void *data, void *data2) return 0; case evtKey: { - int key = (int)data; - int flags = (int)data2; + long key = (long)data; + long flags = (long)data2; if (m_content && !(flags & 1)) // only make/repeat, no break return m_content->haveKey(key, m_mode); break;