From 8442f17259c9d60c9d307cdf19e39c3c21760442 Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Fri, 6 Dec 2013 09:31:16 +0000 Subject: [PATCH 1/2] [AUTO] : updating submodule reference to latest autogenerated bindings --- cocos/scripting/auto-generated | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos/scripting/auto-generated b/cocos/scripting/auto-generated index e4ce0d5a62..db718e871a 160000 --- a/cocos/scripting/auto-generated +++ b/cocos/scripting/auto-generated @@ -1 +1 @@ -Subproject commit e4ce0d5a6240c303a591a4476564bd7080ab06c2 +Subproject commit db718e871a7b59acdbefb679796c824d7a2b3ebf From f34083e87f810af67f722e7bd7e3781479a84598 Mon Sep 17 00:00:00 2001 From: signmotion Date: Fri, 6 Dec 2013 22:08:32 +0200 Subject: [PATCH 2/2] - Fixed some slips. --- cocos/2d/platform/win32/CCEGLView.cpp | 4 ++-- extensions/GUI/CCControlExtension/CCScale9Sprite.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cocos/2d/platform/win32/CCEGLView.cpp b/cocos/2d/platform/win32/CCEGLView.cpp index 3a18b81917..ce9b7f43d8 100644 --- a/cocos/2d/platform/win32/CCEGLView.cpp +++ b/cocos/2d/platform/win32/CCEGLView.cpp @@ -413,7 +413,7 @@ EGLView::EGLView() { g_keyCodeMap.insert(std::make_pair(item.glfwKeyCode, item.keyCode)); } - strcpy(_viewName, "Cocos2dxWin32"); + _viewName = "Cocos2dxWin32"; glfwSetErrorCallback(EGLViewEventHandler::OnGLFWError); glfwInit(); } @@ -433,7 +433,7 @@ bool EGLView::init(const char* viewName, float width, float height, float frameZ setFrameZoomFactor(frameZoomFactor); glfwWindowHint(GLFW_RESIZABLE,GL_FALSE); - _mainWindow = glfwCreateWindow(_screenSize.width * _frameZoomFactor, _screenSize.height * _frameZoomFactor, _viewName, nullptr, nullptr); + _mainWindow = glfwCreateWindow(_screenSize.width * _frameZoomFactor, _screenSize.height * _frameZoomFactor, _viewName.c_str(), nullptr, nullptr); glfwMakeContextCurrent(_mainWindow); glfwGetFramebufferSize(_mainWindow, &_frameBufferSize[0], &_frameBufferSize[1]); diff --git a/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp b/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp index 8ad857fd7c..7e9be764b1 100644 --- a/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp +++ b/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp @@ -341,7 +341,7 @@ bool Scale9Sprite::updateWithBatchNode(SpriteBatchNode* batchnode, const Rect& o _scale9Image->addChild(_top, 1, pTop); // Bottom - _bottom = Sprite::Sprite::createWithTexture(_scale9Image->getTexture(), rotatedcenterbottombounds, true); + _bottom = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedcenterbottombounds, true); _bottom->retain(); _scale9Image->addChild(_bottom, 1, pBottom);