Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 1002 vs 1003 for /trunk/Source Code/GUI/GUIText.cpp

Diff revisions: vs.
  @@ -5,15 +5,17 @@
5 5
6 6 namespace Divide {
7 7 GUIText::GUIText(U64 guiID,
8 + const stringImpl& name,
8 9 const stringImpl& text,
9 10 const RelativePosition2D& relativePosition,
10 11 const stringImpl& font,
11 12 const vec4<U8>& colour,
12 13 CEGUI::Window* parent,
13 14 U8 fontSize)
14 - : GUIElement(guiID, parent, GUIType::GUI_TEXT),
15 + : GUIElement(guiID, name, parent, GUIType::GUI_TEXT),
15 16 TextElement(TextLabelStyle(font.c_str(), colour, fontSize), relativePosition)
16 17 {
18 + this->text(text);
17 19 }
18 20
19 21 const RelativePosition2D& GUIText::getPosition() const {