From 952d1a084c851a33d8094e384f80890141d63157 Mon Sep 17 00:00:00 2001
From: Walter van Niftrik
Date: Wed, 9 Mar 2011 20:50:11 +0100
Subject: SCI: Implement Mac iconbar event handling.

---
 engines/sci/graphics/maciconbar.h | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'engines/sci/graphics/maciconbar.h')

diff --git a/engines/sci/graphics/maciconbar.h b/engines/sci/graphics/maciconbar.h
index 0db9454eb7..3ac5475147 100644
--- a/engines/sci/graphics/maciconbar.h
+++ b/engines/sci/graphics/maciconbar.h
@@ -43,10 +43,9 @@ public:
 
 	void addIcon(reg_t obj);
 	void drawIcons();
-	void redrawIcon(uint16 index);
-	void drawSelectedImage(uint16 index);
-	bool isIconEnabled(uint16 index) const;
-	void setIconEnabled(uint16 index, bool enabled);
+	void setIconEnabled(int16 index, bool enabled);
+	void setInventoryIcon(int16 icon);
+	reg_t handleEvents();
 
 private:
 	struct IconBarItem {
@@ -59,12 +58,20 @@ private:
 
 	Common::Array<IconBarItem> _iconBarItems;
 	uint32 _lastX;
+	uint16 _inventoryIndex;
+	Graphics::Surface *_inventoryIcon;
+	bool _allDisabled;
 
+	Graphics::Surface *loadPict(ResourceId id);
 	Graphics::Surface *createImage(uint32 iconIndex, bool isSelected);
 	void remapColors(Graphics::Surface *surf, byte *palette);
 
+	void drawIcon(uint16 index, bool selected);
+	void drawSelectedImage(uint16 index);
+	bool isIconEnabled(uint16 index) const;
 	void drawEnabledImage(Graphics::Surface *surface, const Common::Rect &rect);
 	void drawDisabledImage(Graphics::Surface *surface, const Common::Rect &rect);
+	bool pointOnIcon(uint32 iconIndex, Common::Point point);
 };
 
 } // End of namespace Sci
-- 
cgit v1.2.3