Merge branch 'b11.21' into 'master'11.21

add upstream 11.21

See merge request opensource-tracking/FreeFileSync!44

1 files changed, 1 insertions, 3 deletions

diff --git a/wx+/context_menu.h b/wx+/context_menu.h
index 728da173..ef11e37b 100644
--- a/wx+/context_menu.h
+++ b/wx+/context_menu.h
@@ -14,8 +14,6 @@
 #include <wx/app.h>
 #include "dc.h"
 
-warn_static("remove after test")
-#include "image_tools.h"
 
 /*  A context menu supporting lambda callbacks!
 
@@ -102,7 +100,7 @@ private:
     ContextMenu& operator=(const ContextMenu&) = delete;
 
     std::unique_ptr<wxMenu> menu_ = std::make_unique<wxMenu>();
-    std::map<int /*item id*/, std::function<void()> /*command*/> commandList_;
+    std::unordered_map<int /*item id*/, std::function<void()> /*command*/> commandList_;
 };