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

Add SK_OVERRIDE where appropriate.

Browse Source 
http://codereview.appspot.com/5734044/



git-svn-id: http://skia.googlecode.com/svn/trunk@3318 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
tomhudson@google.com 2012-03-05 18:29:23 +00:00
parent 68a5b260e2
commit 178b8e0b8c
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/views/SkOSWindow_Unix.h
View File

@ -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