paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 10:39:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

editormacroscript: fixed compilation

Browse Source 
git-svn-id: trunk@45134 -
This commit is contained in:
mattias 2014-05-21 11:23:48 +00:00
parent d84e4a5a95
commit be15685e52
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/macroscript/emscriptmacro.pas
View File

@ -6,6 +6,9 @@ interface
uses uses
Classes, SysUtils, SrcEditorIntf, IDEMsgIntf, LazIDEIntf, IDEOptionsIntf, Classes, SysUtils, SrcEditorIntf, IDEMsgIntf, LazIDEIntf, IDEOptionsIntf,
{$IFDEF EnableNewExtTools}
IDEExternToolIntf,
{$ENDIF}
Controls, SynEdit, EMScriptClasses, EMSStrings, Laz2_XMLCfg, uPSRuntime, Controls, SynEdit, EMScriptClasses, EMSStrings, Laz2_XMLCfg, uPSRuntime,
uPSUtils, LazLoggerBase, LazFileUtils; uPSUtils, LazLoggerBase, LazFileUtils;
@ -297,7 +300,11 @@ begin
Exec.RunScript; Exec.RunScript;
except except
on e: Exception do on e: Exception do
{$IFDEF EnableNewExtTools}
IDEMessagesWindow.AddCustomMessage(mluError,Format('%s: %s', [e.ClassName, e.Message]));
{$ELSE}
IDEMessagesWindow.AddMsg(Format('%s: %s', [e.ClassName, e.Message]), '', -1); IDEMessagesWindow.AddMsg(Format('%s: %s', [e.ClassName, e.Message]), '', -1);
{$ENDIF}
end; end;
if Exec.ExceptionCode <> erNoError then begin if Exec.ExceptionCode <> erNoError then begin
ExObj := Exec.ExceptionObject; ExObj := Exec.ExceptionObject;
@ -311,7 +318,11 @@ begin
y := 0; y := 0;
Exec.TranslatePositionEx(Exec.ExceptionProcNo, Exec.ExceptionPos, i, x, y, s2); Exec.TranslatePositionEx(Exec.ExceptionProcNo, Exec.ExceptionPos, i, x, y, s2);
if IDEMessagesWindow <> nil then if IDEMessagesWindow <> nil then
{$IFDEF EnableNewExtTools}
IDEMessagesWindow.AddCustomMessage(mluError,Format('%s: "%s" at %d/%d', [s, Exec.ExceptionString, x,y]));
{$ELSE}
IDEMessagesWindow.AddMsg(Format('%s: "%s" at %d/%d', [s, Exec.ExceptionString, x,y]), '', -1); IDEMessagesWindow.AddMsg(Format('%s: "%s" at %d/%d', [s, Exec.ExceptionString, x,y]), '', -1);
{$ENDIF}
end; end;
finally finally