diff options
| author |  tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-05 18:29:23 +0000 |
|---|---|---|
| committer | tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-05 18:29:23 +0000 |
| commit | 178b8e0b8c3d423c3fd947776f4b7790a0417582 (patch) | |
| tree | 7af83b4e825628022aad02e20dea7e767dd2a1a1 /include | |
| parent | 68a5b260e2045070ed0796af98624c3769f590c5 (diff) | |
Add SK_OVERRIDE where appropriate.
http://codereview.appspot.com/5734044/
git-svn-id: http://skia.googlecode.com/svn/trunk@3318 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/views/SkOSWindow_Unix.h | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/include/views/SkOSWindow_Unix.h b/include/views/SkOSWindow_Unix.h index d688fb5d7e..3b71af8330 100644 --- a/include/views/SkOSWindow_Unix.h +++ b/include/views/SkOSWindow_Unix.h @@ -1,4 +1,3 @@ - /* * Copyright 2006 The Android Open Source Project * @@ -6,15 +5,14 @@ * found in the LICENSE file. */ - #ifndef SkOSWindow_Unix_DEFINED #define SkOSWindow_Unix_DEFINED -#include "SkWindow.h" -#include <X11/Xlib.h> #include <GL/glx.h> +#include <X11/Xlib.h> + +#include "SkWindow.h" -class SkBitmap; class SkEvent; struct SkUnixWindow { @@ -45,26 +43,25 @@ public: //static bool WndProc(SkUnixWindow* w, XEvent &e); protected: - // overrides from SkWindow - virtual bool onEvent(const SkEvent&); - virtual void onHandleInval(const SkIRect&); - virtual bool onHandleChar(SkUnichar); - virtual bool onHandleKey(SkKey); - virtual bool onHandleKeyUp(SkKey); - virtual void onSetTitle(const char title[]); + // Overridden from from SkWindow: + virtual bool onEvent(const SkEvent&) SK_OVERRIDE; + virtual void onHandleInval(const SkIRect&) SK_OVERRIDE; + virtual bool onHandleChar(SkUnichar) SK_OVERRIDE; + virtual bool onHandleKey(SkKey) SK_OVERRIDE; + virtual bool onHandleKeyUp(SkKey) SK_OVERRIDE; + virtual void onSetTitle(const char title[]) SK_OVERRIDE; private: - SkUnixWindow fUnixWindow; + void doPaint(); + void mapWindowAndWait(); + + SkUnixWindow fUnixWindow; bool fGLAttached; // Needed for GL XVisualInfo* fVi; - void doPaint(); - void mapWindowAndWait(); - typedef SkWindow INHERITED; }; #endif - |