diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplMac.h b/extensions/GUI/CCEditBox/CCEditBoxImplMac.h
new file mode 100755
index 0000000000..7dd2e19e84
--- /dev/null
+++ b/extensions/GUI/CCEditBox/CCEditBoxImplMac.h
@@ -0,0 +1,104 @@
+/****************************************************************************
+ Copyright (c) 2010-2012 cocos2d-x.org
+ Copyright (c) 2012 Jozef Pridavok
+ 
+ http://www.cocos2d-x.org
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+#ifndef __CCEditBoxIMPLMAC_H__
+#define __CCEditBoxIMPLMAC_H__
+
+#import <Foundation/Foundation.h>
+#import <AppKit/AppKit.h>
+
+#include "cocos2d.h"
+#include "ExtensionMacros.h"
+#include "CCEditBoxImpl.h"
+
+@interface CustomNSTextField : NSTextField
+{
+}
+
+@end
+
+@interface EditBoxImplMac : NSObject <NSTextFieldDelegate>
+{
+    CustomNSTextField* textField_;
+    void* editBox_;
+    BOOL editState_;
+}
+
+@property(nonatomic, retain) NSTextField* textField;
+@property(nonatomic, readonly, getter = isEditState) BOOL editState;
+@property(nonatomic, assign) void* editBox;
+
+-(id) initWithFrame: (NSRect) frameRect editBox: (void*) editBox;
+-(void) doAnimationWhenKeyboardMoveWithDuration:(float)duration distance:(float)distance;
+-(void) setPosition:(NSPoint) pos;
+-(void) setContentSize:(NSSize) size;
+-(void) visit;
+-(void) openKeyboard;
+-(void) closeKeyboard;
+
+@end
+
+NS_CC_EXT_BEGIN
+
+class CCEditBox;
+
+class CCEditBoxImplMac : public CCEditBoxImpl
+{
+public:
+    CCEditBoxImplMac(CCEditBox* pEditText);
+    virtual ~CCEditBoxImplMac();
+    
+    virtual bool initWithSize(const CCSize& size);
+    virtual void setFontColor(const ccColor3B& color);
+    virtual void setPlaceholderFontColor(const ccColor3B& color);
+    virtual void setInputMode(EditBoxInputMode inputMode);
+    virtual void setInputFlag(EditBoxInputFlag inputFlag);
+    virtual void setMaxLength(int maxLength);
+    virtual int  getMaxLength();
+    virtual void setReturnType(KeyboardReturnType returnType);
+    virtual bool isEditing();
+    
+    virtual void setText(const char* pText);
+    virtual const char* getText(void);
+    virtual void setPlaceHolder(const char* pText);
+    virtual void setPosition(const CCPoint& pos);
+    virtual void setContentSize(const CCSize& size);
+    virtual void visit(void);
+    virtual void doAnimationWhenKeyboardMove(float duration, float distance);
+    virtual void openKeyboard();
+    virtual void closeKeyboard();
+    
+private:
+    CCSize     m_tContentSize;
+    void*      m_pSysEdit;
+    int        m_nMaxTextLength;
+    bool       m_bInRetinaMode;
+};
+
+
+NS_CC_EXT_END
+
+#endif /* __CCEditBoxIMPLMAC_H__ */
+
diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm b/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm
new file mode 100755
index 0000000000..b1b6381b0d
--- /dev/null
+++ b/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm
@@ -0,0 +1,354 @@
+/****************************************************************************
+ Copyright (c) 2010-2012 cocos2d-x.org
+ Copyright (c) 2012 Jozef Pridavok
+ 
+ http://www.cocos2d-x.org
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+#include "CCEditBoxImplMac.h"
+#include "CCEditBox.h"
+#import "EAGLView.h"
+
+#define getEditBoxImplMac() ((cocos2d::extension::CCEditBoxImplMac*)editBox_)
+
+@implementation CustomNSTextField
+
+- (CGRect)textRectForBounds:(CGRect)bounds {
+    float padding = 5.0f;
+    return CGRectMake(bounds.origin.x + padding, bounds.origin.y + padding,
+                      bounds.size.width - padding*2, bounds.size.height - padding*2);
+}
+- (CGRect)editingRectForBounds:(CGRect)bounds {
+    return [self textRectForBounds:bounds];
+}
+
+- (void)setup {
+    [self setBordered:NO];
+    [self setHidden:NO];
+    [self setWantsLayer:YES];
+}
+
+@end
+
+
+@implementation EditBoxImplMac
+
+@synthesize textField = textField_;
+@synthesize editState = editState_;
+@synthesize editBox = editBox_;
+
+- (void)dealloc
+{
+    [textField_ resignFirstResponder];
+    [textField_ removeFromSuperview];
+    self.textField = NULL;
+    [super dealloc];
+}
+
+-(id) initWithFrame: (NSRect) frameRect editBox: (void*) editBox
+{
+    self = [super init];
+    
+    do
+    {
+        if (self == nil) break;
+        editState_ = NO;
+        self.textField = [[[CustomNSTextField alloc] initWithFrame: frameRect] autorelease];
+        if (!textField_) break;
+        [textField_ setTextColor:[NSColor whiteColor]];
+        textField_.font = [NSFont systemFontOfSize:frameRect.size.height*2/3]; //TODO need to delete hard code here.
+        textField_.backgroundColor = [NSColor clearColor];
+        [textField_ setup];
+        textField_.delegate = self;
+        [textField_ setDelegate:self];
+        self.editBox = editBox;
+        
+        [[EAGLView sharedEGLView] addSubview:textField_];
+        
+        return self;
+    }while(0);
+    
+    return nil;
+}
+
+-(void) doAnimationWhenKeyboardMoveWithDuration:(float)duration distance:(float)distance
+{
+    id eglView = [EAGLView sharedEGLView];
+    [eglView doAnimationWhenKeyboardMoveWithDuration:duration distance:distance];
+}
+
+-(void) setPosition:(NSPoint) pos
+{
+    NSRect frame = [textField_ frame];
+    frame.origin = pos;
+    [textField_ setFrame:frame];
+}
+
+-(void) setContentSize:(NSSize) size
+{
+    
+}
+
+-(void) visit
+{
+    
+}
+
+-(void) openKeyboard
+{
+    [textField_ becomeFirstResponder];
+}
+
+-(void) closeKeyboard
+{
+    [textField_ resignFirstResponder];
+    [textField_ removeFromSuperview];
+}
+
+- (BOOL)textFieldShouldReturn:(NSTextField *)sender
+{
+    if (sender == textField_) {
+        [sender resignFirstResponder];
+    }
+    return NO;
+}
+
+-(void)animationSelector
+{
+}
+
+- (BOOL)textFieldShouldBeginEditing:(NSTextField *)sender        // return NO to disallow editing.
+{
+    editState_ = YES;
+    cocos2d::extension::CCEditBoxDelegate* pDelegate = getEditBoxImplMac()->getDelegate();
+    if (pDelegate != NULL)
+    {
+        pDelegate->editBoxEditingDidBegin(getEditBoxImplMac()->getCCEditBox());
+    }
+    return YES;
+}
+
+- (BOOL)textFieldShouldEndEditing:(NSTextField *)sender
+{
+    editState_ = NO;
+    cocos2d::extension::CCEditBoxDelegate* pDelegate = getEditBoxImplMac()->getDelegate();
+    if (pDelegate != NULL)
+    {
+        pDelegate->editBoxEditingDidEnd(getEditBoxImplMac()->getCCEditBox());
+        pDelegate->editBoxReturn(getEditBoxImplMac()->getCCEditBox());
+    }
+    return YES;
+}
+
+/**
+ * Delegate method called before the text has been changed.
+ * @param textField The text field containing the text.
+ * @param range The range of characters to be replaced.
+ * @param string The replacement string.
+ * @return YES if the specified text range should be replaced; otherwise, NO to keep the old text.
+ */
+- (BOOL)textField:(NSTextField *) textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
+{
+    if (getEditBoxImplMac()->getMaxLength() < 0)
+    {
+        return YES;
+    }
+    
+    NSUInteger oldLength = [[textField stringValue] length];
+    NSUInteger replacementLength = [string length];
+    NSUInteger rangeLength = range.length;
+    
+    NSUInteger newLength = oldLength - rangeLength + replacementLength;
+    
+    return newLength <= getEditBoxImplMac()->getMaxLength();
+}
+
+/**
+ * Called each time when the text field's text has changed.
+ */
+- (void)controlTextDidChange:(NSNotification *)notification
+{
+    cocos2d::extension::CCEditBoxDelegate* pDelegate = getEditBoxImplMac()->getDelegate();
+    if (pDelegate != NULL)
+    {
+        pDelegate->editBoxTextChanged(getEditBoxImplMac()->getCCEditBox(), getEditBoxImplMac()->getText());
+    }
+}
+
+@end
+
+NS_CC_EXT_BEGIN
+
+CCEditBoxImpl* __createSystemEditBox(CCEditBox* pEditBox)
+{
+    return new CCEditBoxImplMac(pEditBox);
+}
+
+#define GET_IMPL ((EditBoxImplMac*)m_pSysEdit)
+
+CCEditBoxImplMac::CCEditBoxImplMac(CCEditBox* pEditText)
+    : CCEditBoxImpl(pEditText), m_pSysEdit(NULL), m_nMaxTextLength(-1)
+{
+    //! TODO: Retina on Mac
+    //! m_bInRetinaMode = [[EAGLView sharedEGLView] contentScaleFactor] == 2.0f ? true : false;
+    m_bInRetinaMode = false;
+}
+
+CCEditBoxImplMac::~CCEditBoxImplMac()
+{
+    [GET_IMPL release];
+}
+
+void CCEditBoxImplMac::doAnimationWhenKeyboardMove(float duration, float distance)
+{
+    if ([GET_IMPL isEditState] || distance < 0.0f)
+        [GET_IMPL doAnimationWhenKeyboardMoveWithDuration:duration distance:distance];
+}
+
+bool CCEditBoxImplMac::initWithSize(const CCSize& size)
+{
+    CCEGLViewProtocol* eglView = CCEGLView::sharedOpenGLView();
+
+    NSRect rect = NSMakeRect(0, 0, size.width * eglView->getScaleX(),size.height * eglView->getScaleY());
+
+    if (m_bInRetinaMode) {
+         rect.size.width /= 2.0f;
+         rect.size.height /= 2.0f;
+    }
+    
+    m_pSysEdit = [[EditBoxImplMac alloc] initWithFrame:rect editBox:this];
+    
+    if (!m_pSysEdit)
+        return false;
+    
+    return true;
+}
+
+void CCEditBoxImplMac::setFontColor(const ccColor3B& color)
+{
+    GET_IMPL.textField.textColor = [NSColor colorWithCalibratedRed:color.r / 255.0f green:color.g / 255.0f blue:color.b / 255.0f alpha:1.0f];
+}
+
+void CCEditBoxImplMac::setPlaceholderFontColor(const ccColor3B& color)
+{
+    // TODO need to be implemented.
+}
+
+void CCEditBoxImplMac::setInputMode(EditBoxInputMode inputMode)
+{
+}
+
+void CCEditBoxImplMac::setMaxLength(int maxLength)
+{
+    m_nMaxTextLength = maxLength;
+}
+
+int CCEditBoxImplMac::getMaxLength()
+{
+    return m_nMaxTextLength;
+}
+
+void CCEditBoxImplMac::setInputFlag(EditBoxInputFlag inputFlag)
+{
+    // TODO: NSSecureTextField
+}
+
+void CCEditBoxImplMac::setReturnType(KeyboardReturnType returnType)
+{
+}
+
+bool CCEditBoxImplMac::isEditing()
+{
+    return [GET_IMPL isEditState] ? true : false;
+}
+
+void CCEditBoxImplMac::setText(const char* pText)
+{
+    GET_IMPL.textField.stringValue = [NSString stringWithUTF8String:pText];
+}
+
+const char*  CCEditBoxImplMac::getText(void)
+{
+    return [GET_IMPL.textField.stringValue UTF8String];
+}
+
+void CCEditBoxImplMac::setPlaceHolder(const char* pText)
+{
+    [[GET_IMPL.textField cell] setPlaceholderString:[NSString stringWithUTF8String:pText]];
+}
+
+static NSPoint convertDesignCoordToScreenCoord(const CCPoint& designCoord, bool bInRetinaMode)
+{
+    CCEGLViewProtocol* eglView = CCEGLView::sharedOpenGLView();
+    //float viewH = (float)[[EAGLView sharedEGLView] getHeight];
+    
+    CCPoint visiblePos = ccp(designCoord.x * eglView->getScaleX(), designCoord.y * eglView->getScaleY());
+    CCPoint screenGLPos = ccpAdd(visiblePos, eglView->getViewPortRect().origin);
+    
+    NSPoint screenPos = NSMakePoint(screenGLPos.x, /*viewH -*/ screenGLPos.y);
+    
+    if (bInRetinaMode) {
+        screenPos.x = screenPos.x / 2.0f;
+        screenPos.y = screenPos.y / 2.0f;
+    }
+    
+    CCLOG("[EditBox] pos x = %f, y = %f", screenGLPos.x, screenGLPos.y);
+    return screenPos;
+}
+
+void CCEditBoxImplMac::setPosition(const CCPoint& newPos)
+{
+    CCPoint pos = newPos;
+    
+    //CCPoint pos = m_pEditBox->convertToWorldSpace(newPos);
+    
+    //CCPoint worldPoint = m_pEditBox->convertToWorldSpace(newPos);
+    //CCPoint pos = CCDirector::sharedDirector()->convertToUI(worldPoint);
+    
+    //TODO should consider anchor point, the default value is (0.5, 0,5)
+    NSRect frame = [GET_IMPL.textField frame];
+    CGFloat height = frame.size.height;
+    [GET_IMPL setPosition:convertDesignCoordToScreenCoord(ccp(pos.x-m_tContentSize.width/2, pos.y+m_tContentSize.height/2-height), m_bInRetinaMode)];
+}
+
+void CCEditBoxImplMac::setContentSize(const CCSize& size)
+{
+    m_tContentSize = size;
+    CCLOG("[Edit text] content size = (%f, %f)", size.width, size.height);
+}
+
+void CCEditBoxImplMac::visit(void)
+{
+    
+}
+
+void CCEditBoxImplMac::openKeyboard()
+{
+    [GET_IMPL openKeyboard];
+}
+
+void CCEditBoxImplMac::closeKeyboard()
+{
+    [GET_IMPL closeKeyboard];
+}
+
+NS_CC_EXT_END
+
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp b/samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
index 29cfa7bfd0..691f3599c6 100644
--- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
+++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
@@ -6,7 +6,7 @@
 #include "NetworkTest/HttpClientTest.h"
 #include "TableViewTest/TableViewTestScene.h"
 
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
 #include "EditBoxTest/EditBoxTest.h"
 #endif
 
@@ -22,7 +22,7 @@ enum
     TEST_CCCONTROLBUTTON,
     TEST_COCOSBUILDER,
     TEST_HTTPCLIENT,
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
     TEST_EDITBOX,
 #endif
 	TEST_TABLEVIEW,
@@ -35,7 +35,7 @@ static const std::string testsName[TEST_MAX_COUNT] =
     "CCControlButtonTest",
     "CocosBuilderTest",
     "HttpClientTest",
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
     "EditBoxTest",
 #endif
 	"TableViewTest"
@@ -107,7 +107,7 @@ void ExtensionsMainLayer::menuCallback(CCObject* pSender)
         }
         break;
 #endif
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
     case TEST_EDITBOX:
         {
             runEditBoxTest();
diff --git a/samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id b/samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id
index e14179b1f9..9f998e19e4 100644
--- a/samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id
@@ -1 +1 @@
-4e53e096b4a054e3817b30692cff2b40dafce521
\ No newline at end of file
+3d27ac9829ac45f2433d903b6b4f359a8e20636f
\ No newline at end of file