sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps/graphics/nxwidgets: Fixes a few warnnigs.

Browse Source
This commit is contained in:
Gregory Nutt 2019-04-04 19:43:23 -06:00
parent dee7f14b49
commit c7da99d6a5
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/nxwidgets/src/cmultilinetextbox.cxx
View File

@ -1134,7 +1134,7 @@ bool CMultiLineTextBox::isCursorVisible(void) const
nxwidget_char_t CMultiLineTextBox::getCursorChar(void) const nxwidget_char_t CMultiLineTextBox::getCursorChar(void) const
{ {
if (m_cursorPos < m_text->getLength()) if (m_cursorPos < (int)m_text->getLength())
{ {
return m_text->getCharAt(m_cursorPos); return m_text->getCharAt(m_cursorPos);
} }

8
graphics/nxwidgets/src/cnxstring.cxx
View File

@ -76,9 +76,9 @@
#include <sys/types.h> #include <sys/types.h>
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <cstring>
#include <stdarg.h> #include <cstdarg>
#include <stdio.h> #include <cstdio>
#include "graphics/nxwidgets/cnxstring.hxx" #include "graphics/nxwidgets/cnxstring.hxx"
#include "graphics/nxwidgets/cstringiterator.hxx" #include "graphics/nxwidgets/cstringiterator.hxx"
@ -808,7 +808,7 @@ CNxString CNxString::format(const char *fmt, ...)
{ {
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
size_t len = vsnprintf(nullptr, 0, fmt, args) + 1; size_t len = std::vsnprintf((FAR char *)0, 0, fmt, args) + 1;
va_end(args); va_end(args);
va_start(args, fmt); va_start(args, fmt);

6
graphics/nxwidgets/src/ctextbox.cxx
View File

@ -306,7 +306,7 @@ void CTextBox::handleCursorControlEvent(const CWidgetEventArgs &e)
} }
else if (control == CURSOR_RIGHT) else if (control == CURSOR_RIGHT)
{ {
if (m_cursorPos < m_text.getLength()) if (m_cursorPos < (int)m_text.getLength())
{ {
moveCursorToPosition(m_cursorPos + 1); moveCursorToPosition(m_cursorPos + 1);
} }
@ -572,7 +572,7 @@ const nxgl_coord_t CTextBox::getCursorXPos(void) const
nxgl_coord_t CTextBox::getCursorWidth(void) const nxgl_coord_t CTextBox::getCursorWidth(void) const
{ {
if (m_cursorPos < m_text.getLength()) if (m_cursorPos < (int)m_text.getLength())
{ {
// Cursor within the string - get the width of the character // Cursor within the string - get the width of the character
@ -639,7 +639,7 @@ void CTextBox::calculateTextPositionHorizontal(void)
// Text is wider than box - view needs to follow the cursor // Text is wider than box - view needs to follow the cursor
// If cursor is at the end of the text, we can just right-align // If cursor is at the end of the text, we can just right-align
if (m_cursorPos == m_text.getLength()) if (m_cursorPos == (int)m_text.getLength())
{ {
m_align.x = width - stringWidth; m_align.x = width - stringWidth;
return; return;