mirror of https://github.com/axmolengine/axmol.git
Fixing errors on windows.
This commit is contained in:
parent
c2ce65a32b
commit
4e5ee103ec
|
@ -33,8 +33,8 @@ NS_CC_BEGIN
|
|||
//
|
||||
//------------------------------------------------------------------
|
||||
KeyboardDispatcher::KeyboardDispatcher()
|
||||
: _keyPressDelegate(NULL)
|
||||
, _keyReleaseDelegate(NULL)
|
||||
: _keyPressDelegate(nullptr)
|
||||
, _keyReleaseDelegate(nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -295,8 +295,8 @@ void Layer::setKeyboardEnabled(bool enabled)
|
|||
}
|
||||
else
|
||||
{
|
||||
pDirector->getKeyboardDispatcher()->setKeyPressDelegate(NULL);
|
||||
pDirector->getKeyboardDispatcher()->setKeyReleaseDelegate(NULL);
|
||||
pDirector->getKeyboardDispatcher()->setKeyPressDelegate(nullptr);
|
||||
pDirector->getKeyboardDispatcher()->setKeyReleaseDelegate(nullptr);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -172,6 +172,7 @@ xcopy /Y /Q "$(ProjectDir)..\platform\third_party\win32\libraries\*.*" "$(OutDir
|
|||
<ClCompile Include="..\actions\CCActionProgressTimer.cpp" />
|
||||
<ClCompile Include="..\actions\CCActionTiledGrid.cpp" />
|
||||
<ClCompile Include="..\actions\CCActionTween.cpp" />
|
||||
<ClCompile Include="..\keyboard_dispatcher\CCKeyboardDispatcher.cpp" />
|
||||
<ClCompile Include="..\label_nodes\CCLabelAtlas.cpp" />
|
||||
<ClCompile Include="..\label_nodes\CCLabelBMFont.cpp" />
|
||||
<ClCompile Include="..\label_nodes\CCLabelTTF.cpp" />
|
||||
|
@ -312,6 +313,7 @@ xcopy /Y /Q "$(ProjectDir)..\platform\third_party\win32\libraries\*.*" "$(OutDir
|
|||
<ClInclude Include="..\include\CCProtocols.h" />
|
||||
<ClInclude Include="..\include\ccTypes.h" />
|
||||
<ClInclude Include="..\include\cocos2d.h" />
|
||||
<ClInclude Include="..\keyboard_dispatcher\CCKeyboardDispatcher.h" />
|
||||
<ClInclude Include="..\label_nodes\CCLabelAtlas.h" />
|
||||
<ClInclude Include="..\label_nodes\CCLabelBMFont.h" />
|
||||
<ClInclude Include="..\label_nodes\CCLabelTTF.h" />
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue