AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix win build

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@7084 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2013-01-08 16:22:44 +00:00
parent 4d5c26de0a
commit 72708fa18d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samplecode/OverView.cpp
View File

@ -49,11 +49,11 @@ protected:
virtual SkCanvas* beforeChildren(SkCanvas*) SK_OVERRIDE; virtual SkCanvas* beforeChildren(SkCanvas*) SK_OVERRIDE;
virtual bool onSendClickToChildren(SkScalar x, SkScalar y) SK_OVERRIDE { virtual bool onSendClickToChildren(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE {
return false; return false;
} }
virtual Click* onFindClickHandler(SkScalar x, SkScalar y) SK_OVERRIDE { virtual Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE {
int ix = (int)(SkScalarDiv(x * N, kWidth)); int ix = (int)(SkScalarDiv(x * N, kWidth));
int iy = (int)(SkScalarDiv(y * N, kHeight)); int iy = (int)(SkScalarDiv(y * N, kHeight));
if (ix >= 0 && iy >= 0) { if (ix >= 0 && iy >= 0) {

6
src/views/win/SkOSWindow_win.cpp
View File

@ -151,17 +151,17 @@ bool SkOSWindow::wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
this->handleClick(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), this->handleClick(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam),
Click::kDown_State, getModifiers(message)); Click::kDown_State, NULL, getModifiers(message));
return true; return true;
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
this->handleClick(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), this->handleClick(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam),
Click::kMoved_State, getModifiers(message)); Click::kMoved_State, NULL, getModifiers(message));
return true; return true;
case WM_LBUTTONUP: case WM_LBUTTONUP:
this->handleClick(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), this->handleClick(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam),
Click::kUp_State, getModifiers(message)); Click::kUp_State, NULL, getModifiers(message));
return true; return true;
case WM_EVENT_CALLBACK: case WM_EVENT_CALLBACK: