Merge branch 'eathena/master'

Conflicts:
	A lot of files.

1 files changed, 31 insertions, 2 deletions

diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index c820e3a0..03e79886 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -23,20 +23,48 @@
 #ifndef ITEMPOPUP_H
 #define ITEMPOPUP_H
 
-#include "window.h"
+#include "popup.h"
 
 class ItemInfo;
 class ScrollArea;
 class TextBox;
 
-class ItemPopup : public Window
+class ItemPopup : public Popup
 {
     public:
+        /**
+         * Constructor. Initializes the item popup.
+         */
         ItemPopup();
+
+        /**
+         * Destructor. Cleans up the item popup on deletion.
+         */
         ~ItemPopup();
 
+        /**
+         * Sets the info to be displayed given a particular item.
+         */
         void setItem(const ItemInfo &item);
+
+        /**
+         * Gets the number of rows that the item popup currently has.
+         */
         unsigned int getNumRows();
+
+        /**
+         * Gets the name of the currently stored item in this popup.
+         */
+        std::string getItemName();
+
+        /**
+         * Updates the colors used within the item popup.
+         */
+        void updateColors();
+
+        /**
+         * Sets the location to display the item popup.
+         */
         void view(int x, int y);
 
     private:
@@ -44,6 +72,7 @@ class ItemPopup : public Window
         TextBox *mItemDesc;
         TextBox *mItemEffect;
         TextBox *mItemWeight;
+        std::string mItemType;
         ScrollArea *mItemDescScroll;
         ScrollArea *mItemEffectScroll;
         ScrollArea *mItemWeightScroll;