GRAPHICS: Fix bug in MacText::draw() on calculating bounding rect size

Change is _surface->w to _surface->h in the fourth arg to Common::Rect

3 files changed, 11 insertions, 2 deletions

diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 672d1f5b6e..a3154ca460 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -333,8 +333,8 @@ void MacText::draw(ManagedSurface *g, int x, int y, int w, int h, int xoff, int
 		g->fillRect(Common::Rect(x, y, x + w, y + w), _bgcolor);
 	}
 
-	g->blitFrom(*_surface, Common::Rect(MIN<int>(_surface->w, x),     MIN<int>(_surface->h, y),
-									    MIN<int>(_surface->w, x + w), MIN<int>(_surface->w, y + w)),
+	g->blitFrom(*_surface, Common::Rect(MIN<int>(_surface->w, x), MIN<int>(_surface->h, y),
+									    MIN<int>(_surface->w, x + w), MIN<int>(_surface->h, y + w)),
 										Common::Point(xoff, yoff));
 }
 
diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp
index fc41be4fd0..a96aa5a0a4 100644
--- a/graphics/macgui/mactextwindow.cpp
+++ b/graphics/macgui/mactextwindow.cpp
@@ -20,7 +20,9 @@
  *
  */
 
+
 #include "graphics/macgui/macwindowmanager.h"
+#include "graphics/macgui/macfontmanager.h"
 #include "graphics/macgui/mactextwindow.h"
 
 namespace Graphics {
@@ -33,4 +35,9 @@ MacTextWindow::MacTextWindow(MacWindowManager *wm) :
 MacTextWindow::~MacTextWindow() {
 }
 
+const Font *MacTextWindow::getTextWindowFont() {
+	// TODO: make this have an actual effect
+	return _wm->_fontMan->getFont(Graphics::MacFont(kMacFontChicago, 8));
+}
+
 } // End of namespace Graphics
diff --git a/graphics/macgui/mactextwindow.h b/graphics/macgui/mactextwindow.h
index 2e1cf4f3fe..b63f135e02 100644
--- a/graphics/macgui/mactextwindow.h
+++ b/graphics/macgui/mactextwindow.h
@@ -29,6 +29,8 @@ class MacTextWindow : public MacWindow {
 public:
 	MacTextWindow(MacWindowManager *wm);
 	~MacTextWindow();
+
+	const Font *getTextWindowFont();
 };
 
 } // End of namespace Graphics