diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-08 16:22:44 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-08 16:22:44 +0000 |
| commit | 72708fa18d23ff9d97b90c98a4ead6717045c8c6 (patch) | |
| tree | c4dad88ab7b3272185977243d982b405f20c4a72 | |
| parent | 4d5c26de0a24f86c37c1da8b0e30d11a550ea67b (diff) | |
fix win build
git-svn-id: http://skia.googlecode.com/svn/trunk@7084 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | samplecode/OverView.cpp | 4 | ||||
| -rw-r--r-- | src/views/win/SkOSWindow_win.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/samplecode/OverView.cpp b/samplecode/OverView.cpp index f170bdbcad..3b7183e85a 100644 --- a/samplecode/OverView.cpp +++ b/samplecode/OverView.cpp @@ -49,11 +49,11 @@ protected: 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; } - 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 iy = (int)(SkScalarDiv(y * N, kHeight)); if (ix >= 0 && iy >= 0) { diff --git a/src/views/win/SkOSWindow_win.cpp b/src/views/win/SkOSWindow_win.cpp index 5ae00cbc48..9267a9583e 100644 --- a/src/views/win/SkOSWindow_win.cpp +++ b/src/views/win/SkOSWindow_win.cpp @@ -151,17 +151,17 @@ bool SkOSWindow::wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case WM_LBUTTONDOWN: this->handleClick(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), - Click::kDown_State, getModifiers(message)); + Click::kDown_State, NULL, getModifiers(message)); return true; case WM_MOUSEMOVE: this->handleClick(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), - Click::kMoved_State, getModifiers(message)); + Click::kMoved_State, NULL, getModifiers(message)); return true; case WM_LBUTTONUP: this->handleClick(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), - Click::kUp_State, getModifiers(message)); + Click::kUp_State, NULL, getModifiers(message)); return true; case WM_EVENT_CALLBACK: |