Update some GuiConstants and resubmission  pr#6361.
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
Merge pull request #6761 from samuele3hu/v3_fix

Update some GuiConstants and resubmission pr#6361.