Use __WINDOWS__ for OS checks and __WXMSW__ for GUI checks (round 2).

This is continuation of r70796 and serves the same purpose.

Closes #14065, #14066.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

tests/benchmarks/strings.cpp

@@ -356,7 +356,7 @@ BENCHMARK_FUNC(StringCmpNoCase)
 // Also benchmark various native functions under MSW. Surprisingly/annoyingly
 // they sometimes have vastly better performance than alternatives, especially
 // for case-sensitive comparison (see #10375).
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
 
 #include "wx/msw/wrapwin.h"
 
@@ -400,7 +400,7 @@ BENCHMARK_FUNC(MSWCompareStringIgnoreCase)
              ) == CSTR_EQUAL;
 }
 
-#endif // __WXMSW__
+#endif // __WINDOWS__
 
 // ----------------------------------------------------------------------------
 // string buffers: wx[W]CharBuffer