8 Commits

Author	SHA1	Message	Date
cpascal	d857164768	Added override of ui::EditBox::getDescription()	2015-01-27 11:10:04 +09:00
Vladimir Timofeev	2835b094da	Cleanup order of fields initialization. ... Make initialization order to match declarations. This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1 Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"	2014-10-30 17:28:41 +03:00
Ricardo Quesada	342d934a0e	scheduler and macro fixes ... * kRepeatForever -> CC_REPEAT_FOREVER * schedule_selector -> CC_SCHEDULE_SELECTOR * [new] Node::schedule(const std::function<>& callback, const std::string &key) Updates all smaples	2014-10-03 09:38:36 -07:00
Sergey	14853d46f2	setPlaceholderFontSize fix	2014-09-03 23:38:44 +04:00
andyque	51e160beff	fix EditBox lua compile error	2014-09-02 17:37:55 +08:00
andyque	aef0f5e729	Merge branch 'v3' into mergeExtensionEditBox ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/ui/Android.mk cocos/ui/CMakeLists.txt cocos/ui/proj.win32/libui.vcxproj cocos/ui/proj.win32/libui.vcxproj.filters tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters	2014-09-01 15:26:25 +08:00
andyque	46f3ab9b57	add Scale9Sprite to create method of ui::EditBox	2014-08-20 16:08:28 +08:00
andyque	8d1c422ac5	merge extension EditBox to ui module	2014-08-19 10:28:24 +08:00