mirror of
https://github.com/notepad-plus-plus/notepad-plus-plus.git
synced 2025-07-22 05:14:41 +02:00
Make ESC Key abort "Move to Recycle Bin" confirmation prompt
Fix #12117, close #12239
This commit is contained in:
parent
4b3ee9c4ea
commit
dfa6c19d87
@ -2141,7 +2141,7 @@ int Notepad_plus::doDeleteOrNot(const TCHAR *fn)
|
|||||||
_pPublicInterface->getHSelf(),
|
_pPublicInterface->getHSelf(),
|
||||||
TEXT("The file \"$STR_REPLACE$\"\rwill be moved to your Recycle Bin and this document will be closed.\rContinue?"),
|
TEXT("The file \"$STR_REPLACE$\"\rwill be moved to your Recycle Bin and this document will be closed.\rContinue?"),
|
||||||
TEXT("Delete file"),
|
TEXT("Delete file"),
|
||||||
MB_YESNO | MB_ICONQUESTION | MB_APPLMODAL,
|
MB_OKCANCEL | MB_ICONQUESTION | MB_APPLMODAL,
|
||||||
0, // not used
|
0, // not used
|
||||||
fn);
|
fn);
|
||||||
}
|
}
|
||||||
|
@ -1885,7 +1885,7 @@ bool Notepad_plus::fileDelete(BufferID id)
|
|||||||
if (winVersion >= WV_WIN8 || winVersion == WV_UNKNOWN)
|
if (winVersion >= WV_WIN8 || winVersion == WV_UNKNOWN)
|
||||||
{
|
{
|
||||||
// Windows 8 (and version afer?) has no system alert, so we ask user's confirmation
|
// Windows 8 (and version afer?) has no system alert, so we ask user's confirmation
|
||||||
goAhead = (doDeleteOrNot(fileNamePath) == IDYES);
|
goAhead = (doDeleteOrNot(fileNamePath) == IDOK);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (goAhead)
|
if (goAhead)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user