CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2389 from RaiKoHoff/grepWin_Integration

Browse Source 
Fix mismatch debug/release x64/Win32 config
This commit is contained in:
Rainer Kottenhoff 2020-06-02 01:15:40 +02:00 committed by GitHub
commit a2f44b6063
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Notepad3.sln
View File

@ -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

4
grepWinNP3/sktoolslib_mod/RichStatusBar.cpp
View File

@ -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({});

2
grepWinNP3/sktoolslib_mod/TextFile.cpp
View File

@ -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);
}

2
scintilla/win32/ScintillaWin.cxx
View File

@ -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));

4
src/Notepad3.c
View File

@ -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();