14 Commits

Author	SHA1	Message	Date
Donald Alan Morrison	a245199075	Jianhua Chen pointed out a semantic error in my "fix". Thanks James! ... The Static Analyzer doesn't search for this semantic error, even though it is common.	2012-09-25 10:13:49 -07:00
Donald Alan Morrison	8693c54997	Minor memory-logic error. textField is a retain property, so assigning to it retains it, and assigning NULL to it releases it. Also, an init method called release outside the proper scope (the do{}while(0); block). ... If you don't like the autorelease pool, it's easy enough to change this fix. Aside: someone pulled tools/cxx-generator again, not me(!) :-)	2012-09-24 14:55:40 -07:00
minggo	0a1f0369e6	fixed #1481: merge Nicolas's pull request and do some bug fixes	2012-09-21 17:01:19 +08:00
James Chen	ee3e68014b	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_editbox	2012-08-24 00:16:11 +08:00
James Chen	1685e5c497	issue #1429: Used java code to implement keyboard layout.	2012-08-24 00:15:15 +08:00
James Chen	a437099779	issue #1429: Use activity to implement CCEditBox for android. Next step: use dialog to implement CCEditBox.	2012-08-23 09:42:28 +08:00
James Chen	bcbd161398	issue #1429: First commit CCEditBox for android port.	2012-08-22 09:47:04 +08:00
James Chen	3eecc283d0	Merge branch 'iss1437_return_pointer' of https://github.com/minggo/cocos2d-x into iss1437_return_pointer	2012-08-21 16:57:41 +08:00
James Chen	d918c8186f	Update extensions/GUI/CCEditBox/CCEditBox.cpp ... Revert this file, uncomment some codes in 'initWithXXX'.	2012-08-21 16:03:36 +08:00
minggo	cfdc50fb60	issue #1437:make CCEGLView::sharedOpenGLView() return pointer	2012-08-21 14:58:31 +08:00
Dale Ducharme	4004a8ac61	Cocos2dx for gles2.	2012-08-17 17:45:21 -04:00
James Chen	f7fd4fc2bf	issue #1429: Fixed a bug in EAGLView.mm.	2012-08-17 15:24:33 +08:00
James Chen	d3338a70e5	issue #1429: Updated EditBoxTest and fix a bug about callback function.	2012-08-17 14:29:07 +08:00
James Chen	0fce637ec7	issue #1429: First commit CCEditBox support, only valid on IOS. PLZ refer to ExtensionsTest/EditBoxTest.	2012-08-15 14:33:56 +08:00