From daa29752dba6a5ccbac50232168e5fdaddd7bb34 Mon Sep 17 00:00:00 2001 From: mogemimi Date: Mon, 12 Oct 2015 13:54:06 +0900 Subject: [PATCH] Fix typo in UIEditBox --- cocos/ui/UIEditBox/UIEditBox.cpp | 2 +- cocos/ui/UIEditBox/UIEditBox.h | 2 +- cocos/ui/UIEditBox/UIEditBoxImpl-common.cpp | 2 +- cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm | 4 ++-- cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp | 4 ++-- cocos/ui/UIEditBox/UIEditBoxImpl-winrt.cpp | 2 +- cocos/ui/UIEditBox/iOS/CCUIEditBoxIOS.mm | 4 ++-- cocos/ui/UILayoutComponent.cpp | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cocos/ui/UIEditBox/UIEditBox.cpp b/cocos/ui/UIEditBox/UIEditBox.cpp index 0c8d06ebb0..32e4c708df 100644 --- a/cocos/ui/UIEditBox/UIEditBox.cpp +++ b/cocos/ui/UIEditBox/UIEditBox.cpp @@ -36,7 +36,7 @@ EditBox::EditBox(void) : _editBoxImpl(nullptr) , _delegate(nullptr) , _editBoxInputMode(EditBox::InputMode::SINGLE_LINE) -, _editBoxInputFlag(EditBox::InputFlag::INTIAL_CAPS_ALL_CHARACTERS) +, _editBoxInputFlag(EditBox::InputFlag::INITIAL_CAPS_ALL_CHARACTERS) , _keyboardReturnType(KeyboardReturnType::DEFAULT) , _backgroundSprite(nullptr) , _fontSize(-1) diff --git a/cocos/ui/UIEditBox/UIEditBox.h b/cocos/ui/UIEditBox/UIEditBox.h index 8b48c109b5..bd615b682c 100644 --- a/cocos/ui/UIEditBox/UIEditBox.h +++ b/cocos/ui/UIEditBox/UIEditBox.h @@ -184,7 +184,7 @@ namespace ui { /** * Capitalize all characters automatically. */ - INTIAL_CAPS_ALL_CHARACTERS, + INITIAL_CAPS_ALL_CHARACTERS, }; /** diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-common.cpp b/cocos/ui/UIEditBox/UIEditBoxImpl-common.cpp index 69afca8d48..c44dec4468 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-common.cpp +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-common.cpp @@ -43,7 +43,7 @@ EditBoxImplCommon::EditBoxImplCommon(EditBox* pEditText) , _label(nullptr) , _labelPlaceHolder(nullptr) , _editBoxInputMode(EditBox::InputMode::SINGLE_LINE) -, _editBoxInputFlag(EditBox::InputFlag::INTIAL_CAPS_ALL_CHARACTERS) +, _editBoxInputFlag(EditBox::InputFlag::INITIAL_CAPS_ALL_CHARACTERS) , _keyboardReturnType(EditBox::KeyboardReturnType::DEFAULT) , _colText(Color3B::WHITE) , _colPlaceHolder(Color3B::GRAY) diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm b/cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm index 8b4d6a48e2..230a3e00b3 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm @@ -460,8 +460,8 @@ void EditBoxImplMac::setInputFlag(EditBox::InputFlag inputFlag) case EditBox::InputFlag::INITIAL_CAPS_SENTENCE: CCLOGWARN("INITIAL_CAPS_SENTENCE not implemented"); break; - case EditBox::InputFlag::INTIAL_CAPS_ALL_CHARACTERS: - CCLOGWARN("INTIAL_CAPS_ALL_CHARACTERS not implemented"); + case EditBox::InputFlag::INITIAL_CAPS_ALL_CHARACTERS: + CCLOGWARN("INITIAL_CAPS_ALL_CHARACTERS not implemented"); break; case EditBox::InputFlag::SENSITIVE: CCLOGWARN("SENSITIVE not implemented"); diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp b/cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp index e453fb15ad..a311ea0075 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp @@ -458,7 +458,7 @@ void CWin32InputBox::InitDialog() break; case cocos2d::ui::EditBox::InputFlag::INITIAL_CAPS_SENTENCE: 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. // 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); @@ -615,7 +615,7 @@ EditBoxImplWin::EditBoxImplWin(EditBox* pEditText) , _label(nullptr) , _labelPlaceHolder(nullptr) , _editBoxInputMode(EditBox::InputMode::SINGLE_LINE) -, _editBoxInputFlag(EditBox::InputFlag::INTIAL_CAPS_ALL_CHARACTERS) +, _editBoxInputFlag(EditBox::InputFlag::INITIAL_CAPS_ALL_CHARACTERS) , _keyboardReturnType(EditBox::KeyboardReturnType::DEFAULT) , _colText(Color3B::WHITE) , _colPlaceHolder(Color3B::GRAY) diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-winrt.cpp b/cocos/ui/UIEditBox/UIEditBoxImpl-winrt.cpp index ff0eb88361..7908a1dd86 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-winrt.cpp +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-winrt.cpp @@ -310,7 +310,7 @@ UIEditBoxImplWinrt::UIEditBoxImplWinrt( EditBox* pEditText ) , m_pLabel(NULL) , m_pLabelPlaceHolder(NULL) , 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_colText(Color3B::WHITE) , m_colPlaceHolder(Color3B::GRAY) diff --git a/cocos/ui/UIEditBox/iOS/CCUIEditBoxIOS.mm b/cocos/ui/UIEditBox/iOS/CCUIEditBoxIOS.mm index de35ea08d1..3ae14d64a5 100644 --- a/cocos/ui/UIEditBox/iOS/CCUIEditBoxIOS.mm +++ b/cocos/ui/UIEditBox/iOS/CCUIEditBoxIOS.mm @@ -57,7 +57,7 @@ _editState = NO; self.frameRect = frameRect; 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 createMultiLineTextField]; @@ -198,7 +198,7 @@ self.textInput.autocapitalizationType = UITextAutocapitalizationTypeSentences; break; - case cocos2d::ui::EditBox::InputFlag::INTIAL_CAPS_ALL_CHARACTERS: + case cocos2d::ui::EditBox::InputFlag::INITIAL_CAPS_ALL_CHARACTERS: self.textInput.autocapitalizationType = UITextAutocapitalizationTypeAllCharacters; break; diff --git a/cocos/ui/UILayoutComponent.cpp b/cocos/ui/UILayoutComponent.cpp index 50a01a7d85..56fbee58a7 100644 --- a/cocos/ui/UILayoutComponent.cpp +++ b/cocos/ui/UILayoutComponent.cpp @@ -86,7 +86,7 @@ namespace ui { break; } - //put layout component initalized code here + //put layout component initialized code here } while (0); return ret;