浏览代码

Added more cpp style colours.

woollybah 6 年之前
父节点
当前提交
105e972cf6
共有 2 个文件被更改,包括 28 次插入2 次删除
  1. 3 1
      maxguitextareascintilla.mod/linux_glue.c
  2. 25 1
      maxguitextareascintilla.mod/win32_glue.c

+ 3 - 1
maxguitextareascintilla.mod/linux_glue.c

@@ -439,14 +439,16 @@ void bmx_mgta_scintilla_sethighlightstyle(ScintillaObject * sci, int style, int
 			case SCLEX_CPP:
 				switch (style) {
 					case 1:
-						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_B_COMMENT, color);
+						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_C_COMMENT, color);
 						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_C_COMMENTLINE, color);
 						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_C_COMMENTDOC, color);
 						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_C_COMMENTLINEDOC, color);
+						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_C_PREPROCESSORCOMMENT, color);
 						break;
 					case 2:
 						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_C_STRING, color);
 						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_C_CHARACTER, color);
+						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_C_PREPROCESSOR, color);
 						break;
 					case 3:
 						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_C_WORD, color);

+ 25 - 1
maxguitextareascintilla.mod/win32_glue.c

@@ -1,3 +1,25 @@
+/*
+ Copyright (c) 2014-2018 Bruce A Henderson
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ 
+*/
 
 #include "Scintilla.h"
 #include "SciLexer.h"
@@ -420,14 +442,16 @@ void bmx_mgta_scintilla_sethighlightstyle(HWND sci, int style, int flags, int co
 			case SCLEX_CPP:
 				switch (style) {
 					case 1:
-						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_B_COMMENT, color);
+						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_C_COMMENT, color);
 						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_C_COMMENTLINE, color);
 						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_C_COMMENTDOC, color);
 						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_C_COMMENTLINEDOC, color);
+						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_C_PREPROCESSORCOMMENT, color);
 						break;
 					case 2:
 						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_C_STRING, color);
 						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_C_CHARACTER, color);
+						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_C_PREPROCESSOR, color);
 						break;
 					case 3:
 						scintilla_send_message(sci, SCI_STYLESETFORE, SCE_C_WORD, color);