issue #5057, fix android compile error

This commit is contained in:
andyque 2014-05-12 13:54:30 +08:00
parent b735ce3ffc
commit 8232b98525
5 changed files with 5 additions and 5 deletions

View File

@ -608,7 +608,7 @@ _curLayoutExecutant(nullptr),
_passFocusToChild(true),
_loopFocus(false)
{
_widgetType = Type::CONTAINER;
_widgetType = Widget::Type::CONTAINER;
onPassFocusToChild = CC_CALLBACK_2(Layout::findNearestChildWidgetIndex, this);
}

View File

@ -396,7 +396,7 @@ void LoadingBar::copySpecialProperties(Widget *widget)
loadTexture(loadingBar->_textureFile, loadingBar->_renderBarTexType);
setCapInsets(loadingBar->_capInsets);
setPercent(loadingBar->_percent);
setDirection(loadingBar->_direction);
setBarDirection(loadingBar->_direction);
}
}

View File

@ -71,7 +71,7 @@ namespace experimental{
virtual void setFullScreenEnabled(bool enabled);
virtual bool isFullScreenEnabled();
virtual void addEventListener(const EventCallback& callback);
virtual void addEventListener(const VideoPlayer::EventCallback& callback);
virtual void onVideoEvent(VideoPlayer::EventType event);
virtual void draw(Renderer *renderer, const Matrix& transform, bool transformUpdated) override;

View File

@ -336,7 +336,7 @@ void VideoPlayer::setVisible(bool visible)
}
}
void VideoPlayer::setEventListener(const EventCallback& callback)
void VideoPlayer::addEventListener(const VideoPlayer::EventCallback& callback)
{
_callback = callback;
}

View File

@ -442,7 +442,7 @@ void VideoPlayer::setVisible(bool visible)
}
}
void VideoPlayer::addEventListener(const EventCallback& callback)
void VideoPlayer::addEventListener(const VideoPlayer::EventCallback& callback)
{
_callback = callback;
}