diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2018-01-12 08:36:38 +0100 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2018-01-12 08:36:38 +0100 |
| commit | 6f2fe8a554f01b5697112c8875e02ef52b1ef69e (patch) | |
| tree | 2f060037471698f671fe510814ae90f23dbacd90 | |
| parent | 62872dabac6d75dea4317523e7d7e01efcb6e942 (diff) | |
| download | minetest-6f2fe8a554f01b5697112c8875e02ef52b1ef69e.tar.gz minetest-6f2fe8a554f01b5697112c8875e02ef52b1ef69e.tar.bz2 minetest-6f2fe8a554f01b5697112c8875e02ef52b1ef69e.zip | |
Forget to fix non freetype build in StaticText
| -rw-r--r-- | src/irrlicht_changes/static_text.h | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/irrlicht_changes/static_text.h b/src/irrlicht_changes/static_text.h index c95d5b95f..3e8d07c85 100644 --- a/src/irrlicht_changes/static_text.h +++ b/src/irrlicht_changes/static_text.h @@ -239,7 +239,15 @@ inline void setStaticText(irr::gui::IGUIStaticText *static_text, const EnrichedS #else // USE_FREETYPE -inline irr::gui::IGUIStaticText *addStaticText( +namespace irr +{ +namespace gui +{ + +class StaticText +{ +public: + static irr::gui::IGUIStaticText *add( irr::gui::IGUIEnvironment *guienv, const EnrichedString &text, const core::rect< s32 > &rectangle, @@ -248,9 +256,14 @@ inline irr::gui::IGUIStaticText *addStaticText( irr::gui::IGUIElement *parent = NULL, s32 id = -1, bool fillBackground = false) -{ - return guienv->addStaticText(text.c_str(), rectangle, border, wordWrap, parent, id, fillBackground); -} + { + return guienv->addStaticText(text.c_str(), rectangle, border, wordWrap, parent, id, fillBackground); + } +}; + +} // end namespace gui + +} // end namespace irr inline void setStaticText(irr::gui::IGUIStaticText *static_text, const EnrichedString &text) { |