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

issue #2404:fixed some compiling errors

This commit is contained in:
minggo 2013-07-15 17:29:35 +08:00
parent 07ae0c6da2
commit dc2daf31ea
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cocos2dx/platform/win32/CCEGLView.cpp
View File

@ -30,7 +30,6 @@ THE SOFTWARE.
#include "touch_dispatcher/CCTouchDispatcher.h" #include "touch_dispatcher/CCTouchDispatcher.h"
#include "text_input_node/CCIMEDispatcher.h" #include "text_input_node/CCIMEDispatcher.h"
#include "keypad_dispatcher/CCKeypadDispatcher.h" #include "keypad_dispatcher/CCKeypadDispatcher.h"
#include "support/CCPointExtension.h"
#include "CCApplication.h" #include "CCApplication.h"
#ifdef CC_KEYBOARD_SUPPORT #ifdef CC_KEYBOARD_SUPPORT
#include "keyboard_dispatcher/CCKeyboardDispatcher.h" #include "keyboard_dispatcher/CCKeyboardDispatcher.h"
@ -352,8 +351,8 @@ LRESULT EGLView::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
Point pt(point.x, point.y); Point pt(point.x, point.y);
pt.x /= _frameZoomFactor; pt.x /= _frameZoomFactor;
pt.y /= _frameZoomFactor; pt.y /= _frameZoomFactor;
Point tmp = ccp(pt.x, _screenSize.height - pt.y); Point tmp = Point(pt.x, _screenSize.height - pt.y);
if (_viewPortRect.equals(RectZero) || _viewPortRect.containsPoint(tmp)) if (_viewPortRect.equals(Rect::ZERO) || _viewPortRect.containsPoint(tmp))
{ {
_captured = true; _captured = true;
SetCapture(_wnd); SetCapture(_wnd);
@ -415,8 +414,8 @@ LRESULT EGLView::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
input.y = TOUCH_COORD_TO_PIXEL(ti.y); input.y = TOUCH_COORD_TO_PIXEL(ti.y);
ScreenToClient(_wnd, &input); ScreenToClient(_wnd, &input);
Point pt(input.x, input.y); Point pt(input.x, input.y);
Point tmp = ccp(pt.x, _screenSize.height - pt.y); Point tmp = Point(pt.x, _screenSize.height - pt.y);
if (_viewPortRect.equals(RectZero) || _viewPortRect.containsPoint(tmp)) if (_viewPortRect.equals(Rect::ZERO) || _viewPortRect.containsPoint(tmp))
{ {
pt.x /= _frameZoomFactor; pt.x /= _frameZoomFactor;
pt.y /= _frameZoomFactor; pt.y /= _frameZoomFactor;