Merge pull request cocos2d#4 from pandamicro/develop

Issue cocos2d#3897: Make Constructors public in Cocos2d-JS

Author: pandamicro

AUTHORS

@@ -548,6 +548,7 @@ Developers:
     hannon235 (Chris)
         Fixing a bug that the submenu of ExtensionTest in TestCpp can't scroll.
         Implements a socket.io client extension and adds a test case.
+        Implements 'SIODelegate::fireEventToScript' method to integrate JSB event handling with the original native code.
 
     pktangyue
         Fixing a bug that CCScale9Sprite::setInsetLeft/XXX can't work for rotated sprite frame.

CHANGELOG

@@ -13,6 +13,7 @@ cocos2d-x-3.0? ?? 2014
      [FIX]         LuaBinding: Adds `addCustomHandler` in the ScriptHandlerMgr
      [FIX]         LuaBinding: Upgrading LuaSocket to the latest version
      [FIX]         Menu: Added missed scaleZ feature in ScaleTo and ScaleBy.
+     [FIX]         Network: Implements 'SIODelegate::fireEventToScript' method to integrate JSB event handling with the original native code.
      [FIX]         Physics: PhysicsBody::setGravityEnable doesn't work correctly sometimes
      [FIX]         Physics: PhysicsBody moves randomly when switch foreground/background
      [FIX]         Physics: Refactors PhysicsDebugDraw

cocos/2d/CCComponent.h

@@ -41,7 +41,7 @@ enum {
 
 class CC_DLL Component : public Ref
 {
-protected:
+CC_CONSTRUCTOR_ACCESS:
     /**
      * @js ctor
      */

cocos/2d/CCDrawNode.h

@@ -93,12 +93,13 @@ class CC_DLL DrawNode : public Node
 
     // Overrides
     virtual void draw(Renderer *renderer, const kmMat4 &transform, bool transformUpdated) override;
-
-protected:
+    
+CC_CONSTRUCTOR_ACCESS:
     DrawNode();
     virtual ~DrawNode();
     virtual bool init();
 
+protected:
     void ensureCapacity(int count);
 
     GLuint      _vao;

cocos/2d/ccConfig.h

@@ -273,7 +273,7 @@ To enable set it to a value different than 0. Disabled by default.
  protected by default.
  */
 #ifndef CC_CONSTRUCTOR_ACCESS
-#define CC_CONSTRUCTOR_ACCESS protected
+#define CC_CONSTRUCTOR_ACCESS public
 #endif
 
 #endif // __CCCONFIG_H__