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

fix compile

This commit is contained in:
xuzhiqiang 2014-01-14 20:27:14 +08:00
parent 4eafd7b4c5
commit 1d30bd0d80
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/GUI/CCScrollView/CCScrollView.cpp
View File

@ -300,7 +300,7 @@ void ScrollView::setZoomScaleInDuration(float s, float dt)
} }
} }
void CCScrollView::updateTweenAction(float value, const char* key) void CCScrollView::updateTweenAction(float value, const std::string& key)
{ {
setZoomScale(value); setZoomScale(value);
} }

2
extensions/GUI/CCScrollView/CCScrollView.h
View File

@ -231,7 +231,7 @@ public:
/** /**
* CCActionTweenDelegate * CCActionTweenDelegate
*/ */
void updateTweenAction(float value, const char* key); void updateTweenAction(float value, const std::string& key);
protected: protected:
/** /**
* Relocates the container at the proper offset, in bounds of max/min offsets. * Relocates the container at the proper offset, in bounds of max/min offsets.