[Scummvm-cvs-logs] SF.net SVN: scummvm: [32719] scummvm/branches/gsoc2008-rtl/gui

[cpage88 at users.sourceforge.net]

Revision: 32719
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32719&view=rev
Author:   cpage88
Date:     2008-06-16 11:47:32 -0700 (Mon, 16 Jun 2008)

Log Message:
-----------
Fixed a problem where the function that I previously implemented, popAllCursors(), was causing the mouse cursor to disapear

Modified Paths:
--------------
    scummvm/branches/gsoc2008-rtl/gui/launcher.cpp
    scummvm/branches/gsoc2008-rtl/gui/newgui.cpp

Modified: scummvm/branches/gsoc2008-rtl/gui/launcher.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/gui/launcher.cpp	2008-06-16 17:34:58 UTC (rev 32718)
+++ scummvm/branches/gsoc2008-rtl/gui/launcher.cpp	2008-06-16 18:47:32 UTC (rev 32719)
@@ -44,6 +44,7 @@
 #include "gui/ListWidget.h"
 #include "gui/TabWidget.h"
 #include "gui/PopUpWidget.h"
+#include "graphics/cursorman.h"
 
 #include "sound/mididrv.h"
 
@@ -549,6 +550,8 @@
 	// failure to launch a game. Otherwise, pressing ESC will attempt to
 	// re-launch the same game again.
 	ConfMan.setActiveDomain("");
+
+	CursorMan.popAllCursors();
 	Dialog::open();
 
 	updateButtons();

Modified: scummvm/branches/gsoc2008-rtl/gui/newgui.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/gui/newgui.cpp	2008-06-16 17:34:58 UTC (rev 32718)
+++ scummvm/branches/gsoc2008-rtl/gui/newgui.cpp	2008-06-16 18:47:32 UTC (rev 32719)
@@ -365,8 +365,6 @@
 	_dialogStack.push(dialog);
 	_needRedraw = true;
 	
-	CursorMan.popAllCursors();
-	
 	// We reflow the dialog just before opening it. If the screen changed
 	// since the last time we looked, also refresh the loaded theme,
 	// and reflow all other open dialogs, too.


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