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

Merge pull request #14115 from mogemimi/fix-typo 

Fix typo in UIEditBox
This commit is contained in:
pandamicro 2015-10-12 13:45:47 +08:00
parent f2e3a0c071 daa29752db
commit 547e2f15a1
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/ui/UIEditBox/UIEditBox.cpp
View File

@ -36,7 +36,7 @@ EditBox::EditBox(void)
: _editBoxImpl(nullptr) : _editBoxImpl(nullptr)
, _delegate(nullptr) , _delegate(nullptr)
, _editBoxInputMode(EditBox::InputMode::SINGLE_LINE) , _editBoxInputMode(EditBox::InputMode::SINGLE_LINE)
, _editBoxInputFlag(EditBox::InputFlag::INTIAL_CAPS_ALL_CHARACTERS) , _editBoxInputFlag(EditBox::InputFlag::INITIAL_CAPS_ALL_CHARACTERS)
, _keyboardReturnType(KeyboardReturnType::DEFAULT) , _keyboardReturnType(KeyboardReturnType::DEFAULT)
, _backgroundSprite(nullptr) , _backgroundSprite(nullptr)
, _fontSize(-1) , _fontSize(-1)

2
cocos/ui/UIEditBox/UIEditBox.h
View File

@ -184,7 +184,7 @@ namespace ui {
/** /**
* Capitalize all characters automatically. * Capitalize all characters automatically.
*/ */
INTIAL_CAPS_ALL_CHARACTERS, INITIAL_CAPS_ALL_CHARACTERS,
}; };
/** /**

2
cocos/ui/UIEditBox/UIEditBoxImpl-common.cpp
View File

@ -43,7 +43,7 @@ EditBoxImplCommon::EditBoxImplCommon(EditBox* pEditText)
, _label(nullptr) , _label(nullptr)
, _labelPlaceHolder(nullptr) , _labelPlaceHolder(nullptr)
, _editBoxInputMode(EditBox::InputMode::SINGLE_LINE) , _editBoxInputMode(EditBox::InputMode::SINGLE_LINE)
, _editBoxInputFlag(EditBox::InputFlag::INTIAL_CAPS_ALL_CHARACTERS) , _editBoxInputFlag(EditBox::InputFlag::INITIAL_CAPS_ALL_CHARACTERS)
, _keyboardReturnType(EditBox::KeyboardReturnType::DEFAULT) , _keyboardReturnType(EditBox::KeyboardReturnType::DEFAULT)
, _colText(Color3B::WHITE) , _colText(Color3B::WHITE)
, _colPlaceHolder(Color3B::GRAY) , _colPlaceHolder(Color3B::GRAY)

4
cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm
View File

@ -460,8 +460,8 @@ void EditBoxImplMac::setInputFlag(EditBox::InputFlag inputFlag)
case EditBox::InputFlag::INITIAL_CAPS_SENTENCE: case EditBox::InputFlag::INITIAL_CAPS_SENTENCE:
CCLOGWARN("INITIAL_CAPS_SENTENCE not implemented"); CCLOGWARN("INITIAL_CAPS_SENTENCE not implemented");
break; break;
case EditBox::InputFlag::INTIAL_CAPS_ALL_CHARACTERS: case EditBox::InputFlag::INITIAL_CAPS_ALL_CHARACTERS:
CCLOGWARN("INTIAL_CAPS_ALL_CHARACTERS not implemented"); CCLOGWARN("INITIAL_CAPS_ALL_CHARACTERS not implemented");
break; break;
case EditBox::InputFlag::SENSITIVE: case EditBox::InputFlag::SENSITIVE:
CCLOGWARN("SENSITIVE not implemented"); CCLOGWARN("SENSITIVE not implemented");

4
cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp
View File

@ -458,7 +458,7 @@ void CWin32InputBox::InitDialog()
break; break;
case cocos2d::ui::EditBox::InputFlag::INITIAL_CAPS_SENTENCE: case cocos2d::ui::EditBox::InputFlag::INITIAL_CAPS_SENTENCE:
break; break;
case cocos2d::ui::EditBox::InputFlag::INTIAL_CAPS_ALL_CHARACTERS: case cocos2d::ui::EditBox::InputFlag::INITIAL_CAPS_ALL_CHARACTERS:
// Converts all characters to lowercase as they are typed into the edit control. // Converts all characters to lowercase as they are typed into the edit control.
// Please refer to https://msdn.microsoft.com/en-us/library/bb775464%28v=vs.85%29.aspx // Please refer to https://msdn.microsoft.com/en-us/library/bb775464%28v=vs.85%29.aspx
::SetWindowLongW(hwndEdit1, GWL_STYLE, ::GetWindowLongW(hwndEdit1, GWL_STYLE) | ES_UPPERCASE); ::SetWindowLongW(hwndEdit1, GWL_STYLE, ::GetWindowLongW(hwndEdit1, GWL_STYLE) | ES_UPPERCASE);
@ -615,7 +615,7 @@ EditBoxImplWin::EditBoxImplWin(EditBox* pEditText)
, _label(nullptr) , _label(nullptr)
, _labelPlaceHolder(nullptr) , _labelPlaceHolder(nullptr)
, _editBoxInputMode(EditBox::InputMode::SINGLE_LINE) , _editBoxInputMode(EditBox::InputMode::SINGLE_LINE)
, _editBoxInputFlag(EditBox::InputFlag::INTIAL_CAPS_ALL_CHARACTERS) , _editBoxInputFlag(EditBox::InputFlag::INITIAL_CAPS_ALL_CHARACTERS)
, _keyboardReturnType(EditBox::KeyboardReturnType::DEFAULT) , _keyboardReturnType(EditBox::KeyboardReturnType::DEFAULT)
, _colText(Color3B::WHITE) , _colText(Color3B::WHITE)
, _colPlaceHolder(Color3B::GRAY) , _colPlaceHolder(Color3B::GRAY)

2
cocos/ui/UIEditBox/UIEditBoxImpl-winrt.cpp
View File

@ -310,7 +310,7 @@ UIEditBoxImplWinrt::UIEditBoxImplWinrt( EditBox* pEditText )
, m_pLabel(NULL) , m_pLabel(NULL)
, m_pLabelPlaceHolder(NULL) , m_pLabelPlaceHolder(NULL)
, m_eEditBoxInputMode(EditBox::InputMode::SINGLE_LINE) , m_eEditBoxInputMode(EditBox::InputMode::SINGLE_LINE)
, m_eEditBoxInputFlag(EditBox::InputFlag::INTIAL_CAPS_ALL_CHARACTERS) , m_eEditBoxInputFlag(EditBox::InputFlag::INITIAL_CAPS_ALL_CHARACTERS)
, m_eKeyboardReturnType(EditBox::KeyboardReturnType::DEFAULT) , m_eKeyboardReturnType(EditBox::KeyboardReturnType::DEFAULT)
, m_colText(Color3B::WHITE) , m_colText(Color3B::WHITE)
, m_colPlaceHolder(Color3B::GRAY) , m_colPlaceHolder(Color3B::GRAY)

4
cocos/ui/UIEditBox/iOS/CCUIEditBoxIOS.mm
View File

@ -57,7 +57,7 @@
_editState = NO; _editState = NO;
self.frameRect = frameRect; self.frameRect = frameRect;
self.editBox = editBox; self.editBox = editBox;
self.dataInputMode = cocos2d::ui::EditBox::InputFlag::INTIAL_CAPS_ALL_CHARACTERS; self.dataInputMode = cocos2d::ui::EditBox::InputFlag::INITIAL_CAPS_ALL_CHARACTERS;
self.keyboardReturnType = cocos2d::ui::EditBox::KeyboardReturnType::DEFAULT; self.keyboardReturnType = cocos2d::ui::EditBox::KeyboardReturnType::DEFAULT;
[self createMultiLineTextField]; [self createMultiLineTextField];
@ -198,7 +198,7 @@
self.textInput.autocapitalizationType = UITextAutocapitalizationTypeSentences; self.textInput.autocapitalizationType = UITextAutocapitalizationTypeSentences;
break; break;
case cocos2d::ui::EditBox::InputFlag::INTIAL_CAPS_ALL_CHARACTERS: case cocos2d::ui::EditBox::InputFlag::INITIAL_CAPS_ALL_CHARACTERS:
self.textInput.autocapitalizationType = UITextAutocapitalizationTypeAllCharacters; self.textInput.autocapitalizationType = UITextAutocapitalizationTypeAllCharacters;
break; break;

2
cocos/ui/UILayoutComponent.cpp
View File

@ -86,7 +86,7 @@ namespace ui {
break; break;
} }
//put layout component initalized code here //put layout component initialized code here
} while (0); } while (0);
return ret; return ret;