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
diff --git a/gyp/views.gyp b/gyp/views.gyp
index ec3fd79..db748c7 100644
--- a/gyp/views.gyp
+++ b/gyp/views.gyp
@@ -1,8 +1,8 @@
-#Views is the Skia windowing toolkit.
-#It provides
-# * a portable means of creating native windows
-# * events
-# * basic widgets and controls
+# Views is the Skia windowing toolkit.
+# It provides:
+# * A portable means of creating native windows.
+# * Events.
+# * Basic widgets and controls.
{
'targets': [
@@ -33,7 +33,6 @@
'../include/views/SkOSWindow_SDL.h',
'../include/views/SkOSWindow_Unix.h',
'../include/views/SkOSWindow_Win.h',
- #'../include/views/SkOSWindow_wxwidgets.h',
'../include/views/SkStackViewLayout.h',
'../include/views/SkSystemEventTypes.h',
'../include/views/SkTextBox.h',
@@ -62,19 +61,19 @@
'../src/views/SkWidgets.cpp',
'../src/views/SkWindow.cpp',
- #mac
+ # Mac
'../src/views/mac/SkOSWindow_Mac.mm',
'../src/views/mac/skia_mac.mm',
- #sdl
+ # SDL
'../src/views/SDL/SkOSWindow_SDL.cpp',
- #*nix
+ # *nix
'../src/views/unix/SkOSWindow_Unix.cpp',
'../src/views/unix/keysym2ucs.c',
'../src/views/unix/skia_unix.cpp',
- #windows
+ # Windows
'../src/views/win/SkOSWindow_win.cpp',
'../src/views/win/skia_win.cpp',
diff --git a/include/views/SkEvent.h b/include/views/SkEvent.h
index e11c157..bf0c011 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 @@
*/
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 @@
};
#endif
-
diff --git a/include/views/SkOSWindow_wxwidgets.h b/include/views/SkOSWindow_wxwidgets.h
deleted file mode 100644
index ad939b2..0000000
--- 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 a71bf4d..43561b0 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 @@
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 @@
#endif
#endif
-
diff --git a/src/utils/mac/SkBitmap_Mac.cpp b/src/utils/mac/SkBitmap_Mac.cpp
index 1f73f0f..151dc9b 100644
--- a/src/utils/mac/SkBitmap_Mac.cpp
+++ b/src/utils/mac/SkBitmap_Mac.cpp
@@ -1,15 +1,15 @@
-
/*
* Copyright 2011 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
+
#include "SkBitmap.h"
#include "SkColorPriv.h"
#include "SkMath.h"
-#if defined(SK_BUILD_FOR_MAC) && !defined(SK_USE_WXWIDGETS)
+#if defined(SK_BUILD_FOR_MAC)
#include <ApplicationServices/ApplicationServices.h>
diff --git a/src/views/mac/SkOSWindow_Mac.cpp b/src/views/mac/SkOSWindow_Mac.cpp
index ec10790..e6f3580 100644
--- a/src/views/mac/SkOSWindow_Mac.cpp
+++ b/src/views/mac/SkOSWindow_Mac.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
@@ -8,7 +7,7 @@
#include "SkTypes.h"
-#if defined(SK_BUILD_FOR_MAC) && !defined(SK_USE_WXWIDGETS)
+#if defined(SK_BUILD_FOR_MAC)
#include <AGL/agl.h>
@@ -541,4 +540,3 @@
}
#endif
-
diff --git a/src/views/mac/SkOSWindow_Mac.mm b/src/views/mac/SkOSWindow_Mac.mm
index e054a94..a288ae3 100644
--- a/src/views/mac/SkOSWindow_Mac.mm
+++ b/src/views/mac/SkOSWindow_Mac.mm
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
@@ -6,7 +5,7 @@
* found in the LICENSE file.
*/
-#if defined(SK_BUILD_FOR_MAC) && !defined(SK_USE_WXWIDGETS)
+#if defined(SK_BUILD_FOR_MAC)
#import <Cocoa/Cocoa.h>
#include "SkOSWindow_Mac.h"