diff --git a/lcl/extdlgs.pas b/lcl/extdlgs.pas index 31646acbbd..d0f6d546cd 100644 --- a/lcl/extdlgs.pas +++ b/lcl/extdlgs.pas @@ -76,8 +76,6 @@ type FPreviewFilename: string; protected function IsFilterStored: Boolean; virtual; - procedure PreviewKeyDown(Sender: TObject; var Key: word); virtual; - procedure PreviewClick(Sender: TObject); virtual; property ImageCtrl: TImage read FImageCtrl; property PictureGroupBox: TGroupBox read FPictureGroupBox; procedure InitPreviewControl; override; @@ -304,16 +302,6 @@ begin Result := (Filter<>FDefaultFilter); end; -procedure TOpenPictureDialog.PreviewKeyDown(Sender: TObject; var Key: word); -begin - if Key = VK_ESCAPE then TForm(Sender).Close; -end; - -procedure TOpenPictureDialog.PreviewClick(Sender: TObject); -begin - -end; - procedure TOpenPictureDialog.DoClose; begin ClearPreview; diff --git a/lcl/include/picture.inc b/lcl/include/picture.inc index 479b131804..a1ca2df506 100644 --- a/lcl/include/picture.inc +++ b/lcl/include/picture.inc @@ -683,9 +683,9 @@ function TPicture.FindGraphicClassWithFileExt(const Ext: string; var FileExt: String; begin - FileExt:=Ext; - if (FileExt<>'') and (FileExt[1]='.') then - FileExt:=copy(FileExt,2,length(FileExt)); + FileExt := Ext; + if (FileExt <> '') and (FileExt[1] = '.') then + FileExt := Copy(FileExt, 2, length(FileExt)); Result := GetPicFileFormats.FindExt(FileExt); if (Result = nil) and ExceptionOnNotFound then raise EInvalidGraphic.CreateFmt(rsUnknownPictureExtension, [Ext]);