diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp index 14c0298dd8..da6a1fa0bc 100644 --- a/lcl/comctrls.pp +++ b/lcl/comctrls.pp @@ -760,8 +760,8 @@ type constructor Create(TheOwner: TCustomListView); destructor Destroy; override; function Add: TListColumn; - procedure BeginUpdate; virtual; - procedure EndUpdate; virtual; + procedure BeginUpdate; {$IFNDEF VER2_0}override{$ELSE}virtual{$ENDIF}; + procedure EndUpdate; {$IFNDEF VER2_0}override{$ELSE}virtual{$ENDIF}; property Owner: TCustomListView read FOwner; property Items[const AIndex: Integer]: TListColumn read GetItem write SetItem; default; diff --git a/lcl/include/listcolumns.inc b/lcl/include/listcolumns.inc index ddcee69d5e..80a63d4972 100644 --- a/lcl/include/listcolumns.inc +++ b/lcl/include/listcolumns.inc @@ -30,11 +30,17 @@ end; procedure TListColumns.BeginUpdate; begin + {$IFNDEF VER2_0} + inherited; + {$ENDIF} inc(FUpdateCount); end; procedure TListColumns.EndUpdate; begin + {$IFNDEF VER2_0} + inherited; + {$ENDIF} if FUpdateCount<=0 then RaiseGDBException('TListColumns.EndUpdate'); dec(FUpdateCount); diff --git a/lcl/lresources.pp b/lcl/lresources.pp index 937f89ba90..125ea9bf9b 100644 --- a/lcl/lresources.pp +++ b/lcl/lresources.pp @@ -90,10 +90,11 @@ type FBufSize: Integer; FBufPos: Integer; FBufEnd: Integer; - procedure Read(var Buf; Count: LongInt); procedure SkipProperty; procedure SkipSetBody; + protected function ReadIntegerContent: integer; + procedure Read(var Buf; Count: LongInt); {$IFNDEF VER2_0}override;{$ENDIF} public constructor Create(AStream: TStream; BufSize: Integer); virtual; destructor Destroy; override; @@ -138,7 +139,7 @@ type FSignatureWritten: Boolean; protected procedure FlushBuffer; - procedure Write(const Buffer; Count: Longint); + procedure Write(const Buffer; Count: Longint); {$IFNDEF VER2_0}override;{$ENDIF} procedure WriteValue(Value: TValueType); procedure WriteStr(const Value: String); procedure WriteIntegerContent(i: integer);