- Added alignment and initial mode options to keyboard pack file

- More functionality to VirtualKeyboard class, including handling mouse clicks

svn-id: r32907

2 files changed, 3 insertions, 3 deletions

diff --git a/common/imageMap.cpp b/common/imageMap.cpp
index 7c8498ea06..4646123754 100644
--- a/common/imageMap.cpp
+++ b/common/imageMap.cpp
@@ -35,7 +35,7 @@ void ImageMap::addPolygonMapArea(const Polygon& poly, const String& target) {
 	areas.push_back(MapArea(poly, target));
 }
 
-MapArea *ImageMap::findMapArea(int x, int y) {
+MapArea *ImageMap::findMapArea(int16 x, int16 y) {
 	Array<MapArea>::iterator it;
 	for (it = areas.begin(); it != areas.end(); it++) {
 		if (it->contains(x, y))
diff --git a/common/imageMap.h b/common/imageMap.h
index 4edf511825..b6a1ad36f4 100644
--- a/common/imageMap.h
+++ b/common/imageMap.h
@@ -49,7 +49,7 @@ public:
 		return _shape->contains(x, y);
 	}
 
-	const String& getTarget() { return _target; }
+	String getTarget() { return _target; }
 
 protected:
 	/* shape defining the MapArea's boundary */
@@ -66,7 +66,7 @@ public:
 	void addRectMapArea(const Rect& rect, const String& target);
 	void addPolygonMapArea(const Polygon& poly, const String& target);
 
-	MapArea *findMapArea(int x, int y);
+	MapArea *findMapArea(int16 x, int16 y);
 
 protected:
 	Array<MapArea> areas;