From 5213aa7bc9c4d5980f601735be387ca9b8b8c131 Mon Sep 17 00:00:00 2001 From: Victor Buldakov Date: Mon, 4 Nov 2013 01:27:16 +0400 Subject: [PATCH] fix cc --- .../GUI/CCControlExtension/CCControlSlider.cpp | 12 ++++++------ extensions/GUI/CCControlExtension/CCControlSlider.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/extensions/GUI/CCControlExtension/CCControlSlider.cpp b/extensions/GUI/CCControlExtension/CCControlSlider.cpp index 52ab8d08b8..7393e3f1b0 100644 --- a/extensions/GUI/CCControlExtension/CCControlSlider.cpp +++ b/extensions/GUI/CCControlExtension/CCControlSlider.cpp @@ -96,7 +96,7 @@ ControlSlider* ControlSlider::create(Sprite * backgroundSprite, Sprite* pogressS } ControlSlider* ControlSlider::create(Sprite * backgroundSprite, Sprite* pogressSprite, Sprite* thumbSprite, - Sprite* selectedThumbSprite) + Sprite* selectedThumbSprite) { ControlSlider *pRet = new ControlSlider(); pRet->initWithSprites(backgroundSprite, pogressSprite, thumbSprite, selectedThumbSprite); @@ -106,14 +106,14 @@ ControlSlider* ControlSlider::create(Sprite * backgroundSprite, Sprite* pogressS bool ControlSlider::initWithSprites(Sprite * backgroundSprite, Sprite* progressSprite, Sprite* thumbSprite) { - Sprite* selectedThumbSprite = Sprite::createWithTexture(thumbSprite->getTexture(), - thumbSprite->getTextureRect()); - selectedThumbSprite->setColor(Color3B::GRAY); - this->initWithSprites(backgroundSprite, progressSprite, thumbSprite, selectedThumbSprite); + Sprite* selectedThumbSprite = Sprite::createWithTexture(thumbSprite->getTexture(), + thumbSprite->getTextureRect()); + selectedThumbSprite->setColor(Color3B::GRAY); + this->initWithSprites(backgroundSprite, progressSprite, thumbSprite, selectedThumbSprite); } bool ControlSlider::initWithSprites(Sprite * backgroundSprite, Sprite* progressSprite, Sprite* thumbSprite, - Sprite* selectedThumbSprite) + Sprite* selectedThumbSprite) { if (Control::init()) { diff --git a/extensions/GUI/CCControlExtension/CCControlSlider.h b/extensions/GUI/CCControlExtension/CCControlSlider.h index 0a5f4a3779..9d5f2bc2ff 100644 --- a/extensions/GUI/CCControlExtension/CCControlSlider.h +++ b/extensions/GUI/CCControlExtension/CCControlSlider.h @@ -64,7 +64,7 @@ public: * and a selected thumb image filename. */ static ControlSlider* create(const char* bgFile, const char* progressFile, const char* thumbFile, - const char* selectedThumbSpriteFile); + const char* selectedThumbSpriteFile); /** * Creates a slider with a given background sprite and a progress bar, a thumb @@ -73,7 +73,7 @@ public: * @see initWithSprites */ static ControlSlider* create(Sprite * backgroundSprite, Sprite* pogressSprite, Sprite* thumbSprite, - Sprite* selectedThumbSprite); + Sprite* selectedThumbSprite); /** * @js ctor */ @@ -104,7 +104,7 @@ public: * @param selectedThumbSprite Sprite, that is used as a selected thumb. */ virtual bool initWithSprites(Sprite * backgroundSprite, Sprite* progressSprite, Sprite* thumbSprite, - Sprite* selectedThumbSprite); + Sprite* selectedThumbSprite); virtual void needsLayout();