Skip to content

Y
ygopro
Commit c68e81a3 authored by salix5's avatar salix5
Browse files
Options

CGUITTFont: call final virtual function in constructor

parent 1e1b0da8
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 7 deletions
gframe/CGUITTFont.cpp
View file @ c68e81a3
...@@ -809,11 +809,6 @@ core::vector2di CGUITTFont::getKerning(const uchar32_t thisLetter, const uchar32 ...@@ -809,11 +809,6 @@ core::vector2di CGUITTFont::getKerning(const uchar32_t thisLetter, const uchar32
} }
void CGUITTFont::setInvisibleCharacters(const wchar_t *s) { void CGUITTFont::setInvisibleCharacters(const wchar_t *s) {
core::ustring us(s);
Invisible = us;
}
void CGUITTFont::setInvisibleCharacters(const core::ustring& s) {
Invisible = s; Invisible = s;
} }
......
gframe/CGUITTFont.h
View file @ c68e81a3
...@@ -295,8 +295,7 @@ public: ...@@ -295,8 +295,7 @@ public:
s32 getKerningHeight() const override; s32 getKerningHeight() const override;
//! Define which characters should not be drawn by the font. //! Define which characters should not be drawn by the font.
void setInvisibleCharacters(const wchar_t *s) override; void setInvisibleCharacters(const wchar_t *s) final;
void setInvisibleCharacters(const core::ustring& s);
//! Get the last glyph page if there's still available slots. //! Get the last glyph page if there's still available slots.
//! If not, it will return zero. //! If not, it will return zero.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment