Disable generic dark mode, update npp headers, update toolbar icon struct

Author: ozone10

DlgConsole.cpp

@@ -1539,7 +1539,7 @@ void SnippetsConsole()
 			tbd.pszModuleName = L"Snippets";				// name of the dll this dialog belongs to
 			tbd.pszName = L"Snippets";						// Name for titlebar
 			tbd.hClient = s_hDlg;							// HWND Handle of window this dock belongs to
-			tbd.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB;	// Put it on the right
+			tbd.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB | DWS_USEOWNDARKMODE;	// Put it on the right
 			tbd.hIconTab = s_hTabIcon;						// Put the icon in
 			SendMessage(g_nppData._nppHandle, NPPM_DMMREGASDCKDLG, 0, (LPARAM) &tbd);	// Register it
 

NPP/Docking.h

@@ -1,29 +1,18 @@
-// this file is part of Notepad++
-// Copyright (C)2005 Jens Lorenz <[email protected]>
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later version.
-// 
-// // Note that the GPL places important restrictions on "derived works", yet
-// it does not provide a detailed definition of that term.  To avoid      
-// misunderstandings, we consider an application to constitute a          
-// "derivative work" for the purpose of this license if it does any of the
-// following:                                                             
-// 1. Integrates source code from Notepad++.
-// 2. Integrates/includes/aggregates Notepad++ into a proprietary executable
-//    installer, such as those produced by InstallShield.
-// 3. Links to a library or executes a program that does any of the above.
-// 
+// This file is part of Notepad++ project
+// Copyright (C)2021 Don HO <[email protected]>
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// at your option any later version.
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
 #pragma once
@@ -47,6 +36,7 @@
 #define DWS_ICONTAB			0x00000001			// Icon for tabs are available
 #define DWS_ICONBAR			0x00000002			// Icon for icon bar are available (currently not supported)
 #define DWS_ADDINFO			0x00000004			// Additional information are in use
+#define DWS_USEOWNDARKMODE	0x00000008			// Use plugin's own dark mode
 #define DWS_PARAMSALL		(DWS_ICONTAB|DWS_ICONBAR|DWS_ADDINFO)
 
 // default docking values for first call of plugin
@@ -57,27 +47,27 @@
 #define DWS_DF_FLOATING		0x80000000			// default state is floating
 
 
-typedef struct {
-	HWND		hClient;		// client Window Handle
-	const TCHAR	*pszName;		// name of plugin (shown in window)
-	int			dlgID;			// a funcItem provides the function pointer to start a dialog. Please parse here these ID
+struct tTbData {
+	HWND hClient = nullptr;                // client Window Handle
+	const TCHAR* pszName = nullptr;        // name of plugin (shown in window)
+	int dlgID = 0;                         // a funcItem provides the function pointer to start a dialog. Please parse here these ID
 
 	// user modifications
-	UINT		uMask;			// mask params: look to above defines
-	HICON		hIconTab;		// icon for tabs
-	const TCHAR *pszAddInfo;		// for plugin to display additional informations
+	UINT uMask = 0;                        // mask params: look to above defines
+	HICON hIconTab = nullptr;              // icon for tabs
+	const TCHAR* pszAddInfo = nullptr;     // for plugin to display additional informations
 
 	// internal data, do not use !!!
-	RECT		rcFloat;		// floating position
-	int			iPrevCont;		// stores the privious container (toggling between float and dock)
-	const TCHAR*	pszModuleName;	// it's the plugin file name. It's used to identify the plugin
-} tTbData;
+	RECT rcFloat = {};                    // floating position
+	int iPrevCont = 0;                     // stores the privious container (toggling between float and dock)
+	const TCHAR* pszModuleName = nullptr;  // it's the plugin file name. It's used to identify the plugin
+};
 
 
-typedef struct {
-	HWND		hWnd;							// the docking manager wnd
-	RECT		rcRegion[DOCKCONT_MAX];			// position of docked dialogs
-} tDockMgr;
+struct tDockMgr {
+	HWND hWnd = nullptr;                   // the docking manager wnd
+	RECT rcRegion[DOCKCONT_MAX] = {{}};   // position of docked dialogs
+};
 
 
 #define	HIT_TEST_THICKNESS		20