diff --git a/lcl/graphics.pp b/lcl/graphics.pp index 149c2f68c6..f0a597d4da 100644 --- a/lcl/graphics.pp +++ b/lcl/graphics.pp @@ -690,6 +690,9 @@ type procedure Progress(Sender: TObject; Stage: TProgressStage; PercentDone: Byte; RedrawNow: Boolean; const R: TRect; const Msg: string; var DoContinue: boolean); dynamic; + procedure Progress(Sender: TObject; Stage: TProgressStage; + PercentDone: Byte; RedrawNow: Boolean; const R: TRect; + const Msg: string); dynamic; procedure ReadData(Stream: TStream); virtual; procedure SetHeight(Value: Integer); virtual; abstract; procedure SetPalette(Value: HPALETTE); virtual; diff --git a/lcl/include/graphic.inc b/lcl/include/graphic.inc index 64cdacef56..8027bfe1e9 100644 --- a/lcl/include/graphic.inc +++ b/lcl/include/graphic.inc @@ -60,6 +60,15 @@ begin FOnProgress(Sender, Stage, PercentDone, RedrawNow, R, Msg, DoContinue); end; +procedure TGraphic.Progress(Sender: TObject; Stage: TProgressStage; + PercentDone: Byte; RedrawNow: Boolean; const R: TRect; const Msg: string); +var + DoContinue: Boolean; +begin + DoContinue:=true; + Progress(Sender,Stage,PercentDone,RedrawNow,R,Msg,DoContinue); +end; + function TGraphic.Equals(Graphic: TGraphic): Boolean; var SelfImage, GraphicsImage: TMemoryStream; diff --git a/lcl/interfaces/gtk/gtkproc.inc b/lcl/interfaces/gtk/gtkproc.inc index 43b67085dd..0f48e715d7 100644 --- a/lcl/interfaces/gtk/gtkproc.inc +++ b/lcl/interfaces/gtk/gtkproc.inc @@ -3088,7 +3088,7 @@ var KeySym: array[0..3] of TKeySym; VKey, FreeVK, Flags: Byte; VKeyRec: TVKeyRecord; - HasMultiVK, DoMultiVK, Extended, HasKey, ComputeVK, WarningShown: Boolean; + HasMultiVK, DoMultiVK, Extended, HasKey, ComputeVK: Boolean; KeySymChars: array[0..16] of Char; KeySymCharLen: Integer; XKeyEvent: TXKeyEvent; @@ -3107,7 +3107,6 @@ begin Assert((LoKey >= 0) and (HiKey <= 255)); // perdef FreeVK := $92; // first OEM specific VK - WarningShown := False; FillChar(KeySym,SizeOf(KeySym),0); for n := LoKey to HiKey do begin