Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'iss383' of https://github.com/natural-law/cocos2d-x into natural-law-iss383

This commit is contained in:
minggo 2011-03-09 14:55:45 +08:00
parent 15368e6169 4c0ace849a
commit 19470fda34
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos2dx/platform/uphone/CCEGLView_uphone.cpp
View File

@ -293,8 +293,7 @@ Boolean CCEGLView::EventHandler(TApplication * pApp, EventType * pEvent)
{ {
bHandled = CCKeypadDispatcher::sharedDispatcher()->dispatchKeypadMSG(kTypeBackClicked); bHandled = CCKeypadDispatcher::sharedDispatcher()->dispatchKeypadMSG(kTypeBackClicked);
} }
else if (pEvent->sParam1 == SYS_KEY_SOFTKEY_LEFT_UP || else if (pEvent->sParam1 == KEY_COMMAND_MAINMENU)
pEvent->sParam1 == SYS_KEY_SOFTKEY_LEFT_LONG)
{ {
bHandled = CCKeypadDispatcher::sharedDispatcher()->dispatchKeypadMSG(kTypeMenuClicked); bHandled = CCKeypadDispatcher::sharedDispatcher()->dispatchKeypadMSG(kTypeMenuClicked);
} }