[Scummvm-cvs-logs] scummvm master -> cb6f02f7ef6c5c81892cd8f8bd2f5e323e388fa4

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cb6f02f7ef Merge branch 'sdl-focus-rect' of https://github.com/lordhoto/scummvm


Commit: cb6f02f7ef6c5c81892cd8f8bd2f5e323e388fa4
    https://github.com/scummvm/scummvm/commit/cb6f02f7ef6c5c81892cd8f8bd2f5e323e388fa4
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-03-17T08:48:55-07:00

Commit Message:
Merge branch 'sdl-focus-rect' of https://github.com/lordhoto/scummvm

Conflicts:
	backends/graphics/sdl/sdl-graphics.cpp

Changed paths:
    backends/graphics/sdl/sdl-graphics.cpp
    backends/graphics/sdl/sdl-graphics.h



diff --cc backends/graphics/sdl/sdl-graphics.cpp
index 7d36786,09c4f39..c0d93b3
--- a/backends/graphics/sdl/sdl-graphics.cpp
+++ b/backends/graphics/sdl/sdl-graphics.cpp
@@@ -161,6 -165,18 +165,11 @@@ SdlGraphicsManager::SdlGraphicsManager(
  
  	_graphicsMutex = g_system->createMutex();
  
 -#ifdef _WIN32_WCE
 -	if (ConfMan.hasKey("use_GDI") && ConfMan.getBool("use_GDI")) {
 -		SDL_VideoInit("windib", 0);
 -		sdlFlags ^= SDL_INIT_VIDEO;
 -	}
 -#endif
 -
+ #ifdef USE_SDL_DEBUG_FOCUSRECT
+ 	if (ConfMan.hasKey("use_sdl_debug_focusrect"))
+ 		_enableFocusRectDebugCode = ConfMan.getBool("use_sdl_debug_focusrect");
+ #endif
+ 
  	SDL_ShowCursor(SDL_DISABLE);
  
  	memset(&_oldVideoMode, 0, sizeof(_oldVideoMode));