cocos2d-PR-2081-addition.patch

diff --git extensions/GUI/CCScrollView/CCScrollMenu.cpp extensions/GUI/CCScrollView/CCScrollMenu.cpp
index ec2ae4c..5920b88 100644
--- extensions/GUI/CCScrollView/CCScrollMenu.cpp
+++ extensions/GUI/CCScrollView/CCScrollMenu.cpp
@@ -1,20 +1,26 @@
 #include "CCScrollMenu.h"
+
 USING_NS_CC;
 
+NS_CC_EXT_BEGIN
+
 CCScrollMenu::CCScrollMenu()
 {
-
 }
 
-CCScrollMenu::~CCScrollMenu() {
+CCScrollMenu::~CCScrollMenu()
+{
 }
 
 void CCScrollMenu::registerWithTouchDispatcher()
 {
-    CCDirector::sharedDirector()->getTouchDispatcher()->addTargetedDelegate(this, kCCMenuHandlerPriority, false);
+    CCDirector::sharedDirector()
+        ->getTouchDispatcher()
+        ->addTargetedDelegate(this, kCCMenuHandlerPriority, false);
 }
 
-void CCScrollMenu::ccTouchMoved(CCTouch* touch, CCEvent* event) {
+void CCScrollMenu::ccTouchMoved(CCTouch* touch, CCEvent* event)
+{
     CC_UNUSED_PARAM(event);
     this->ccTouchCancelled(touch, event);
 }
@@ -31,3 +37,4 @@ void CCScrollMenu::ccTouchCancelled(CCTouch *touch, CCEvent* event)
     CCMenu::ccTouchCancelled(touch, event);
 }
 
+NS_CC_EXT_END
\ No newline at end of file
diff --git extensions/GUI/CCScrollView/CCScrollMenu.h extensions/GUI/CCScrollView/CCScrollMenu.h
index d6de91c..c23a6e5 100644
--- extensions/GUI/CCScrollView/CCScrollMenu.h
+++ extensions/GUI/CCScrollView/CCScrollMenu.h
@@ -1,23 +1,29 @@
-#include "cocos2d.h"
+#ifndef __CCSCROLLMENU_H__
+#define __CCSCROLLMENU_H__
+
 #include "cocos-ext.h"
 
-class CCScrollMenu: public cocos2d::CCMenu {
+NS_CC_EXT_BEGIN
+
+class CCBReader;
+
+class CCScrollMenu: public cocos2d::CCMenu
+{
 public:
     CCB_STATIC_NEW_AUTORELEASE_OBJECT_WITH_INIT_METHOD(CCScrollMenu, create);
 
     CCScrollMenu();
     virtual ~CCScrollMenu();
+
     virtual void registerWithTouchDispatcher();
     virtual void ccTouchMoved(cocos2d::CCTouch* touch, cocos2d::CCEvent* event);
     virtual void ccTouchCancelled(cocos2d::CCTouch* touch, cocos2d::CCEvent* event);
     virtual void ccTouchEnded(cocos2d::CCTouch* touch, cocos2d::CCEvent* event);
-protected:
-private:
 };
 
-class CCBReader;
 
-class CCScrollMenuLoader : public cocos2d::extension::CCMenuLoader {
+class CCScrollMenuLoader : public cocos2d::extension::CCMenuLoader
+{
 public:
     CCB_STATIC_NEW_AUTORELEASE_OBJECT_METHOD(CCScrollMenuLoader, loader);
 
@@ -25,3 +31,6 @@ protected:
     CCB_VIRTUAL_NEW_AUTORELEASE_CREATECCNODE_METHOD(CCScrollMenu);
 };
 
+NS_CC_EXT_END
+
+#endif /* __CCSCROLLMENU_H__ */
\ No newline at end of file
diff --git extensions/GUI/CCScrollView/CCScrollViewWithMenu.cpp extensions/GUI/CCScrollView/CCScrollViewWithMenu.cpp
index ba7d468..9fdecfe 100644
--- extensions/GUI/CCScrollView/CCScrollViewWithMenu.cpp
+++ extensions/GUI/CCScrollView/CCScrollViewWithMenu.cpp
@@ -1,12 +1,14 @@
 #include "CCScrollViewWithMenu.h"
-#include "CCDirector.h"
-#include "touch_dispatcher/CCTouchDispatcher.h"
-#include "menu_nodes/CCMenu.h"
 
 USING_NS_CC;
-USING_NS_CC_EXT;
+
+NS_CC_EXT_BEGIN
 
 void CCScrollViewWithMenu::registerWithTouchDispatcher()
 {
-    CCDirector::sharedDirector()->getTouchDispatcher()->addTargetedDelegate(this, kCCMenuHandlerPriority, false);
-}
\ No newline at end of file
+    CCDirector::sharedDirector()
+        ->getTouchDispatcher()
+        ->addTargetedDelegate(this, kCCMenuHandlerPriority, false);
+}
+
+NS_CC_EXT_END
\ No newline at end of file
diff --git extensions/GUI/CCScrollView/CCScrollViewWithMenu.h extensions/GUI/CCScrollView/CCScrollViewWithMenu.h
index 4304c4c..cb94862 100644
--- extensions/GUI/CCScrollView/CCScrollViewWithMenu.h
+++ extensions/GUI/CCScrollView/CCScrollViewWithMenu.h
@@ -1,19 +1,29 @@
-#include "cocos2d.h"
+#ifndef __CCSCROLLVIEWWITHMENU_H__
+#define __CCSCROLLVIEWWITHMENU_H__
+
 #include "cocos-ext.h"
 #include "CCScrollView.h"
-class CCScrollViewWithMenu :public cocos2d::extension::CCScrollView {
+
+NS_CC_EXT_BEGIN
+
+class CCBReader;
+
+class CCScrollViewWithMenu : public cocos2d::extension::CCScrollView
+{
 public:
     CCB_STATIC_NEW_AUTORELEASE_OBJECT_WITH_INIT_METHOD(CCScrollViewWithMenu, create);
     void registerWithTouchDispatcher();
-protected:
-private:
 };
 
-class CCBReader;
-class CCScrollViewWithMenuLoader : public cocos2d::extension::CCScrollViewLoader {
-    
+class CCScrollViewWithMenuLoader : public cocos2d::extension::CCScrollViewLoader
+{
 public:
     CCB_STATIC_NEW_AUTORELEASE_OBJECT_METHOD(CCScrollViewWithMenuLoader, loader);
+
 protected:
     CCB_VIRTUAL_NEW_AUTORELEASE_CREATECCNODE_METHOD(CCScrollViewWithMenu);
 };
+
+NS_CC_EXT_END
+
+#endif /* __CCSCROLLVIEWWITHMENU_H__ */
\ No newline at end of file
diff --git extensions/cocos-ext.h extensions/cocos-ext.h
index f801410..2c262a3 100644
--- extensions/cocos-ext.h
+++ extensions/cocos-ext.h
@@ -33,7 +33,9 @@
 #include "CCBReader/CCNode+CCBRelativePositioning.h"
 
 #include "GUI/CCControlExtension/CCControlExtensions.h"
+#include "GUI/CCScrollView/CCScrollMenu.h"
 #include "GUI/CCScrollView/CCScrollView.h"
+#include "GUI/CCScrollView/CCScrollViewWithMenu.h"
 #include "GUI/CCScrollView/CCTableView.h"
 #include "GUI/CCEditBox/CCEditBox.h"