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

Merge pull request #5702 from dumganhar/glview-inherit-order 

Changes the order of inheritance for GLView. Reason:
This commit is contained in:
James Chen 2014-03-12 15:34:53 +08:00
parent a974e5e42b 42c724a59d
commit 2ae283d506
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/platform/CCGLViewProtocol.h
View File

@ -58,8 +58,6 @@ enum class ResolutionPolicy
NS_CC_BEGIN
class EGLTouchDelegate;
/**
* @addtogroup platform
* @{

2
cocos/2d/platform/android/CCGLView.h
View File

@ -35,7 +35,7 @@ THE SOFTWARE.
NS_CC_BEGIN
class CC_DLL GLView : public Ref, public GLViewProtocol
class CC_DLL GLView : public GLViewProtocol, public Ref
{
public:

2
cocos/2d/platform/desktop/CCGLView.h
View File

@ -33,7 +33,7 @@ THE SOFTWARE.
NS_CC_BEGIN
class CC_DLL GLView : public Ref, public GLViewProtocol
class CC_DLL GLView : public GLViewProtocol, public Ref
{
public:
static GLView* create(const std::string& viewName);

2
cocos/2d/platform/ios/CCGLView.h
View File

@ -38,7 +38,7 @@ NS_CC_BEGIN
/** Class that represent the OpenGL View
*/
class CC_DLL GLView : public Ref, public GLViewProtocol
class CC_DLL GLView : public GLViewProtocol, public Ref
{
public:
/** creates a GLView with a objective-c CCEAGLView instance */