diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2017-10-10 19:30:18 +0200 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2017-10-10 19:30:18 +0200 |
| commit | 1ff5c204425401c83a8a4c662795be64c5a3c1df (patch) | |
| tree | bf23ff0fdbf52274b75f9ed0358403d36a7338a9 | |
| parent | 32ae4926578844eac1a7b72fcd4e26eb854eb7e5 (diff) | |
| download | minetest-1ff5c204425401c83a8a4c662795be64c5a3c1df.tar.gz minetest-1ff5c204425401c83a8a4c662795be64c5a3c1df.tar.bz2 minetest-1ff5c204425401c83a8a4c662795be64c5a3c1df.zip | |
Fix warnings introduced by 9b8fa99fe30728c1fcfa73cdf74211841bdae9fb
| -rw-r--r-- | src/guiEditBoxWithScrollbar.cpp | 10 | ||||
| -rw-r--r-- | src/intlGUIEditBox.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/guiEditBoxWithScrollbar.cpp b/src/guiEditBoxWithScrollbar.cpp index a27a772b9..d4d2a0c1c 100644 --- a/src/guiEditBoxWithScrollbar.cpp +++ b/src/guiEditBoxWithScrollbar.cpp @@ -131,7 +131,7 @@ video::SColor GUIEditBoxWithScrollBar::getOverrideColor() const //! Turns the border on or off void GUIEditBoxWithScrollBar::setDrawBorder(bool border) { - border = border; + m_border = border; } //! Sets whether to draw the background @@ -257,7 +257,7 @@ bool GUIEditBoxWithScrollBar::processKey(const SEvent& event) if (!m_writable) { return false; } - + if (!event.KeyInput.PressedDown) return false; @@ -791,7 +791,7 @@ void GUIEditBoxWithScrollBar::draw() } else { mend = font->getDimension(txt_line->c_str()).Width; } - + m_current_text_rect.UpperLeftCorner.X += mbegin; m_current_text_rect.LowerRightCorner.X = m_current_text_rect.UpperLeftCorner.X + mend - mbegin; @@ -1041,7 +1041,7 @@ void GUIEditBoxWithScrollBar::breakText() bool line_break = false; if (c == L'\r') { // Mac or Windows breaks - + line_break = true; c = 0; if (Text[i + 1] == L'\n') { // Windows breaks @@ -1433,7 +1433,7 @@ void GUIEditBoxWithScrollBar::updateVScrollBar() } // check if a vertical scrollbar is needed ? - if (getTextDimension().Height > m_frame_rect.getHeight()) { + if (getTextDimension().Height > (u32) m_frame_rect.getHeight()) { m_frame_rect.LowerRightCorner.X -= m_scrollbar_width; s32 scrollymax = getTextDimension().Height - m_frame_rect.getHeight(); diff --git a/src/intlGUIEditBox.cpp b/src/intlGUIEditBox.cpp index ab470c4fc..279e7a48a 100644 --- a/src/intlGUIEditBox.cpp +++ b/src/intlGUIEditBox.cpp @@ -1517,7 +1517,7 @@ void intlGUIEditBox::updateVScrollBar() } // check if a vertical scrollbar is needed ? - if (getTextDimension().Height > FrameRect.getHeight()) { + if (getTextDimension().Height > (u32) FrameRect.getHeight()) { s32 scrollymax = getTextDimension().Height - FrameRect.getHeight(); if (scrollymax != m_vscrollbar->getMax()) { m_vscrollbar->setMax(scrollymax); |