Merge pull request #15346 from ricardoquesada/compiles_release_mode_xcode

fix: compile cpp-tests in release mode
This commit is contained in:
Ricardo Quesada 2016-03-29 20:26:46 -07:00
commit 87a9e274c2
2 changed files with 6 additions and 6 deletions

View File

@ -243,14 +243,14 @@ void UIListViewTest_Vertical::selectedItemEvent(Ref *pSender, ListView::EventTyp
{
ListView* listView = static_cast<ListView*>(pSender);
auto item = listView->getItem(listView->getCurSelectedIndex());
CCLOG("select child start index = %d", item->getTag());
log("select child start index = %d", item->getTag());
break;
}
case cocos2d::ui::ListView::EventType::ON_SELECTED_ITEM_END:
{
ListView* listView = static_cast<ListView*>(pSender);
auto item = listView->getItem(listView->getCurSelectedIndex());
CCLOG("select child end index = %d", item->getTag());
log("select child end index = %d", item->getTag());
break;
}
default:
@ -458,14 +458,14 @@ void UIListViewTest_Horizontal::selectedItemEvent(Ref *pSender, ListView::EventT
{
ListView* listView = static_cast<ListView*>(pSender);
auto item = listView->getItem(listView->getCurSelectedIndex());
CCLOG("select child start index = %d", item->getTag());
log("select child start index = %d", item->getTag());
break;
}
case cocos2d::ui::ListView::EventType::ON_SELECTED_ITEM_END:
{
ListView* listView = static_cast<ListView*>(pSender);
auto item = listView->getItem(listView->getCurSelectedIndex());
CCLOG("select child end index = %d", item->getTag());
log("select child end index = %d", item->getTag());
break;
}
default:

View File

@ -667,9 +667,9 @@ bool UIScrollViewInnerSize::init()
scrollView->setScrollBarPositionFromCorner(Vec2(2, 2));
scrollView->setScrollBarColor(Color3B::WHITE);
scrollView->setBackGroundColorType(Layout::BackGroundColorType::SOLID);
scrollView->setBackGroundColor(ccc3(150, 150, 100));
scrollView->setBackGroundColor(Color3B(150, 150, 100));
scrollView->getInnerContainer()->setBackGroundColorType(Layout::BackGroundColorType::SOLID);
scrollView->getInnerContainer()->setBackGroundColor(ccc3(50, 100, 50));
scrollView->getInnerContainer()->setBackGroundColor(Color3B(50, 100, 50));
scrollView->getInnerContainer()->setBackGroundColorOpacity(100);
scrollView->setClippingEnabled(false);
_uiLayer->addChild(scrollView);