From de47833719c3d227d844ad9fcf53444dfae2a1b9 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Mon, 29 Apr 2013 18:16:44 +0200
Subject: [PATCH] Synced backgroundcolors.patch with TortoiseSVN revision
 #24143

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 ext/scintilla/backgroundcolors.patch | 48 +++++++++++++-----------------------
 1 file changed, 17 insertions(+), 31 deletions(-)

diff --git a/ext/scintilla/backgroundcolors.patch b/ext/scintilla/backgroundcolors.patch
index 04b7419c1..57a46a07e 100644
--- a/ext/scintilla/backgroundcolors.patch
+++ b/ext/scintilla/backgroundcolors.patch
@@ -1,22 +1,21 @@
 Index: include/Scintilla.h
 ===================================================================
---- include/Scintilla.h	(Revision 21909)
-+++ include/Scintilla.h	(Arbeitskopie)
-@@ -923,6 +923,9 @@
- #define SCN_AUTOCCANCELLED 2025
- #define SCN_AUTOCCHARDELETED 2026
- #define SCN_HOTSPOTRELEASECLICK 2027
-+
-+#define SCN_GETBKCOLOR 3000
+--- include/Scintilla.h	(revision 24106)
++++ include/Scintilla.h	(working copy)
+@@ -983,6 +983,8 @@
+ #define SCI_DISTANCETOSECONDARYSTYLES 4025
+ #define SCI_GETSUBSTYLEBASES 4026
+ #endif
 +
++#define SCN_GETBKCOLOR 5000
  /* --Autogenerated -- end of section automatically generated from Scintilla.iface */
  
  /* These structures are defined to be exactly the same shape as the Win32
 Index: src/Editor.cxx
 ===================================================================
---- src/Editor.cxx	(Revision 21909)
-+++ src/Editor.cxx	(Arbeitskopie)
-@@ -2804,6 +2804,17 @@
+--- src/Editor.cxx	(revision 24106)
++++ src/Editor.cxx	(working copy)
+@@ -2870,6 +2870,17 @@
  		}
  	}
  
@@ -36,9 +35,9 @@ Index: src/Editor.cxx
  
 Index: src/Editor.h
 ===================================================================
---- src/Editor.h	(Revision 21909)
-+++ src/Editor.h	(Arbeitskopie)
-@@ -426,6 +426,7 @@
+--- src/Editor.h	(revision 24106)
++++ src/Editor.h	(working copy)
+@@ -469,6 +469,7 @@
  	virtual void SetCtrlID(int identifier);
  	virtual int GetCtrlID() { return ctrlID; }
  	virtual void NotifyParent(SCNotification scn) = 0;
@@ -46,24 +45,11 @@ Index: src/Editor.h
  	virtual void NotifyStyleToNeeded(int endStyleNeeded);
  	void NotifyChar(int ch);
  	void NotifySavePoint(bool isSavePoint);
-Index: win32/scintilla.mak
-===================================================================
---- win32/scintilla.mak	(Revision 21909)
-+++ win32/scintilla.mak	(Arbeitskopie)
-@@ -21,7 +21,7 @@
- RC=rc
- LD=link
- 
--CXXFLAGS=-Zi -TP -W4 -EHsc -Zc:forScope -Zc:wchar_t -D_CRT_SECURE_NO_DEPRECATE=1
-+CXXFLAGS=-Zi -TP -W0 -EHsc -Zc:forScope -Zc:wchar_t -D_CRT_SECURE_NO_DEPRECATE=1
- # For something scary:-Wp64
- CXXDEBUG=-Od -MTd -DDEBUG
- CXXNDEBUG=-O1 -MT -DNDEBUG -GL
 Index: win32/ScintillaWin.cxx
 ===================================================================
---- win32/ScintillaWin.cxx	(Revision 21909)
-+++ win32/ScintillaWin.cxx	(Arbeitskopie)
-@@ -238,6 +238,7 @@
+--- win32/ScintillaWin.cxx	(revision 24106)
++++ win32/ScintillaWin.cxx	(working copy)
+@@ -252,6 +252,7 @@
  	virtual void SetCtrlID(int identifier);
  	virtual int GetCtrlID();
  	virtual void NotifyParent(SCNotification scn);
@@ -71,7 +57,7 @@ Index: win32/ScintillaWin.cxx
  	virtual void NotifyDoubleClick(Point pt, bool shift, bool ctrl, bool alt);
  	virtual CaseFolder *CaseFolderForEncoding();
  	virtual std::string CaseMapString(const std::string &s, int caseMapping);
-@@ -1318,6 +1319,13 @@
+@@ -1426,6 +1427,13 @@
  	              GetCtrlID(), reinterpret_cast<LPARAM>(&scn));
  }
  
-- 
2.11.4.GIT