diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:44:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:44:42 +0100 |
| commit | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (patch) | |
| tree | c980d614fec4a5495798be3e79e033229062c3cd /src/gui/guiItemImage.h | |
| parent | 28f6a79706b088c37268a59d90878220dc4ef9c7 (diff) | |
| parent | 3af10766fd2b58b068e970266724d7eb10e9316b (diff) | |
| download | dragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/gui/guiItemImage.h')
| -rw-r--r-- | src/gui/guiItemImage.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/gui/guiItemImage.h b/src/gui/guiItemImage.h index 6fede6564..ced693ee2 100644 --- a/src/gui/guiItemImage.h +++ b/src/gui/guiItemImage.h @@ -28,15 +28,12 @@ class GUIItemImage : public gui::IGUIElement { public: GUIItemImage(gui::IGUIEnvironment *env, gui::IGUIElement *parent, s32 id, - const core::rect<s32> &rectangle, const std::string &item_name, - gui::IGUIFont *font, Client *client); + const core::rect<s32> &rectangle, const std::string &item_name, + gui::IGUIFont *font, Client *client); virtual void draw() override; - virtual void setText(const wchar_t *text) override - { - m_label = text; - } + virtual void setText(const wchar_t *text) override { m_label = text; } private: std::string m_item_name; |