Merge pull request #17 from MichaelTheShifter/shiftui_integration

Shiftui integration

1 files changed, 5 insertions, 5 deletions

diff --git a/source/WindowsFormsApplication1/Controls/SyntaxHighlighter.cs b/source/WindowsFormsApplication1/Controls/SyntaxHighlighter.cs
index 1139096..8a5e123 100644
--- a/source/WindowsFormsApplication1/Controls/SyntaxHighlighter.cs
+++ b/source/WindowsFormsApplication1/Controls/SyntaxHighlighter.cs
@@ -4,14 +4,14 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
-using System.Windows.Forms;
+using ShiftUI;
 using System.ComponentModel;
 using System.Text.RegularExpressions;
 using System.Drawing;
 
 namespace ShiftOS
 {
-    public class SyntaxRichTextBox : System.Windows.Forms.RichTextBox
+    public class SyntaxRichTextBox : ShiftUI.RichTextBox
     {
         private SyntaxSettings m_settings = new SyntaxSettings();
         private static bool m_bPaint = true;
@@ -35,7 +35,7 @@ namespace ShiftOS
         /// WndProc
         /// </summary>
         /// <param name="m"></param>
-        protected override void WndProc(ref System.Windows.Forms.Message m)
+        protected override void WndProc(ref ShiftUI.Message m)
         {
             if (m.Msg == 0x00f)
             {
@@ -51,7 +51,7 @@ namespace ShiftOS
         public void SetLanguage(SyntaxSettings.Language lang)
         {
             Color white = Color.Black;
-            Color keyword = Color.Red;
+            Color keyword = Color.Orange;
             Color integer = Color.LightGreen;
             Color comment = Color.DarkGray;
             Color str = Color.Orange;
@@ -76,7 +76,7 @@ namespace ShiftOS
             switch (lang)
             {
                 case SyntaxSettings.Language.Lua:
-                    var kw = new List<string>() { "function", "local", "return", "if", "else", "elseif", "while", "true", "do", "next", "end", "for", "pairs", "in", "{", "}", "false", "=", "+", "-", "/", "*", "..", "," };
+                    var kw = new List<string>() { "function", "then", "local", "return", "if", "else", "elseif", "while", "true", "do", "next", "end", "for", "pairs", "in", "{", "}", "false", "=", "+", "-", "/", "*", "..", "," };
                     Settings.Keywords.Clear();
                     foreach (var k in kw)
                     {