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

Merge pull request #8109 from andyque/fixTests 

fix editbox test
This commit is contained in:
minggo 2014-09-19 16:29:07 +08:00
parent 653986a3a2 7615eb8d39
commit 681621805d
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
View File

@ -44,6 +44,7 @@ g_guisTests[] =
} }
}, },
#endif #endif
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) || (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_TIZEN) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8)
{ {
"EditBox Test", "EditBox Test",
[](Ref* sender) [](Ref* sender)
@ -56,6 +57,7 @@ g_guisTests[] =
Director::getInstance()->replaceScene(scene); Director::getInstance()->replaceScene(scene);
} }
}, },
#endif
{ {
"focus test", "focus test",
[](Ref* sender) [](Ref* sender)

2
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h
View File

@ -41,7 +41,9 @@ enum
kUIButtonTextOnly, kUIButtonTextOnly,
kUIButtonIgnoreContentSizeTest, kUIButtonIgnoreContentSizeTest,
kUIButtonTitleEffectTest, kUIButtonTitleEffectTest,
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) || (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_TIZEN) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8)
kUIEditBoxTest, kUIEditBoxTest,
#endif
kUICheckBoxTest, kUICheckBoxTest,
kUISliderTest, kUISliderTest,
kUISliderTest_Scale9, kUISliderTest_Scale9,