Merge remote-tracking branch 'github/use-std-hash'

Fix the wrong merge done in ae13d70ddc (Merge branch 'use-std-hash',
2023-04-18) which forgot some fix ups.

Notably restore wx/wxcrt.h inclusion and fix linking wxWebRequest unit
test.

See #23462.

include/wx/log.h

@@ -27,6 +27,13 @@ typedef unsigned long wxLogLevel;
 
 #include "wx/string.h"
 
+// This is a hack, but this header used to include wx/hashmap.h which, in turn,
+// included wx/wxcrt.h and it turns out quite some existing code relied on it
+// by using the CRT wrapper functions declared there without explicitly
+// including that header, so keep including it from here to let it continue to
+// compile.
+#include "wx/wxcrt.h"
+
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------

src/msw/uilocale.cpp

@@ -27,6 +27,7 @@
 
 #include "wx/scopedarray.h"
 #include "wx/dynlib.h"
+#include "wx/wxcrt.h"
 
 #ifndef LOCALE_NAME_USER_DEFAULT
     #define LOCALE_NAME_USER_DEFAULT nullptr

tests/net/webrequest.cpp

@@ -24,6 +24,7 @@
 #include "wx/wfstream.h"
 
 #include <memory>
+#include <unordered_map>
 
 // This test uses httpbin service and by default uses the mirror at the
 // location below, which seems to be more reliable than the main site at
@@ -540,7 +541,7 @@ TEST_CASE_METHOD(RequestFixture,
     }
 }
 
-WX_DECLARE_STRING_HASH_MAP(wxString, wxWebRequestHeaderMap);
+using wxWebRequestHeaderMap = std::unordered_map<wxString, wxString>;
 
 namespace wxPrivate
 {