From 1f8d68fda8e20cf014d94b9347701f4ebb29f690 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Mon, 14 Dec 2020 15:02:27 +0100
Subject: [PATCH] + upd: Scintilla v4.4.6

---
 scintilla/doc/ScintillaDownload.html             | 10 +++++-----
 scintilla/doc/ScintillaHistory.html              | 12 ++++++++++++
 scintilla/doc/index.html                         |  7 ++++---
 .../Lexilla/Lexilla.xcodeproj/project.pbxproj    |  8 +++++---
 scintilla/lexilla/src/LexillaVersion.rc          |  4 ++--
 scintilla/src/PositionCache.h                    |  2 +-
 scintilla/src/Style.cxx                          |  5 +++++
 scintilla/src/Style.h                            |  6 +++---
 scintilla/version.txt                            |  2 +-
 scintilla/win32/ScintRes.rc                      |  4 ++--
 scintilla/win32/ScintillaWin.cxx                 |  2 +-
 src/Dialogs.c                                    | 16 ++++++++--------
 12 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html
index 518a613c3..1d165ec83 100644
--- a/scintilla/doc/ScintillaDownload.html
+++ b/scintilla/doc/ScintillaDownload.html
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://www.scintilla.org/scintilla445.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scintilla446.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scintilla445.tgz">
+	<a href="https://www.scintilla.org/scintilla446.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 4.4.5
+       Release 4.4.6
     </h3>
     <h4>
        Source Code
@@ -50,8 +50,8 @@
        The source code package contains all of the source code for Scintilla but no binary
 	executable code and is available in
        <ul>
