Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master

This commit is contained in:
minggo 2010-12-09 13:59:02 +08:00
commit f3126de646
1 changed files with 2 additions and 2 deletions

View File

@ -54,15 +54,15 @@ Boolean CCXApplication::EventHandler(EventType * pEvent)
{
StopMainLoop();
}
// CfgTurnOnBackLightEx(SYS_BACK_LIGHT_MODE_TIME_LONG);
CfgTurnOnBackLight();
EnableKeyLock();
}
else if (pEvent->sParam1 > 0)
{
// CfgTurnOnBackLightEx(SYS_BACK_LIGHT_MODE_TIME_ALWAYS);
applicationWillEnterForeground();
StartMainLoop();
CfgTurnOnBackLightDelay(0x7fffffff);
// if KeyLock disactived, disable it.
if (! CfgKeyLock_GetActive())
{