From e10db2f22e50b6f575b921f6d3e2d363c2af46b6 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Wed, 7 Oct 2015 18:27:30 +0800
Subject: [PATCH] oleview: Correctly set window's class background and cursor.

Otherwise background of some windows doesn't match current theme, and
mouse cursor sometimes gets stuck after moving over vertical splitter.

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
---
 programs/oleview/details.c | 3 ++-
 programs/oleview/oleview.c | 1 +
 programs/oleview/pane.c    | 3 ++-
 programs/oleview/tree.c    | 2 ++
 programs/oleview/typelib.c | 1 +
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/programs/oleview/details.c b/programs/oleview/details.c
index 9fdd9f3ef20..49d3dc4a0c7 100644
--- a/programs/oleview/details.c
+++ b/programs/oleview/details.c
@@ -397,7 +397,8 @@ HWND CreateDetailsWindow(HINSTANCE hInst)
     memset(&wcd, 0, sizeof(WNDCLASSW));
     wcd.lpfnWndProc = DetailsProc;
     wcd.lpszClassName = wszDetailsClass;
-    wcd.hbrBackground = (HBRUSH)COLOR_WINDOW;
+    wcd.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
+    wcd.hCursor       = LoadCursorW(0, (LPCWSTR)IDC_ARROW);
 
     if(!RegisterClassW(&wcd)) return NULL;
 
diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c
index 69f4f9e7a0d..5a11888e54b 100644
--- a/programs/oleview/oleview.c
+++ b/programs/oleview/oleview.c
@@ -499,6 +499,7 @@ static BOOL InitApplication(HINSTANCE hInst)
     memset(&wc, 0, sizeof(WNDCLASSW));
     wc.lpfnWndProc = WndProc;
     wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
+    wc.hCursor       = LoadCursorW(0, (LPCWSTR)IDC_ARROW);
     wc.lpszMenuName = MAKEINTRESOURCEW(IDM_MENU);
     wc.lpszClassName = wszAppName;
 
diff --git a/programs/oleview/pane.c b/programs/oleview/pane.c
index a96da4d8a11..9e4cd283759 100644
--- a/programs/oleview/pane.c
+++ b/programs/oleview/pane.c
@@ -135,7 +135,8 @@ BOOL PaneRegisterClassW(void)
 
     memset(&wcc, 0, sizeof(WNDCLASSW));
     wcc.lpfnWndProc = PaneProc;
-    wcc.hbrBackground = (HBRUSH)(COLOR_WINDOW);
+    wcc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
+    wcc.hCursor       = LoadCursorW(0, (LPCWSTR)IDC_ARROW);
     wcc.lpszClassName = wszPaneClass;
 
     if(!RegisterClassW(&wcc))
diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c
index 17844bf8bd2..4a1608132b1 100644
--- a/programs/oleview/tree.c
+++ b/programs/oleview/tree.c
@@ -703,6 +703,8 @@ HWND CreateTreeWindow(HINSTANCE hInst)
     memset(&wct, 0, sizeof(WNDCLASSW));
     wct.lpfnWndProc = TreeProc;
     wct.lpszClassName = wszTreeClass;
+    wct.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
+    wct.hCursor       = LoadCursorW(0, (LPCWSTR)IDC_ARROW);
 
     if(!RegisterClassW(&wct)) return NULL;
 
diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c
index d07dd3c8c2f..3a60348ed73 100644
--- a/programs/oleview/typelib.c
+++ b/programs/oleview/typelib.c
@@ -1628,6 +1628,7 @@ BOOL TypeLibRegisterClassW(void)
     memset(&wcc, 0, sizeof(WNDCLASSW));
     wcc.lpfnWndProc = TypeLibProc;
     wcc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
+    wcc.hCursor       = LoadCursorW(0, (LPCWSTR)IDC_ARROW);
     wcc.lpszMenuName = MAKEINTRESOURCEW(IDM_TYPELIB);
     wcc.lpszClassName = wszTypeLib;