pass modifier keys to click events (e.g. control | shift etc.)
Review URL: https://codereview.appspot.com/7062054
git-svn-id: http://skia.googlecode.com/svn/trunk@7082 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleApp.h b/samplecode/SampleApp.h
index 2308a12..ecf552c 100644
--- a/samplecode/SampleApp.h
+++ b/samplecode/SampleApp.h
@@ -119,22 +119,24 @@
DeviceType getDeviceType() const { return fDeviceType; }
protected:
- virtual void onDraw(SkCanvas* canvas);
- virtual bool onHandleKey(SkKey key);
- virtual bool onHandleChar(SkUnichar);
- virtual void onSizeChange();
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE;
+ virtual bool onHandleKey(SkKey key) SK_OVERRIDE;
+ virtual bool onHandleChar(SkUnichar) SK_OVERRIDE;
+ virtual void onSizeChange() SK_OVERRIDE;
- virtual SkCanvas* beforeChildren(SkCanvas*);
- virtual void afterChildren(SkCanvas*);
- virtual void beforeChild(SkView* child, SkCanvas* canvas);
- virtual void afterChild(SkView* child, SkCanvas* canvas);
+ virtual SkCanvas* beforeChildren(SkCanvas*) SK_OVERRIDE;
+ virtual void afterChildren(SkCanvas*) SK_OVERRIDE;
+ virtual void beforeChild(SkView* child, SkCanvas* canvas) SK_OVERRIDE;
+ virtual void afterChild(SkView* child, SkCanvas* canvas) SK_OVERRIDE;
- virtual bool onEvent(const SkEvent& evt);
- virtual bool onQuery(SkEvent* evt);
+ virtual bool onEvent(const SkEvent& evt) SK_OVERRIDE;
+ virtual bool onQuery(SkEvent* evt) SK_OVERRIDE;
- virtual bool onDispatchClick(int x, int y, Click::State, void* owner);
- virtual bool onClick(Click* click);
- virtual Click* onFindClickHandler(SkScalar x, SkScalar y);
+ virtual bool onDispatchClick(int x, int y, Click::State, void* owner,
+ unsigned modi) SK_OVERRIDE;
+ virtual bool onClick(Click* click) SK_OVERRIDE;
+ virtual Click* onFindClickHandler(SkScalar x, SkScalar y,
+ unsigned modi) SK_OVERRIDE;
void registerPictFileSamples(char** argv, int argc);
void registerPictFileSample(char** argv, int argc);