axmol/cocos/2d/platform
James Chen 42c724a59d Changes the order of inheritance for GLView. Reason:
```
 	bool ok = true;
 	JSObject *obj = JS_THIS_OBJECT(cx, vp);
 	js_proxy_t *proxy = jsb_get_js_proxy(obj);
	cocos2d::GLViewProtocol* cobj = (cocos2d::GLViewProtocol *)(proxy ? proxy->ptr : NULL);   // This line will cause the 'cobj' to be an invalid object, since the instance is a 'GLView', but we force cast it to 'GLViewProtocol*'.
 	JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_GLViewProtocol_setDesignResolutionSize : Invalid Native Object");
 	if (argc == 3) {
 		double arg0;

```
After changing the order, the result could be fixed. But I don't know whether it's the best way to fix it. Anyway, it wouldn't break anything right now.
2014-03-12 14:43:51 +08:00
..
android Changes the order of inheritance for GLView. Reason: 2014-03-12 14:43:51 +08:00
apple update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
desktop Changes the order of inheritance for GLView. Reason: 2014-03-12 14:43:51 +08:00
ios Changes the order of inheritance for GLView. Reason: 2014-03-12 14:43:51 +08:00
linux closed #4107: Director::setAnimationInterval could not work on Mac platform. Also removed unused files (CCDirectorCaller.h/.mm). 2014-02-21 11:55:37 +08:00
mac closed #4107: Director::setAnimationInterval could not work on Mac platform. Also removed unused files (CCDirectorCaller.h/.mm). 2014-02-21 11:55:37 +08:00
win32 Merge pull request #5283 from seemk/director_cleanup_fix 2014-02-24 16:58:34 +08:00
CCApplicationProtocol.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCCommon.h Added Dutch for 3.x branch 2014-01-25 20:38:15 +00:00
CCDevice.h move labelttf's platform-dependent code from CCImage to CCDevice 2014-02-13 21:08:43 +08:00
CCFileUtils.cpp Merge pull request #4990 from daltomi/debug 2014-02-20 20:29:56 +08:00
CCFileUtils.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCGLViewProtocol.cpp Refactoring GLView for desktop platforms, and adding protected method `updateDesignResolutionSize` for GLViewProtocol class. 2014-03-07 13:51:12 +08:00
CCGLViewProtocol.h Changes the order of inheritance for GLView. Reason: 2014-03-12 14:43:51 +08:00
CCImage.cpp CCImage.cpp: If dds header reports 0 mipmaps, force _numberOfMipmaps to 1 to enable software decoding. Set _renderFormat just once for both hardware and software decoding (moved out of "load mipmaps" loop). 2014-02-20 00:48:09 -05:00
CCImage.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCSAXParser.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCSAXParser.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCThread.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCThread.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00