From 53a589db394e21041bb8fcf79290b938bd8cf008 Mon Sep 17 00:00:00 2001
From: RaiKoHoff <rainer.kottenhoff@gmail.com>
Date: Thu, 17 Sep 2020 17:25:41 +0200
Subject: [PATCH] + fix: allow removing of compile pre-processing switch
 D_NP3_WIN10_DARK_MODE

---
 src/Config/Config.cpp     | 4 ++--
 src/DarkMode/DarkMode.cpp | 2 +-
 src/Helpers.h             | 6 ++++++
 src/Notepad3.c            | 8 ++++++--
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/Config/Config.cpp b/src/Config/Config.cpp
index 2a048202c..11618ad2b 100644
--- a/src/Config/Config.cpp
+++ b/src/Config/Config.cpp
@@ -1039,8 +1039,6 @@ extern "C" bool CreateIniFile(LPCWSTR pszIniFilePath, DWORD* pdwFileSize_out)
 //
 void LoadSettings()
 {
-  WCHAR wchBuffer[MIDSZ_BUFFER] = { L'\0' };
-
   CFG_VERSION const _ver = StrIsEmpty(Globals.IniFile) ? CFG_VER_CURRENT : CFG_VER_NONE;
 
   bool bDirtyFlag = false;  // do we have to save the file on done
@@ -1313,6 +1311,8 @@ void LoadSettings()
 
     unsigned int iValue = 0;
     WCHAR color[32] = { L'\0' };
+    WCHAR wchBuffer[MIDSZ_BUFFER] = { L'\0' };
+
     Defaults2.DarkModeBkgColor = rgbDarkBkgColorRef;
     StringCchPrintf(color, COUNTOF(color), L"%#08x", Defaults2.DarkModeBkgColor);
     IniSectionGetString(IniSecSettings2, L"DarkModeBkgColor", color, wchBuffer, COUNTOF(wchBuffer));
diff --git a/src/DarkMode/DarkMode.cpp b/src/DarkMode/DarkMode.cpp
index 56644d3ca..2852074d4 100644
--- a/src/DarkMode/DarkMode.cpp
+++ b/src/DarkMode/DarkMode.cpp
@@ -20,9 +20,9 @@
 
 #ifdef D_NP3_WIN10_DARK_MODE
 #include "IatHook.hpp"
-#include "ListViewUtil.hpp"
 #endif
 
+#include "ListViewUtil.hpp"
 
 // ============================================================================
 
diff --git a/src/Helpers.h b/src/Helpers.h
index 264831467..1cba17dc5 100644
--- a/src/Helpers.h
+++ b/src/Helpers.h
@@ -199,6 +199,7 @@ inline int SetModeBkColor(const HDC hdc, const bool bDarkMode) {
 #ifdef D_NP3_WIN10_DARK_MODE
   return SetBkColor(hdc, bDarkMode ? Settings2.DarkModeBkgColor : GetSysColor(COLOR_WINDOW));
 #else
+  UNUSED(bDarkMode);
   return SetBkColor(hdc, GetSysColor(COLOR_WINDOW));
 #endif
 }
@@ -207,6 +208,7 @@ inline int SetModeBtnFaceColor(const HDC hdc, const bool bDarkMode) {
 #ifdef D_NP3_WIN10_DARK_MODE
   return SetBkColor(hdc, bDarkMode ? Settings2.DarkModeBtnFaceColor : GetSysColor(COLOR_BTNFACE));
 #else
+  UNUSED(bDarkMode);
   return SetBkColor(hdc, GetSysColor(COLOR_BTNFACE));
 #endif
 }
@@ -215,6 +217,7 @@ inline COLORREF GetModeBkColor(const bool bDarkMode) {
 #ifdef D_NP3_WIN10_DARK_MODE
   return bDarkMode ? Settings2.DarkModeBkgColor : (COLORREF)GetSysColor(COLOR_WINDOW);
 #else
+  UNUSED(bDarkMode);
   return (COLORREF)GetSysColor(COLOR_WINDOW);
 #endif
 }
@@ -224,6 +227,7 @@ inline COLORREF GetModeBtnfaceColor(const bool bDarkMode) {
   return bDarkMode ? Settings2.DarkModeBtnFaceColor : (COLORREF)(
     IsWindows10OrGreater() ? GetSysColor(COLOR_WINDOW) : GetSysColor(COLOR_BTNFACE)); // (!) Win10 case
 #else
+  UNUSED(bDarkMode);
   return (COLORREF)GetSysColor(COLOR_BTNFACE);
 #endif
 }
@@ -233,6 +237,7 @@ inline int SetModeTextColor(const HDC hdc, const bool bDarkMode) {
 #ifdef D_NP3_WIN10_DARK_MODE
   return SetTextColor(hdc, bDarkMode ? Settings2.DarkModeTxtColor : GetSysColor(COLOR_BTNTEXT));
 #else
+  UNUSED(bDarkMode);
   return SetTextColor(hdc, GetSysColor(COLOR_BTNTEXT));
 #endif
 }
@@ -242,6 +247,7 @@ inline COLORREF GetModeTextColor(const bool bDarkMode) {
   return bDarkMode ? Settings2.DarkModeTxtColor : (COLORREF)(
     IsWindows10OrGreater() ? GetSysColor(COLOR_WINDOWTEXT) : GetSysColor(COLOR_BTNTEXT));
 #else
+  UNUSED(bDarkMode);
   return (COLORREF)GetSysColor(COLOR_BTNTEXT);
 #endif
 }
diff --git a/src/Notepad3.c b/src/Notepad3.c
index fde6dba52..327f456f1 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -1311,7 +1311,11 @@ bool InitApplication(const HINSTANCE hInstance)
   wc.hInstance = hInstance;
   wc.hIcon = Globals.hDlgIcon256;
   wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+#ifdef D_NP3_WIN10_DARK_MODE
   wc.hbrBackground = UseDarkMode() ? Globals.hbrDarkModeBkgBrush : (HBRUSH)(COLOR_WINDOW + 1);
+#else
+  wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+#endif
   wc.lpszMenuName = MAKEINTRESOURCE(IDR_MUI_MAINMENU);
   wc.lpszClassName = s_wchWndClass;
 
@@ -2965,12 +2969,12 @@ LRESULT MsgDrawItem(HWND hwnd, WPARAM wParam, LPARAM lParam)
     //~PAINTSTRUCT ps;
     //~BeginPaint(hWndItem, &ps); ~ not needed on WM_DRAWITEM
 
-#ifdef D_NP3_WIN10_DARK_MODE
-
     //~SetModeBkColor(hdc, UseDarkMode());
     SetModeBtnFaceColor(hdc, UseDarkMode());
     SetModeTextColor(hdc, UseDarkMode());
 
+#ifdef D_NP3_WIN10_DARK_MODE
+
     if (UseDarkMode()) {
       // overpaint part frames
       HWND const hWndItem = pDIS->hwndItem;