BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Forget to fix non freetype build in StaticText

Browse Source
This commit is contained in:
Loic Blot 2018-01-12 08:36:38 +01:00
parent 62872dabac
commit 6f2fe8a554
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/irrlicht_changes/static_text.h
View File

@ -239,7 +239,15 @@ inline void setStaticText(irr::gui::IGUIStaticText *static_text, const EnrichedS
#else // USE_FREETYPE #else // USE_FREETYPE
inline irr::gui::IGUIStaticText *addStaticText( namespace irr
{
namespace gui
{
class StaticText
{
public:
static irr::gui::IGUIStaticText *add(
irr::gui::IGUIEnvironment *guienv, irr::gui::IGUIEnvironment *guienv,
const EnrichedString &text, const EnrichedString &text,
const core::rect< s32 > &rectangle, const core::rect< s32 > &rectangle,
@ -248,9 +256,14 @@ inline irr::gui::IGUIStaticText *addStaticText(
irr::gui::IGUIElement *parent = NULL, irr::gui::IGUIElement *parent = NULL,
s32 id = -1, s32 id = -1,
bool fillBackground = false) 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) inline void setStaticText(irr::gui::IGUIStaticText *static_text, const EnrichedString &text)
{ {