switch to inheriting from SampleView
git-svn-id: http://skia.googlecode.com/svn/trunk@1249 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleShaders.cpp b/samplecode/SampleShaders.cpp
index 86c8b17..c1bb0fd 100644
--- a/samplecode/SampleShaders.cpp
+++ b/samplecode/SampleShaders.cpp
@@ -40,13 +40,12 @@
return shader;
}
-class ShaderView : public SkView {
+class ShaderView : public SampleView {
public:
SkShader* fShader;
SkBitmap fBitmap;
- ShaderView()
- {
+ ShaderView() {
SkImageDecoder::DecodeFile("/skimages/logo.gif", &fBitmap);
SkPoint pts[2];
@@ -71,8 +70,7 @@
shaderB->unref();
mode->unref();
}
- virtual ~ShaderView()
- {
+ virtual ~ShaderView() {
SkSafeUnref(fShader);
}
@@ -86,16 +84,7 @@
return this->INHERITED::onQuery(evt);
}
- void drawBG(SkCanvas* canvas)
- {
-// canvas->drawColor(0xFFDDDDDD);
- canvas->drawColor(SK_ColorWHITE);
- }
-
- virtual void onDraw(SkCanvas* canvas)
- {
- this->drawBG(canvas);
-
+ virtual void onDrawContent(SkCanvas* canvas) {
canvas->drawBitmap(fBitmap, 0, 0);
canvas->translate(SkIntToScalar(20), SkIntToScalar(120));
@@ -125,19 +114,17 @@
canvas->drawRect(r, paint);
}
- virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y)
- {
+ virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y) {
this->inval(NULL);
return this->INHERITED::onFindClickHandler(x, y);
}
- virtual bool onClick(Click* click)
- {
+ virtual bool onClick(Click* click) {
return this->INHERITED::onClick(click);
}
private:
- typedef SkView INHERITED;
+ typedef SampleView INHERITED;
};
//////////////////////////////////////////////////////////////////////////////