summaryrefslogtreecommitdiffstats
path: root/views/window
diff options
context:
space:
mode:
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-27 03:48:14 +0000
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-27 03:48:14 +0000
commit5c3039618c8877b29712a5aececb99f8b4a4dd41 (patch)
tree190f9e93f7e06cecd0c9c7164e73624bd681f658 /views/window
parente82f366761fe478f9ba29179be26937a8a376e83 (diff)
downloadchromium_src-5c3039618c8877b29712a5aececb99f8b4a4dd41.zip
chromium_src-5c3039618c8877b29712a5aececb99f8b4a4dd41.tar.gz
chromium_src-5c3039618c8877b29712a5aececb99f8b4a4dd41.tar.bz2
Scrap WNDCLASSEX.hCursor, update GetCursorForPoint.
Default to Win arrow in View::GetCursorForPoint & RootView::UpdateCursor. Simplify WidgetWin::SetCursor, avoid sending NULL. Only SetCuror on client events (DWM handles non-client). RIP TextButtonWithHandCursorOver (r57652 through r64531). RIP WindowWin::InitClass & |resize_cursors_|. Add OVERRIDE specifiers liberally. BUG=35356 TEST=Cursor styles shown in Win & Linux toolkit_views. Review URL: http://codereview.chromium.org/6880201 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83123 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
-rw-r--r--views/window/window_win.cc15
-rw-r--r--views/window/window_win.h7
2 files changed, 0 insertions, 22 deletions
diff --git a/views/window/window_win.cc b/views/window/window_win.cc
index 76b8617..a1f0218 100644
--- a/views/window/window_win.cc
+++ b/views/window/window_win.cc
@@ -230,8 +230,6 @@ class WindowWin::ScopedRedrawLock {
WindowWin* window_;
};
-HCURSOR WindowWin::resize_cursors_[6];
-
////////////////////////////////////////////////////////////////////////////////
// WindowWin, public:
@@ -316,7 +314,6 @@ WindowWin::WindowWin(WindowDelegate* window_delegate)
is_in_size_move_(false) {
SetNativeWindow(this);
is_window_ = true;
- InitClass();
// Initialize these values to 0 so that subclasses can override the default
// behavior before calling Init.
set_window_style(0);
@@ -1342,18 +1339,6 @@ void WindowWin::ExecuteSystemMenuCommand(int command) {
SendMessage(GetNativeView(), WM_SYSCOMMAND, command, 0);
}
-void WindowWin::InitClass() {
- static bool initialized = false;
- if (!initialized) {
- resize_cursors_[RC_NORMAL] = LoadCursor(NULL, IDC_ARROW);
- resize_cursors_[RC_VERTICAL] = LoadCursor(NULL, IDC_SIZENS);
- resize_cursors_[RC_HORIZONTAL] = LoadCursor(NULL, IDC_SIZEWE);
- resize_cursors_[RC_NESW] = LoadCursor(NULL, IDC_SIZENESW);
- resize_cursors_[RC_NWSE] = LoadCursor(NULL, IDC_SIZENWSE);
- initialized = true;
- }
-}
-
namespace {
BOOL CALLBACK WindowCallbackProc(HWND hwnd, LPARAM lParam) {
NativeWidget* native_widget =
diff --git a/views/window/window_win.h b/views/window/window_win.h
index cf279f6..f998d31 100644
--- a/views/window/window_win.h
+++ b/views/window/window_win.h
@@ -213,13 +213,6 @@ class WindowWin : public WidgetWin,
// Executes the specified SC_command.
void ExecuteSystemMenuCommand(int command);
- // Static resource initialization.
- static void InitClass();
- enum ResizeCursor {
- RC_NORMAL = 0, RC_VERTICAL, RC_HORIZONTAL, RC_NESW, RC_NWSE
- };
- static HCURSOR resize_cursors_[6];
-
// A delegate implementation that handles events received here.
internal::NativeWindowDelegate* delegate_;