From 2a1a564b3caaeffe90a1b044fde8829921f5ba79 Mon Sep 17 00:00:00 2001 From: adelikat Date: Wed, 22 Sep 2010 19:20:16 +0000 Subject: [PATCH] win32 - Hex Editor - ask before removing all bookmarks --- changelog.txt | 1 + src/drivers/win/memview.cpp | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/changelog.txt b/changelog.txt index 485b3158..e1922bbe 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,4 @@ +22-sept-2010 - adelikat - win32 - Hex Editor - ask before removing all bookmarks 04-sept-2010 - adelikat - Win32 - Ramwatch - fix displaying of 2 byte values 26-aug-2010 - mart0258 - W32 - fix crash when re-opening debugging window 20-aug-2010 - adelikat - Win32 - Display movie name at the top of the main window diff --git a/src/drivers/win/memview.cpp b/src/drivers/win/memview.cpp index f744126c..a522ca4a 100644 --- a/src/drivers/win/memview.cpp +++ b/src/drivers/win/memview.cpp @@ -966,7 +966,6 @@ LRESULT CALLBACK MemViewCallB(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa SCROLLINFO si; int x, y, i, j; int tempAddy; - const int MemFontWidth = debugSystem->fixedFontWidth; const int MemFontHeight = debugSystem->fixedFontHeight + HexRowHeightBorder; @@ -1626,8 +1625,15 @@ LRESULT CALLBACK MemViewCallB(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa // ################################## Start of SP CODE ########################### case MENU_MV_BOOKMARKS_RM_ALL: - removeAllBookmarks(GetSubMenu(GetMenu(hwnd), 3)); - UpdateColorTable(); + //TODO: only ask if there is 1 or more bookmarks + if (nextBookmark) + { + if (MessageBox(hwnd, "Remove All Bookmarks?", "Bookmarks", MB_YESNO) == IDYES) + { + removeAllBookmarks(GetSubMenu(GetMenu(hwnd), 3)); + UpdateColorTable(); + } + } return 0; case MENU_MV_HELP: