From 85c5fc06d49e8309d273873d31448688bd494d49 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 30 Aug 2013 22:53:47 +0300
Subject: fix code style and some minor issues.

---
 src/gui/npcdialog.cpp      | 2 ++
 src/gui/setup_input.cpp    | 3 +--
 src/gui/widgets/window.cpp | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 27a5dbf43..22cecebd2 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -336,6 +336,7 @@ void NpcDialog::action(const gcn::ActionEvent &event)
                         return;
                     printText = mTextField->getText();
                     Net::getNpcHandler()->stringInput(mNpcId, printText);
+                    break;
                 }
                 case NPC_INPUT_INTEGER:
                 {
@@ -344,6 +345,7 @@ void NpcDialog::action(const gcn::ActionEvent &event)
                     printText = strprintf("%d", mIntField->getValue());
                     Net::getNpcHandler()->integerInput(
                         mNpcId, mIntField->getValue());
+                    break;
                 }
                 case NPC_INPUT_ITEM:
                 {
diff --git a/src/gui/setup_input.cpp b/src/gui/setup_input.cpp
index d4d86ce61..0b0fd70de 100644
--- a/src/gui/setup_input.cpp
+++ b/src/gui/setup_input.cpp
@@ -104,6 +104,7 @@ Setup_Input::Setup_Input(const Widget2 *const widget) :
     // TRANSLATORS: button in input settings tab
     mResetKeysButton(new Button(this, _("Reset all keys"), "resetkeys", this)),
     mTabs(new TabStrip(this, config.getIntValue("fontSize") + 10)),
+    mScrollArea(new ScrollArea(mKeyList, true, "setup_input_background.xml")),
     mKeySetting(false),
     mActionDataSize(new int [9])
 {
@@ -125,8 +126,6 @@ Setup_Input::Setup_Input(const Widget2 *const widget) :
     refreshKeys();
     mKeyList->addActionListener(this);
 
-    mScrollArea = new ScrollArea(mKeyList,
-        true, "setup_input_background.xml");
     mScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     mAssignKeyButton->addActionListener(this);
     mAssignKeyButton->setEnabled(false);
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index a0683fa45..7d6174311 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -494,7 +494,8 @@ void Window::widgetResized(const gcn::Event &event A_UNUSED)
     }
     if (mSkin)
     {
-        const bool showClose = mCloseWindowButton && mSkin->getCloseImage(false);
+        const bool showClose = mCloseWindowButton
+            && mSkin->getCloseImage(false);
         const int closePadding = getOption("closePadding");
         if (showClose)
         {
-- 
cgit v1.2.3-70-g09d2