-       <li><a href="https://www.scintilla.org/scintilla445.zip">zip format</a> (1.8M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla445.tgz">tgz format</a> (1.6M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/scintilla446.zip">zip format</a> (1.8M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scintilla446.tgz">tgz format</a> (1.6M) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>
diff --git a/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html
index 6293b880a..395c08429 100644
--- a/scintilla/doc/ScintillaHistory.html
+++ b/scintilla/doc/ScintillaHistory.html
@@ -572,6 +572,18 @@
         Icons</a> Copyright(C) 1998 by Dean S. Jones<br />
       </li>
     </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite446.zip">Release 4.4.6</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 December 2020.
+	</li>
+	<li>
+	Fix building with Xcode 12.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2187/">Bug #2187</a>.
+	</li>
+    </ul>
     <h3>
        <a href="https://www.scintilla.org/scite445.zip">Release 4.4.5</a>
     </h3>
diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html
index d224dfe63..c95eb6acd 100644
--- a/scintilla/doc/index.html
+++ b/scintilla/doc/index.html
@@ -9,7 +9,7 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20200911" />
+    <meta name="Date.Modified" content="20201201" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
         #versionlist {
@@ -56,8 +56,8 @@
           GTK, and OS X</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 4.4.5<br />
-           Site last modified September 11 2020</font>
+          <font color="#FFCC99" size="3"> Release version 4.4.6<br />
+           Site last modified December 1 2020</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -72,6 +72,7 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 4.4.6 fixes building with Xcode 12.</li>
       <li>Version 4.4.5 fixes bugs with indicators, margin text, and ineffective layout caching.</li>
       <li>Version 4.4.4 implements end of line annotations.</li>
       <li>Version 4.4.3 was released just to fix SciTE.</li>
diff --git a/scintilla/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj b/scintilla/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
index 816a9cb58..a5d0b8738 100644
--- a/scintilla/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
+++ b/scintilla/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
@@ -551,7 +551,7 @@
 		2802629D246DF655000DF3B8 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1140;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "Neil Hodgson";
 				TargetAttributes = {
 					280262A4246DF655000DF3B8 = {
@@ -740,6 +740,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -798,6 +799,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -828,7 +830,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4.4.5;
+				CURRENT_PROJECT_VERSION = 4.4.6;
 				DEVELOPMENT_TEAM = 4F446KW87E;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -853,7 +855,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4.4.5;
+				CURRENT_PROJECT_VERSION = 4.4.6;
 				DEVELOPMENT_TEAM = 4F446KW87E;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
diff --git a/scintilla/lexilla/src/LexillaVersion.rc b/scintilla/lexilla/src/LexillaVersion.rc
index f7e3d16cb..0afa04452 100644
--- a/scintilla/lexilla/src/LexillaVersion.rc
+++ b/scintilla/lexilla/src/LexillaVersion.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_LEXILLA "4.4.5"
-#define VERSION_WORDS 4, 4, 5, 0
+#define VERSION_LEXILLA "4.4.6"
+#define VERSION_WORDS 4, 4, 6, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
diff --git a/scintilla/src/PositionCache.h b/scintilla/src/PositionCache.h
index 4cc531e0d..42527ee53 100644
--- a/scintilla/src/PositionCache.h
+++ b/scintilla/src/PositionCache.h
@@ -187,8 +187,8 @@ public:
 	PositionCacheEntry() noexcept;
 	// Copy constructor not currently used, but needed for being element in std::vector.
 	PositionCacheEntry(const PositionCacheEntry &);
+	PositionCacheEntry(PositionCacheEntry &&) noexcept = default;
 	// Deleted so PositionCacheEntry objects can not be assigned.
-	PositionCacheEntry(PositionCacheEntry &&) = delete;
 	void operator=(const PositionCacheEntry &) = delete;
 	void operator=(PositionCacheEntry &&) = delete;
 	~PositionCacheEntry();
diff --git a/scintilla/src/Style.cxx b/scintilla/src/Style.cxx
index 6dca767a4..21d69d653 100644
--- a/scintilla/src/Style.cxx
+++ b/scintilla/src/Style.cxx
@@ -23,6 +23,11 @@ FontAlias::FontAlias(const FontAlias &other) noexcept {
 	SetID(other.fid);
 }
 
+FontAlias::FontAlias(FontAlias &&other) noexcept : Font() {
+	SetID(other.fid);
+	other.ClearFont();
+}
+
 FontAlias::~FontAlias() {
 	SetID(FontID{});
 	// ~Font will not release the actual font resource since it is now 0
diff --git a/scintilla/src/Style.h b/scintilla/src/Style.h
index 2a9759a17..94ea73a3d 100644
--- a/scintilla/src/Style.h
+++ b/scintilla/src/Style.h
@@ -39,9 +39,9 @@ struct FontSpecification {
 class FontAlias : public Font {
 public:
 	FontAlias() noexcept;
-	// FontAlias objects can not be assigned except for initialization
+	// FontAlias objects can be copy or move constructed but not be assigned
 	FontAlias(const FontAlias &) noexcept;
-	FontAlias(FontAlias &&)  = delete;
+	FontAlias(FontAlias &&) noexcept;
 	FontAlias &operator=(const FontAlias &) = delete;
 	FontAlias &operator=(FontAlias &&) = delete;
 	~FontAlias() override;
@@ -81,7 +81,7 @@ public:
 
 	Style();
 	Style(const Style &source) noexcept;
-	Style(Style &&) = delete;
+	Style(Style &&) noexcept = default;
 	~Style();
 	Style &operator=(const Style &source) noexcept;
 	Style &operator=(Style &&) = delete;
diff --git a/scintilla/version.txt b/scintilla/version.txt
index e5a135a53..018783526 100644
--- a/scintilla/version.txt
+++ b/scintilla/version.txt
@@ -1 +1 @@
-445
+446
diff --git a/scintilla/win32/ScintRes.rc b/scintilla/win32/ScintRes.rc
index 419eee7c4..8ea2fd1c7 100644
--- a/scintilla/win32/ScintRes.rc
+++ b/scintilla/win32/ScintRes.rc
@@ -6,8 +6,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "4.4.5"
-#define VERSION_WORDS 4, 4, 5, 0
+#define VERSION_SCINTILLA "4.4.6"
+#define VERSION_WORDS 4, 4, 6, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
diff --git a/scintilla/win32/ScintillaWin.cxx b/scintilla/win32/ScintillaWin.cxx
index bd2650517..ef4df9256 100644
--- a/scintilla/win32/ScintillaWin.cxx
+++ b/scintilla/win32/ScintillaWin.cxx
@@ -479,7 +479,7 @@ class ScintillaWin final :
 #endif
 
 	explicit ScintillaWin(HWND hwnd);
-	// ~ScintillaWin() in public section
+	// virtual ~ScintillaWin() in public section
 
 	void Init() noexcept;
 	void Finalise() noexcept override;
diff --git a/src/Dialogs.c b/src/Dialogs.c
index b78402b6d..b987fa25b 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -85,8 +85,8 @@ static LRESULT CALLBACK SetPosRelatedToParent_Hook(INT nCode, WPARAM wParam, LPA
             InitWindowCommon(hThisWnd, true);
 
             // get window handles
-            LPCREATESTRUCT const pCreateStructure = ((LPCBT_CREATEWND)lParam)->lpcs;
-            HWND const           hParentWnd       = pCreateStructure->hwndParent; // GetParent(hThisWnd);
+            LPCREATESTRUCT const pCreateStruct = ((LPCBT_CREATEWND)lParam)->lpcs;
+            HWND const hParentWnd = pCreateStruct->hwndParent ? pCreateStruct->hwndParent : GetParent(hThisWnd);
 
             if (hParentWnd) {
 
@@ -99,15 +99,15 @@ static LRESULT CALLBACK SetPosRelatedToParent_Hook(INT nCode, WPARAM wParam, LPA
 
                 // set new coordinates
                 RECT rcDlg;
-                rcDlg.left   = pCreateStructure->x;
-                rcDlg.top    = pCreateStructure->y;
-                rcDlg.right  = pCreateStructure->x + pCreateStructure->cx;
-                rcDlg.bottom = pCreateStructure->y + pCreateStructure->cy;
+                rcDlg.left   = pCreateStruct->x;
+                rcDlg.top    = pCreateStruct->y;
+                rcDlg.right  = pCreateStruct->x + pCreateStruct->cx;
+                rcDlg.bottom = pCreateStruct->y + pCreateStruct->cy;
 
                 POINT const ptTL = GetCenterOfDlgInParent(&rcDlg, &rcParent);
 
-                pCreateStructure->x = ptTL.x;
-                pCreateStructure->y = ptTL.y;
+                pCreateStruct->x = ptTL.x;
+                pCreateStruct->y = ptTL.y;
             }
 
             // we are done