[Scummvm-cvs-logs] SF.net SVN: scummvm:[34280] scummvm/branches/branch-0-12-0/gui/newgui.cpp

[lordhoto at users.sourceforge.net]

Revision: 34280
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34280&view=rev
Author:   lordhoto
Date:     2008-09-02 13:22:12 +0000 (Tue, 02 Sep 2008)

Log Message:
-----------
Backport of r34278 "Fixed copy&paste error when checking y and h of a widget on layout change."

Modified Paths:
--------------
    scummvm/branches/branch-0-12-0/gui/newgui.cpp

Modified: scummvm/branches/branch-0-12-0/gui/newgui.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/gui/newgui.cpp	2008-09-02 13:17:40 UTC (rev 34279)
+++ scummvm/branches/branch-0-12-0/gui/newgui.cpp	2008-09-02 13:22:12 UTC (rev 34280)
@@ -72,9 +72,9 @@
 			error("Widget <%s> has x + w > %d (%d)", _name.c_str(), g_system->getOverlayWidth(), _x + _w);
 		if (_y < 0)
 			error("Widget <%s> has y < 0", _name.c_str());
-		if (_y >= g_system->getOverlayWidth())
+		if (_y >= g_system->getOverlayHeight())
 			error("Widget <%s> has y > %d", _name.c_str(), g_system->getOverlayHeight());
-		if (_y + _h > g_system->getOverlayWidth())
+		if (_y + _h > g_system->getOverlayHeight())
 			error("Widget <%s> has y + h > %d (%d)", _name.c_str(), g_system->getOverlayHeight(), _y + _h);
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.