diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-05-07 20:02:54 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-05-07 20:02:54 -0300 |
| commit | c99813dc38cc79b37529cdd98dc2bc2c3ff69edc (patch) | |
| tree | 99ea11d3829bf296ea23941a83ebc61158028087 /scene/gui | |
| parent | 7156aff16041ea56ff1f3aea2a622c130bcca7a9 (diff) | |
| parent | ac9263c680076eed36887a681cb59fdcce6c6f73 (diff) | |
Merge pull request #1826 from eehrich/master
Reviewed compiler warnings: fixed some bugs and formal stuff. (2nd try)
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/label.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/line_edit.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/text_edit.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index 1751d335ee..dac21275dc 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -433,7 +433,7 @@ void Label::regenerate_word_cache() { } - if ((autowrap && line_width>=width && (last && last->char_pos >= 0 || not_latin)) || insert_newline) { + if ((autowrap && (line_width >= width) && ((last && last->char_pos >= 0) || not_latin)) || insert_newline) { if (not_latin) { if (current_word_size>0) { WordCache *wc = memnew( WordCache ); diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index 14aa3da85f..fec9e401f1 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -272,7 +272,7 @@ void LineEdit::_input_event(InputEvent p_event) { if (editable) { selection_delete(); - CharType ucodestr[2]={k.unicode,0}; + CharType ucodestr[2]={(CharType)k.unicode,0}; append_at_cursor(ucodestr); emit_signal("text_changed",text); _change_notify("text"); diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 681c33652e..db8fbf7a63 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -1440,7 +1440,7 @@ void TextEdit::_input_event(const InputEvent& p_input_event) { } else { //different char, go back - const CharType chr[2] = {k.unicode, 0}; + const CharType chr[2] = {(CharType)k.unicode, 0}; if(auto_brace_completion_enabled && _is_pair_symbol(chr[0])) { _consume_pair_symbol(chr[0]); } else { @@ -2062,7 +2062,7 @@ void TextEdit::_input_event(const InputEvent& p_input_event) { if (readonly) break; - const CharType chr[2] = {k.unicode, 0}; + const CharType chr[2] = {(CharType)k.unicode, 0}; if(auto_brace_completion_enabled && _is_pair_symbol(chr[0])) { _consume_pair_symbol(chr[0]); |