aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--include/views/SkEvent.h5
-rw-r--r--include/views/SkOSWindow_Unix.h2
2 files changed, 1 insertions, 6 deletions
diff --git a/include/views/SkEvent.h b/include/views/SkEvent.h
index bf0c011073..f4df4482bf 100644
--- a/include/views/SkEvent.h
+++ b/include/views/SkEvent.h
@@ -256,11 +256,8 @@ public:
*/
static void SignalQueueTimer(SkMSec delay);
-#ifdef SK_BUILD_FOR_WIN
+#if defined(SK_BUILD_FOR_WIN)
static bool WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
-#elif defined(SK_BUILD_FOR_UNIXx)
- static uint32_t HandleTimer(uint32_t, void*);
- static bool WndProc(Display*, Window, XEvent&);
#endif
private:
diff --git a/include/views/SkOSWindow_Unix.h b/include/views/SkOSWindow_Unix.h
index d9675799d2..f1a4698668 100644
--- a/include/views/SkOSWindow_Unix.h
+++ b/include/views/SkOSWindow_Unix.h
@@ -47,8 +47,6 @@ public:
//static bool PostEvent(SkEvent* evt, SkEventSinkID, SkMSec delay);
- //static bool WndProc(SkUnixWindow* w, XEvent &e);
-
protected:
// Overridden from from SkWindow:
virtual bool onEvent(const SkEvent&) SK_OVERRIDE;