Fixed wrapping in some cases, removed draw method

The 'draw' method was confusingly named, and was actually for updating
the GUI after a resize. Its functionality has been merged into
'widgetResized'.

The wrapping was broken in the case where text was added to the NPC
dialog, cause it was added to an already wrapped string, causing the
wrapping to become permanent.

Sorry for all the reformatting.

Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>

(cherry picked from eAthena commit 43eb6ba950dd8bf978e539c7c7460ef5096438de)

Conflicts:

	src/gui/npclistdialog.cpp
	src/gui/npclistdialog.h

1 files changed, 5 insertions, 14 deletions

diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index e5e973e7..9d970ac2 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -56,27 +56,19 @@ class NpcListDialog : public Window, public gcn::ActionListener,
         void widgetResized(const gcn::Event &event);
 
         /**
-         * Redraws the window
-         */
-        void draw();
-
-        /**
          * Called when receiving actions from the widgets.
          */
-        void
-        action(const gcn::ActionEvent &event);
+        void action(const gcn::ActionEvent &event);
 
         /**
          * Returns the number of items in the choices list.
          */
-        int
-        getNumberOfElements();
+        int getNumberOfElements();
 
         /**
          * Returns the name of item number i of the choices list.
          */
-        std::string
-        getElementAt(int i);
+        std::string getElementAt(int i);
 
         /**
          * Adds an item to the option list.
@@ -86,8 +78,7 @@ class NpcListDialog : public Window, public gcn::ActionListener,
         /**
          * Resets the list by removing all items.
          */
-        void
-        reset();
+        void reset();
 
     private:
         gcn::ListBox *mItemList;
@@ -98,4 +89,4 @@ class NpcListDialog : public Window, public gcn::ActionListener,
         std::vector<std::string> mItems;
 };
 
-#endif
+#endif // _TMW_GUI_NPCLISTDIALOG_H