From 0fc7614d00c0d170ceacda43b23083e09974a821 Mon Sep 17 00:00:00 2001 From: mattias Date: Wed, 4 Jun 2014 09:38:48 +0000 Subject: [PATCH] IDE: fixed compilation git-svn-id: trunk@45334 - --- ide/environmentopts.pp | 8 +++++++- ide/ideoptiondefs.pas | 10 +++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ide/environmentopts.pp b/ide/environmentopts.pp index d1fda4ccd0..2a16088c98 100644 --- a/ide/environmentopts.pp +++ b/ide/environmentopts.pp @@ -354,7 +354,9 @@ type fMsgViewColors: array[TMsgWndColor] of TColor; FShowCompileDialog: Boolean; // show dialog during compile FAutoCloseCompileDialog: Boolean; // auto close dialog after succesed compile + {$IFDEF EnableNewExtTools} FMsgViewFilters: TLMsgViewFilters; + {$ENDIF} // compiler + debugger + lazarus files FParseValues: array[TEnvOptParseType] of TParseString; @@ -737,7 +739,9 @@ type property MsgViewFilenameStyle: TMsgWndFileNameStyle read FMsgViewFilenameStyle write FMsgViewFilenameStyle; property MsgViewColors[c: TMsgWndColor]: TColor read GetMsgViewColors write SetMsgViewColors; + {$IFDEF EnableNewExtTools} property MsgViewFilters: TLMsgViewFilters read FMsgViewFilters write FMsgViewFilters; + {$ENDIF} // glyphs property ShowButtonGlyphs: TApplicationShowGlyphs read FShowButtonGlyphs write FShowButtonGlyphs; @@ -983,7 +987,9 @@ begin FMsgViewFilenameStyle:=mwfsShort; for c:=low(TMsgWndColor) to high(TMsgWndColor) do fMsgViewColors[c]:=MsgWndDefaultColors[c]; + {$IFDEF EnableNewExtTools} FMsgViewFilters:=TLMsgViewFilters.Create(nil); + {$ENDIF} // glyphs FShowButtonGlyphs := sbgSystem; @@ -1058,8 +1064,8 @@ var i: Integer; begin FreeAndNil(FBuildMatrixOptions); - FreeAndNil(FMsgViewFilters); {$IFDEF EnableNewExtTools} + FreeAndNil(FMsgViewFilters); FreeAndNil(fExternalUserTools); {$ELSE} FreeAndNil(fExternalTools); diff --git a/ide/ideoptiondefs.pas b/ide/ideoptiondefs.pas index f5dbf07ca1..e219541355 100644 --- a/ide/ideoptiondefs.pas +++ b/ide/ideoptiondefs.pas @@ -127,6 +127,7 @@ const 'JumpHistory', 'ComponentList' ); +{$IFDEF EnableNewExtTools} type TLMsgViewFilter = class; @@ -219,15 +220,16 @@ type property OnChanged: TNotifyEvent read FOnChanged write FOnChanged; end; + function CompareFilterMsgType(FilterMsgType1, FilterMsgType2: Pointer): integer; + function CompareLineAndFilterMsgType(MessageLine1, FilterMsgType1: Pointer): integer; +{$ENDIF} + function CreateNiceWindowPosition(Width, Height: integer): TRect; function NonModalIDEFormIDToEnum(const FormID: string): TNonModalIDEWindow; function GetLazIDEConfigStorage(const Filename: string; LoadFromDisk: Boolean ): TConfigStorage; // load errors: raises exceptions -function CompareFilterMsgType(FilterMsgType1, FilterMsgType2: Pointer): integer; -function CompareLineAndFilterMsgType(MessageLine1, FilterMsgType1: Pointer): integer; - implementation @@ -321,6 +323,7 @@ begin Result:=TXMLOptionsStorage.Create(ConfigFilename,LoadFromDisk); end; +{$IFDEF EnableNewExtTools} function CompareFilterMsgType(FilterMsgType1, FilterMsgType2: Pointer): integer; var Item1: TLMVFilterMsgType absolute FilterMsgType1; @@ -503,6 +506,7 @@ begin for i:=1 to Count do Filters[i-1].SaveToXMLConfig(XMLConfig,Path+'Filter'+IntToStr(i)+'/'); end; +{$ENDIF} { TXMLOptionsStorage }