From 76689cda1a99b2a69684d32f4b35c14e83420522 Mon Sep 17 00:00:00 2001 From: Dhilan007 Date: Wed, 9 Apr 2014 21:40:10 +0800 Subject: [PATCH] fixed compile errors. --- extensions/GUI/CCEditBox/CCEditBoxImplAndroid.cpp | 6 +++--- extensions/GUI/CCEditBox/CCEditBoxImplIOS.mm | 4 ++-- extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplAndroid.cpp b/extensions/GUI/CCEditBox/CCEditBoxImplAndroid.cpp index f46499e44c..29438c81f0 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplAndroid.cpp +++ b/extensions/GUI/CCEditBox/CCEditBoxImplAndroid.cpp @@ -92,12 +92,12 @@ bool EditBoxImplAndroid::initWithSize(const Size& size) void EditBoxImplAndroid::setFont(const char* pFontName, int fontSize) { if(_label != NULL) { - _label->setFontName(pFontName); + _label->setFont(pFontName); _label->setFontSize(fontSize); } if(_labelPlaceHolder != NULL) { - _labelPlaceHolder->setFontName(pFontName); + _labelPlaceHolder->setFont(pFontName); _labelPlaceHolder->setFontSize(fontSize); } } @@ -111,7 +111,7 @@ void EditBoxImplAndroid::setFontColor(const Color3B& color) void EditBoxImplAndroid::setPlaceholderFont(const char* pFontName, int fontSize) { if(_labelPlaceHolder != NULL) { - _labelPlaceHolder->setFontName(pFontName); + _labelPlaceHolder->setFont(pFontName); _labelPlaceHolder->setFontSize(fontSize); } } diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplIOS.mm b/extensions/GUI/CCEditBox/CCEditBoxImplIOS.mm index d2ba95be02..264a3efb24 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplIOS.mm +++ b/extensions/GUI/CCEditBox/CCEditBoxImplIOS.mm @@ -395,9 +395,9 @@ void EditBoxImplIOS::setFont(const char* pFontName, int fontSize) [_systemControl.textField setFont:textFont]; } - _label->setFontName(pFontName); + _label->setFont(pFontName); _label->setFontSize(fontSize); - _labelPlaceHolder->setFontName(pFontName); + _labelPlaceHolder->setFont(pFontName); _labelPlaceHolder->setFontSize(fontSize); } diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp b/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp index 167967e312..a16f47e87d 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp +++ b/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp @@ -118,12 +118,12 @@ bool CCEditBoxImplWp8::initWithSize( const Size& size ) void CCEditBoxImplWp8::setFont( const char* pFontName, int fontSize ) { if(m_pLabel != NULL) { - m_pLabel->setFontName(pFontName); + m_pLabel->setFont(pFontName); m_pLabel->setFontSize(fontSize); } if(m_pLabelPlaceHolder != NULL) { - m_pLabelPlaceHolder->setFontName(pFontName); + m_pLabelPlaceHolder->setFont(pFontName); m_pLabelPlaceHolder->setFontSize(fontSize); } } @@ -137,7 +137,7 @@ void CCEditBoxImplWp8::setFontColor( const Color3B& color ) void CCEditBoxImplWp8::setPlaceholderFont( const char* pFontName, int fontSize ) { if(m_pLabelPlaceHolder != NULL) { - m_pLabelPlaceHolder->setFontName(pFontName); + m_pLabelPlaceHolder->setFont(pFontName); m_pLabelPlaceHolder->setFontSize(fontSize); } }