Merged with Aethyra master as of 2009-01-27

Conflicts:
	Almost everywhere.

1 files changed, 10 insertions, 35 deletions

diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h
index cdaf6713..d6a04d7b 100644
--- a/src/gui/itemshortcutcontainer.h
+++ b/src/gui/itemshortcutcontainer.h
@@ -23,20 +23,21 @@
 #define ITEMSHORTCUTCONTAINER_H
 
 #include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
+
+#include "shortcutcontainer.h"
+
+#include "../guichanfwd.h"
 
 class Image;
 class Item;
+class ItemPopup;
 
 /**
  * An item shortcut container. Used to quickly use items.
  *
  * \ingroup GUI
  */
-class ItemShortcutContainer : public gcn::Widget,
-                              public gcn::WidgetListener,
-                              public gcn::MouseListener
+class ItemShortcutContainer : public ShortcutContainer
 {
     public:
         /**
@@ -60,12 +61,6 @@ class ItemShortcutContainer : public gcn::Widget,
         void draw(gcn::Graphics *graphics);
 
         /**
-         * Invoked when a widget changes its size. This is used to determine
-         * the new height of the container.
-         */
-        void widgetResized(const gcn::Event &event);
-
-        /**
          * Handles mouse when dragged.
          */
         void mouseDragged(gcn::MouseEvent &event);
@@ -80,34 +75,14 @@ class ItemShortcutContainer : public gcn::Widget,
          */
         void mouseReleased(gcn::MouseEvent &event);
 
-        int getMaxItems()
-        { return mMaxItems; }
-
-        int getBoxWidth()
-        { return mBoxWidth; }
-
-        int getBoxHeight()
-        { return mBoxHeight; }
-
     private:
-        /**
-         * Gets the index from the grid provided the point is in an item box.
-         *
-         * @param pointX X coordinate of the point.
-         * @param pointY Y coordinate of the point.
-         * @return index on success, -1 on failure.
-         */
-        int getIndexFromGrid(int pointX, int pointY) const;
-
-        Image *mBackgroundImg;
+        void mouseExited(gcn::MouseEvent &event);
+        void mouseMoved(gcn::MouseEvent &event);
 
-        int mMaxItems;
-        int mBoxWidth;
-        int mBoxHeight;
-        int mCursorPosX, mCursorPosY;
-        int mGridWidth, mGridHeight;
         bool mItemClicked;
         Item *mItemMoved;
+
+        ItemPopup *mItemPopup;
 };
 
 #endif