diff options
Diffstat (limited to 'examples/apps/ide/src')
-rw-r--r-- | examples/apps/ide/src/extrafpc.cfg | 4 | ||||
-rw-r--r-- | examples/apps/ide/src/fpg_textedit.pas | 4 | ||||
-rw-r--r-- | examples/apps/ide/src/frm_main.pas | 11 | ||||
-rw-r--r-- | examples/apps/ide/src/maximus.lpi | 2 | ||||
-rw-r--r-- | examples/apps/ide/src/maximus.lpr | 27 |
5 files changed, 39 insertions, 9 deletions
diff --git a/examples/apps/ide/src/extrafpc.cfg b/examples/apps/ide/src/extrafpc.cfg index 90e167a9..2132065d 100644 --- a/examples/apps/ide/src/extrafpc.cfg +++ b/examples/apps/ide/src/extrafpc.cfg @@ -4,3 +4,7 @@ -Xs -XX -CX +#ifdef mswindows +-WG +#endif + diff --git a/examples/apps/ide/src/fpg_textedit.pas b/examples/apps/ide/src/fpg_textedit.pas index 013ad86b..3e88f3d1 100644 --- a/examples/apps/ide/src/fpg_textedit.pas +++ b/examples/apps/ide/src/fpg_textedit.pas @@ -2412,7 +2412,7 @@ begin BuffList[I] := SLine; end; end; - BuffList.SaveToFile(AFileName); + BuffList.SaveToFile(fpgToOSEncoding(AFileName)); finally BuffList.Free; end; @@ -2423,7 +2423,7 @@ begin if not fpgFileExists(AFileName) then Exit; //==> Clear; - FLines.LoadFromFile(AFileName); + FLines.LoadFromFile(fpgToOSEncoding(AFileName)); HandleResize(Width, Height); Invalidate; end; diff --git a/examples/apps/ide/src/frm_main.pas b/examples/apps/ide/src/frm_main.pas index 6ef73f50..fe903c31 100644 --- a/examples/apps/ide/src/frm_main.pas +++ b/examples/apps/ide/src/frm_main.pas @@ -168,7 +168,7 @@ uses ,UnitList ,BuilderThread {$IFDEF DEBUGSVR} - ,dbugintf + ,fpg_dbugintf {$ENDIF} ,ideutils ; @@ -856,7 +856,7 @@ const + '|xor|repeat|until|constref|stdcall|cdecl|external|generic|specialize)\b'; cComments1 = '(\s*\/\/.*$)|(\{[^\{]*\})'; - cComments2 = '\{[^\{]*\}'; + cComments2 = '\{[^\$][^\{]*\}'; cDefines1 = '\{\$[^\{]*\}'; @@ -892,6 +892,7 @@ begin if not Assigned(FKeywordFont) then FKeywordFont := fpgGetFont(edt.FontDesc + ':bold'); ACanvas.Font := FKeywordFont; + ACanvas.Color := clWhite; FRegex.Expression := cKeywords1; FRegex.ModifierI := True; if FRegex.Exec(ALineText) then @@ -912,6 +913,7 @@ begin { syntax highlighting for: cDecimal } ACanvas.TextColor := clNavy; + ACanvas.Color := clWhite; FRegex.Expression := cDecimal; if FRegex.Exec(ALineText) then begin @@ -929,6 +931,7 @@ begin { syntax highlighting for: cHexadecimal } ACanvas.TextColor := clMagenta; + ACanvas.Color := clWhite; FRegex.Expression := cHexadecimal; if FRegex.Exec(ALineText) then begin @@ -946,6 +949,7 @@ begin { syntax highlighting for: comments2 } ACanvas.TextColor := clDarkCyan; + ACanvas.Color := clWhite; FRegex.Expression := cComments2; if FRegex.Exec(ALineText) then begin @@ -963,6 +967,7 @@ begin { syntax highlighting for: cDefines1 } ACanvas.TextColor := clRed; + ACanvas.Color := clWhite; FRegex.Expression := cDefines1; if FRegex.Exec(ALineText) then begin @@ -980,6 +985,7 @@ begin { syntax highlighting for: cString1 } ACanvas.TextColor := clOlive; + ACanvas.Color := clWhite; FRegex.Expression := cString1; if FRegex.Exec(ALineText) then begin @@ -997,6 +1003,7 @@ begin { syntax highlighting for: comments1 } ACanvas.TextColor := clDarkCyan; + ACanvas.Color := clWhite; FRegex.Expression := cComments1; if FRegex.Exec(ALineText) then begin diff --git a/examples/apps/ide/src/maximus.lpi b/examples/apps/ide/src/maximus.lpi index 5d3e289a..accb3570 100644 --- a/examples/apps/ide/src/maximus.lpi +++ b/examples/apps/ide/src/maximus.lpi @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectOptions> <Version Value="9"/> diff --git a/examples/apps/ide/src/maximus.lpr b/examples/apps/ide/src/maximus.lpr index 1f758a43..cf9c439f 100644 --- a/examples/apps/ide/src/maximus.lpr +++ b/examples/apps/ide/src/maximus.lpr @@ -22,10 +22,29 @@ uses {$IFDEF UNIX} cthreads, {$ENDIF} - Classes, fpg_base, fpg_main, frm_main, frm_configureide, ideconst, idemacros, - frm_debug, project, unitlist, frm_projectoptions, ideutils, builderthread, - ideimages, stringhelpers, frm_procedurelist, mPasLex, filemonitor, SynRegExpr, - fpg_textedit, frm_find, Sha1; + Classes, + fpg_base, + fpg_main, + fpg_cmdlineparams, + frm_main, + frm_configureide, + ideconst, + idemacros, + frm_debug, + project, + unitlist, + frm_projectoptions, + ideutils, + builderthread, + ideimages, + stringhelpers, + frm_procedurelist, + mPasLex, + filemonitor, + SynRegExpr, + fpg_textedit, + frm_find, + Sha1; procedure MainProc; |