From bba0bee7d2f1335af86ee8b03265e349d13b6271 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Tue, 2 Jun 2020 01:02:05 +0200
Subject: [PATCH] + fix: mismatch debug/release x64/Win32 config

---
 Notepad3.sln                                | 8 ++++----
 grepWinNP3/sktoolslib_mod/RichStatusBar.cpp | 4 ++--
 grepWinNP3/sktoolslib_mod/TextFile.cpp      | 2 +-
 scintilla/win32/ScintillaWin.cxx            | 2 +-
 src/Notepad3.c                              | 4 ++++
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Notepad3.sln b/Notepad3.sln
index 128b22c91..a1b857ab1 100644
--- a/Notepad3.sln
+++ b/Notepad3.sln
@@ -343,8 +343,8 @@ Global
 		{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Debug|x64.Build.0 = Debug|x64
 		{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Release|Win32.ActiveCfg = Release|Win32
 		{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Release|Win32.Build.0 = Release|Win32
-		{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Release|x64.ActiveCfg = Debug|x64
-		{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Release|x64.Build.0 = Debug|x64
+		{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Release|x64.ActiveCfg = Release|x64
+		{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Release|x64.Build.0 = Release|x64
 		{BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|Win32.Build.0 = Debug|Win32
 		{BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|x64.ActiveCfg = Debug|x64
@@ -563,8 +563,8 @@ Global
 		{4B141102-3379-4F20-A9B0-F7418EFF3DAA}.Debug|x64.Build.0 = Debug|x64
 		{4B141102-3379-4F20-A9B0-F7418EFF3DAA}.Release|Win32.ActiveCfg = Release|Win32
 		{4B141102-3379-4F20-A9B0-F7418EFF3DAA}.Release|Win32.Build.0 = Release|Win32
-		{4B141102-3379-4F20-A9B0-F7418EFF3DAA}.Release|x64.ActiveCfg = Debug|Win32
-		{4B141102-3379-4F20-A9B0-F7418EFF3DAA}.Release|x64.Build.0 = Debug|Win32
+		{4B141102-3379-4F20-A9B0-F7418EFF3DAA}.Release|x64.ActiveCfg = Release|x64
+		{4B141102-3379-4F20-A9B0-F7418EFF3DAA}.Release|x64.Build.0 = Release|x64
 		{83E5EEBE-9764-4C5B-9FDC-EB84A369C501}.Debug|Win32.ActiveCfg = Debug|Win32
 		{83E5EEBE-9764-4C5B-9FDC-EB84A369C501}.Debug|Win32.Build.0 = Debug|Win32
 		{83E5EEBE-9764-4C5B-9FDC-EB84A369C501}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/grepWinNP3/sktoolslib_mod/RichStatusBar.cpp b/grepWinNP3/sktoolslib_mod/RichStatusBar.cpp
index 756117ef0..6c72b34aa 100644
--- a/grepWinNP3/sktoolslib_mod/RichStatusBar.cpp
+++ b/grepWinNP3/sktoolslib_mod/RichStatusBar.cpp
@@ -1,6 +1,6 @@
 // sktoolslib - common files for SK tools
 
-// Copyright (C) 2017-2018 Stefan Kueng
+// Copyright (C) 2017-2018, 2020 Stefan Kueng
 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -97,7 +97,7 @@ bool CRichStatusBar::SetPart(int index, const CRichStatusBarItem& item, bool red
 {
     if (index >= (int)m_parts.size())
     {
-        for (auto i = m_parts.size(); i <= index; ++i)
+        for (auto i = (int)m_parts.size(); i <= index; ++i)
         {
             m_parts.push_back(std::move(CRichStatusBarItem()));
             m_partwidths.push_back({});
diff --git a/grepWinNP3/sktoolslib_mod/TextFile.cpp b/grepWinNP3/sktoolslib_mod/TextFile.cpp
index 8b7ee5108..9f0cd1698 100644
--- a/grepWinNP3/sktoolslib_mod/TextFile.cpp
+++ b/grepWinNP3/sktoolslib_mod/TextFile.cpp
@@ -547,7 +547,7 @@ bool CTextFile::CalculateLines(volatile LONG * bCancelled)
 
 long CTextFile::LineFromPosition(long pos) const
 {
-    auto lb     = std::lower_bound(linepositions.begin(), linepositions.end(), pos);
+    auto lb     = std::lower_bound(linepositions.begin(), linepositions.end(), static_cast<size_t>(pos));
     auto lbLine = lb - linepositions.begin();
     return long(lbLine + 1);
 }
diff --git a/scintilla/win32/ScintillaWin.cxx b/scintilla/win32/ScintillaWin.cxx
index 9f92f5779..c1b543493 100644
--- a/scintilla/win32/ScintillaWin.cxx
+++ b/scintilla/win32/ScintillaWin.cxx
@@ -2388,7 +2388,7 @@ void ScintillaWin::NotifyDoubleClick(Point pt, int modifiers) {
 	//Platform::DebugPrintf("ScintillaWin Double click 0\n");
 	ScintillaBase::NotifyDoubleClick(pt, modifiers);
 	// Send myself a WM_LBUTTONDBLCLK, so the container can handle it too.
-	::SendMessage(MainHWND(),
+	::SendMessage(::GetParent(MainHWND()),
 		WM_LBUTTONDBLCLK,
 		(modifiers & SCI_SHIFT) ? MK_SHIFT : 0,
 		MAKELPARAM(pt.x, pt.y));
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 4e138bf04..14c11cb45 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -1685,6 +1685,10 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
       }
       break;
 
+    //case WM_LBUTTONDBLCLK:
+    //  //return DefWindowProc(hwnd, umsg, wParam, lParam);
+    //  break;
+
     case WM_MOUSEWHEEL:
       if (wParam & MK_CONTROL) { 
         ShowZoomCallTip();