Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed compile errors.

This commit is contained in:
Dhilan007 2014-04-09 21:40:10 +08:00
parent 67652357e1
commit 76689cda1a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/GUI/CCEditBox/CCEditBoxImplAndroid.cpp
View File

@ -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);
}
}

4
extensions/GUI/CCEditBox/CCEditBoxImplIOS.mm
View File

@ -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);
}

6
extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp
View File

@ -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);
}
}