From 1cd0904260c0ddf069455c8b660d5ed1d74b7186 Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Mon, 8 Feb 2021 11:27:49 +0100
Subject: [PATCH] Fix mixed line breaks in webview sources

---
 include/wx/private/json.h |  4 ++--
 src/msw/webview_edge.cpp  | 18 +++++++++---------
 src/msw/webview_ie.cpp    | 20 ++++++++++----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/include/wx/private/json.h b/include/wx/private/json.h
index 12d78e4a2e..8e93b7d9c8 100644
--- a/include/wx/private/json.h
+++ b/include/wx/private/json.h
@@ -56,8 +56,8 @@ bool DecodeString(const wxString& in, wxString* out)
                 out->append('\\');
                 break;
             case 'u':
-#if SIZEOF_WCHAR_T == 2
-                            // In this case, we handle surrogates without doing anything special was wchar_t strings use UTF-17 encoding.
+#if SIZEOF_WCHAR_T == 2
+                            // In this case, we handle surrogates without doing anything special was wchar_t strings use UTF-17 encoding.
                 if (wxIsxdigit(ch[1]) && wxIsxdigit(ch[2]) &&
                     wxIsxdigit(ch[3]) && wxIsxdigit(ch[4]))
                 {
diff --git a/src/msw/webview_edge.cpp b/src/msw/webview_edge.cpp
index fc2feae8ee..bdf8ce5b76 100644
--- a/src/msw/webview_edge.cpp
+++ b/src/msw/webview_edge.cpp
@@ -746,15 +746,15 @@ bool wxWebViewFactoryEdge::IsAvailable()
 wxVersionInfo wxWebViewFactoryEdge::GetVersionInfo()
 {
     IsAvailable(); // Make sure ms_version string is initialized (if available)
-    long major = 0,
-         minor = 0,
-         micro = 0;
-    wxStringTokenizer tk(wxWebViewEdgeImpl::ms_version, ". ");
-    // Ignore the return value because if the version component is missing
-    // or invalid (i.e. non-numeric), the only thing we can do is to ignore
-    // it anyhow.
-    tk.GetNextToken().ToLong(&major);
-    tk.GetNextToken().ToLong(&minor);
+    long major = 0,
+         minor = 0,
+         micro = 0;
+    wxStringTokenizer tk(wxWebViewEdgeImpl::ms_version, ". ");
+    // Ignore the return value because if the version component is missing
+    // or invalid (i.e. non-numeric), the only thing we can do is to ignore
+    // it anyhow.
+    tk.GetNextToken().ToLong(&major);
+    tk.GetNextToken().ToLong(&minor);
     tk.GetNextToken().ToLong(&micro);
 
     return wxVersionInfo("Microsoft Edge WebView2", major, minor, micro);
diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp
index a008166b6a..6b0f194dc7 100644
--- a/src/msw/webview_ie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -58,16 +58,16 @@ wxVersionInfo wxWebViewFactoryIE::GetVersionInfo()
     wxRegKey key(wxRegKey::HKLM, "Software\\Microsoft\\Internet Explorer");
     wxString value;
     key.QueryValue("Version", value);
-    long major = 0,
-         minor = 0,
-         micro = 0;
-    wxStringTokenizer tk(value, ". ");
-    // Ignore the return value because if the version component is missing
-    // or invalid (i.e. non-numeric), the only thing we can do is to ignore
-    // it anyhow.
-    tk.GetNextToken().ToLong(&major);
-    tk.GetNextToken().ToLong(&minor);
-    tk.GetNextToken().ToLong(&micro);
+    long major = 0,
+         minor = 0,
+         micro = 0;
+    wxStringTokenizer tk(value, ". ");
+    // Ignore the return value because if the version component is missing
+    // or invalid (i.e. non-numeric), the only thing we can do is to ignore
+    // it anyhow.
+    tk.GetNextToken().ToLong(&major);
+    tk.GetNextToken().ToLong(&minor);
+    tk.GetNextToken().ToLong(&micro);
     return wxVersionInfo("Internet Explorer", major, minor, micro);
 }