From bba6d272418fae4cf21478a1300e5eb9a288713c Mon Sep 17 00:00:00 2001
From: inoussa <inoussa@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sat, 14 Jun 2014 17:19:39 +0000
Subject: [PATCH] Lazarus Trunk Fix (Thanks Juha Maninnen)

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3169 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../type_lib_edtr/uwsttypelibraryedit.pas     | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/wst/trunk/type_lib_edtr/uwsttypelibraryedit.pas b/wst/trunk/type_lib_edtr/uwsttypelibraryedit.pas
index e7504dac1..18b4f5aa4 100644
--- a/wst/trunk/type_lib_edtr/uwsttypelibraryedit.pas
+++ b/wst/trunk/type_lib_edtr/uwsttypelibraryedit.pas
@@ -19,7 +19,7 @@ interface
 uses
   Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ComCtrls,
   ExtCtrls, Menus, ActnList, Contnrs,
-  pastree, pascal_parser_intf, logger_intf,
+  pastree, pascal_parser_intf, logger_intf, LCLVersion,
   SynHighlighterPas, SynEdit, StdCtrls, SynHighlighterXML
   {$IFDEF WST_IDE},ProjectIntf{$ENDIF};
 
@@ -199,8 +199,7 @@ type
     procedure FDFind(Sender : TObject);
     procedure FDShow(Sender : TObject);
     procedure FormClose (Sender : TObject; var CloseAction : TCloseAction );
-    procedure FormDropFiles(Sender : TObject; const FileNames : array of String
-      );
+    procedure FormDropFiles(Sender : TObject; const FileNames : array of String);
     procedure FormShow(Sender: TObject);
     procedure trvSchemaSelectionChanged(Sender : TObject);
   private
@@ -244,11 +243,11 @@ var
 
 implementation
 uses
-  view_helper, DOM, wst_fpc_xml, XMLWrite, //HeapTrc,
+  view_helper, DOM, wst_fpc_xml, XMLWrite,
   xsd_parser, wsdl_parser, source_utils, command_line_parser, generator, metadata_generator,
   binary_streamer, wst_resources_utils, xsd_generator, wsdl_generator,
   uabout, edit_helper, udm, ufrmsaveoption, pparser, SynEditTypes
-  {$IFDEF WST_IDE},LazIDEIntf,IDEMsgIntf{$ENDIF}
+  {$IFDEF WST_IDE},LazIDEIntf,IDEMsgIntf, IDEExternToolIntf{$ENDIF}
   , xsd_consts, parserutils, locators;
 
 {$IFDEF WST_IDE}
@@ -768,6 +767,26 @@ begin
   end;
 end;
 
+{$IFDEF WST_IDE}
+procedure ShowParsing(FileName: string);
+begin
+{$IF lcl_fullversion < 1030000}
+  IDEMessagesWindow.AddMsg(Format('Parsing %s...',[Filename]),ExtractFileDir(Filename),0);
+{$ELSE}
+  IDEMessagesWindow.AddCustomMessage(mluNote, 'Parsing ...', Filename);
+{$ENDIF}
+end;
+
+procedure ShowParsed(FileName: string);
+begin
+{$IF lcl_fullversion < 1030000}
+  IDEMessagesWindow.AddMsg(Format('File Parsed %s.',[Filename]),ExtractFileDir(Filename),0);
+{$ELSE}
+  IDEMessagesWindow.AddCustomMessage(mluNote, 'File Parsed.', Filename);
+{$ENDIF}
+end;
+{$ENDIF WST_IDE}
+
 procedure TfWstTypeLibraryEdit.FormShow(Sender: TObject);
 var
 {$IFDEF WST_IDE}
@@ -784,9 +803,9 @@ begin
       locContent.LoadFromFile(prjFile.FileName);
       if ( locContent.Size > 0 ) then begin
         locContent.Position := 0;
-        IDEMessagesWindow.AddMsg(Format('Parsing %s...',[prjFile.Filename]),ExtractFileDir(prjFile.Filename),0);
+        ShowParsing(prjFile.Filename);
         OpenFile(prjFile.Filename,locContent);
-        IDEMessagesWindow.AddMsg(Format('File Parsed %s.',[prjFile.Filename]),ExtractFileDir(prjFile.Filename),0);
+        ShowParsed(prjFile.Filename);
         FProjectLibrary := prjFile;
       end;
     finally