Merge branch 'master' into master

1 files changed, 5 insertions, 6 deletions

diff --git a/src/gui/guiButtonItemImage.cpp b/src/gui/guiButtonItemImage.cpp
index bbd20582b..d8b9042ac 100644
--- a/src/gui/guiButtonItemImage.cpp
+++ b/src/gui/guiButtonItemImage.cpp
@@ -31,12 +31,11 @@ using namespace gui;
 GUIButtonItemImage::GUIButtonItemImage(gui::IGUIEnvironment *environment,
 		gui::IGUIElement *parent, s32 id, core::rect<s32> rectangle,
 		ISimpleTextureSource *tsrc, std::string item, Client *client,
-		bool noclip) :
-		GUIButton(environment, parent, id, rectangle, tsrc, noclip)
+		bool noclip)
+		: GUIButton (environment, parent, id, rectangle, tsrc, noclip)
 {
 	m_image = new GUIItemImage(environment, this, id,
-			core::rect<s32>(0, 0, rectangle.getWidth(),
-					rectangle.getHeight()),
+			core::rect<s32>(0,0,rectangle.getWidth(),rectangle.getHeight()),
 			item, getActiveFont(), client);
 	sendToBack(m_image);
 
@@ -50,8 +49,8 @@ GUIButtonItemImage *GUIButtonItemImage::addButton(IGUIEnvironment *environment,
 		Client *client)
 {
 	GUIButtonItemImage *button = new GUIButtonItemImage(environment,
-			parent ? parent : environment->getRootGUIElement(), id, rectangle,
-			tsrc, item, client);
+			parent ? parent : environment->getRootGUIElement(),
+			id, rectangle, tsrc, item, client);
 
 	if (text)
 		button->setText(text);