diff options
| author |  tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-27 13:44:57 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-27 13:44:57 +0000 |
| commit | e229e92ea51e9bc7c11033e2099d3ef275621115 (patch) | |
| tree | 4aa758087b36ce283a7877ac230ad2891c773de4 /include/views | |
| parent | bacfcfb11cd0d869cc345795d5f3635aab7c50b6 (diff) | |
Remove deprecated SkOSWindow_wxwidgets.h
It seems we never really supported WxWidgets.
R=bsalomon@google.com
Review URL: https://codereview.appspot.com/6569062
git-svn-id: http://skia.googlecode.com/svn/trunk@5708 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/views')
| -rw-r--r-- | include/views/SkEvent.h | 8 | ||||
| -rw-r--r-- | include/views/SkOSWindow_wxwidgets.h | 35 | ||||
| -rw-r--r-- | include/views/SkWindow.h | 9 |
3 files changed, 2 insertions, 50 deletions
diff --git a/include/views/SkEvent.h b/include/views/SkEvent.h index e11c1573d2..bf0c011073 100644 --- a/include/views/SkEvent.h +++ b/include/views/SkEvent.h @@ -1,4 +1,3 @@ - /* * Copyright 2006 The Android Open Source Project * @@ -6,7 +5,6 @@ * found in the LICENSE file. */ - #ifndef SkEvent_DEFINED #define SkEvent_DEFINED @@ -258,17 +256,12 @@ public: */ static void SignalQueueTimer(SkMSec delay); -#ifndef SK_USE_WXWIDGETS #ifdef 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 -#else - // Don't know yet what this will be - //static bool CustomEvent(); -#endif private: SkMetaData fMeta; @@ -292,4 +285,3 @@ private: }; #endif - diff --git a/include/views/SkOSWindow_wxwidgets.h b/include/views/SkOSWindow_wxwidgets.h deleted file mode 100644 index ad939b2865..0000000000 --- a/include/views/SkOSWindow_wxwidgets.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2006 The Android Open Source Project - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef SkOSWindow_wxwidgets_DEFINED -#define SkOSWindow_wxwidgets_DEFINED - -#include "SkWindow.h" -#include "wx/frame.h" - -class SkOSWindow: public SkWindow -{ -public: - SkOSWindow(); - SkOSWindow(const wxString& title, int x, int y, int width, int height); - ~SkOSWindow(); - - wxFrame* getWXFrame() const { return fFrame; } - - void updateSize(); - -protected: - virtual void onHandleInval(const SkIRect&); - virtual void onAddMenu(const SkOSMenu*); - -private: - wxFrame* fFrame; - typedef SkWindow INHERITED; - -}; - -#endifpedef SkWindow INHERITED; diff --git a/include/views/SkWindow.h b/include/views/SkWindow.h index a71bf4d7dc..43561b0248 100644 --- a/include/views/SkWindow.h +++ b/include/views/SkWindow.h @@ -1,4 +1,3 @@ - /* * Copyright 2006 The Android Open Source Project * @@ -6,7 +5,6 @@ * found in the LICENSE file. */ - #ifndef SkWindow_DEFINED #define SkWindow_DEFINED @@ -100,11 +98,9 @@ private: typedef SkView INHERITED; }; -/////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// -#ifdef SK_USE_WXWIDGETS - #include "SkOSWindow_wxwidgets.h" -#elif defined(SK_BUILD_FOR_MAC) +#if defined(SK_BUILD_FOR_MAC) #include "SkOSWindow_Mac.h" #elif defined(SK_BUILD_FOR_WIN) #include "SkOSWindow_Win.h" @@ -119,4 +115,3 @@ private: #endif #endif - |