diff --git a/cocos2dx/platform/win32/CCEGLView.cpp b/cocos2dx/platform/win32/CCEGLView.cpp index 9421dd127e..36a6e6bf1b 100644 --- a/cocos2dx/platform/win32/CCEGLView.cpp +++ b/cocos2dx/platform/win32/CCEGLView.cpp @@ -30,7 +30,6 @@ THE SOFTWARE. #include "touch_dispatcher/CCTouchDispatcher.h" #include "text_input_node/CCIMEDispatcher.h" #include "keypad_dispatcher/CCKeypadDispatcher.h" -#include "support/CCPointExtension.h" #include "CCApplication.h" #ifdef CC_KEYBOARD_SUPPORT #include "keyboard_dispatcher/CCKeyboardDispatcher.h" @@ -352,8 +351,8 @@ LRESULT EGLView::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) Point pt(point.x, point.y); pt.x /= _frameZoomFactor; pt.y /= _frameZoomFactor; - Point tmp = ccp(pt.x, _screenSize.height - pt.y); - if (_viewPortRect.equals(RectZero) || _viewPortRect.containsPoint(tmp)) + Point tmp = Point(pt.x, _screenSize.height - pt.y); + if (_viewPortRect.equals(Rect::ZERO) || _viewPortRect.containsPoint(tmp)) { _captured = true; SetCapture(_wnd); @@ -415,8 +414,8 @@ LRESULT EGLView::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) input.y = TOUCH_COORD_TO_PIXEL(ti.y); ScreenToClient(_wnd, &input); Point pt(input.x, input.y); - Point tmp = ccp(pt.x, _screenSize.height - pt.y); - if (_viewPortRect.equals(RectZero) || _viewPortRect.containsPoint(tmp)) + Point tmp = Point(pt.x, _screenSize.height - pt.y); + if (_viewPortRect.equals(Rect::ZERO) || _viewPortRect.containsPoint(tmp)) { pt.x /= _frameZoomFactor; pt.y /= _frameZoomFactor; diff --git a/cocos2dx/proj.win32/cocos2d.vcxproj b/cocos2dx/proj.win32/cocos2d.vcxproj index 7aba1892f4..527e02814e 100644 --- a/cocos2dx/proj.win32/cocos2d.vcxproj +++ b/cocos2dx/proj.win32/cocos2d.vcxproj @@ -217,7 +217,6 @@ xcopy /Y /Q "$(ProjectDir)..\platform\third_party\win32\libraries\*.*" "$(OutDir - @@ -308,6 +307,7 @@ xcopy /Y /Q "$(ProjectDir)..\platform\third_party\win32\libraries\*.*" "$(OutDir + @@ -379,7 +379,6 @@ xcopy /Y /Q "$(ProjectDir)..\platform\third_party\win32\libraries\*.*" "$(OutDir - diff --git a/cocos2dx/proj.win32/cocos2d.vcxproj.filters b/cocos2dx/proj.win32/cocos2d.vcxproj.filters index 4342641386..06fa35bab2 100644 --- a/cocos2dx/proj.win32/cocos2d.vcxproj.filters +++ b/cocos2dx/proj.win32/cocos2d.vcxproj.filters @@ -297,9 +297,6 @@ support - - support - support @@ -720,9 +717,6 @@ support - - support - support @@ -971,5 +965,8 @@ keyboard_dispatcher + + include + \ No newline at end of file