diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-06-13 15:45:13 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-13 15:45:13 -0300 |
| commit | 28034190a9757bc0cbfbf6b2f9582009776b1399 (patch) | |
| tree | 12037d44c40b34d859d3e474d5185b3a91419fa2 /scene/gui | |
| parent | 137464af870d4155d948c5956876936c54c8d6f4 (diff) | |
| parent | 378785656350fc1eacb523ca42307b651607fa6c (diff) | |
Merge pull request #5176 from marcelofg55/master
Fixed overloaded virtual functions with const vs none warning
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/split_container.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/split_container.h | 2 | ||||
| -rw-r--r-- | scene/gui/text_edit.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/text_edit.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/scene/gui/split_container.cpp b/scene/gui/split_container.cpp index d22f6a0229..6b36a60ea2 100644 --- a/scene/gui/split_container.cpp +++ b/scene/gui/split_container.cpp @@ -351,7 +351,7 @@ void SplitContainer::_input_event(const InputEvent& p_event) { } -Control::CursorShape SplitContainer::get_cursor_shape(const Point2& p_pos) { +Control::CursorShape SplitContainer::get_cursor_shape(const Point2& p_pos) const { if (collapsed) return Control::get_cursor_shape(p_pos); diff --git a/scene/gui/split_container.h b/scene/gui/split_container.h index f721d16310..d2dc42165e 100644 --- a/scene/gui/split_container.h +++ b/scene/gui/split_container.h @@ -75,7 +75,7 @@ public: void set_dragger_visibility(DraggerVisibility p_visibility); DraggerVisibility get_dragger_visibility() const; - virtual CursorShape get_cursor_shape(const Point2& p_pos=Point2i()); + virtual CursorShape get_cursor_shape(const Point2& p_pos=Point2i()) const; virtual Size2 get_minimum_size() const; diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 3e374ef888..3d3ef46465 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -2892,7 +2892,7 @@ int TextEdit::get_char_count() { return totalsize; // omit last \n } -Size2 TextEdit::get_minimum_size() { +Size2 TextEdit::get_minimum_size() const { return cache.style_normal->get_minimum_size(); } diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h index 24a72afd48..22f024c491 100644 --- a/scene/gui/text_edit.h +++ b/scene/gui/text_edit.h @@ -278,7 +278,7 @@ class TextEdit : public Control { void _scroll_lines_down(); // void mouse_motion(const Point& p_pos, const Point& p_rel, int p_button_mask); - Size2 get_minimum_size(); + Size2 get_minimum_size() const; int get_row_height() const; |