* Fixed the issue with screen flicker in the TfpgForm.OnPaint event handler.

* Fixed the issue where you still had to call Canvas.BeginDraw and Canvas.EndDraw inside HandlePaint.
* Fixed the issue where custom painting in the OnPaint event handler of a Form did not show until the form was resized or revealed.

2 files changed, 3 insertions, 4 deletions

diff --git a/src/corelib/gfx_widget.pas b/src/corelib/gfx_widget.pas
index 58fe8e84..72014f3c 100644
--- a/src/corelib/gfx_widget.pas
+++ b/src/corelib/gfx_widget.pas
@@ -573,7 +573,7 @@ end;
 procedure TfpgWidget.RePaint;
 begin
   if HasHandle then
-    HandlePaint;
+    fpgSendMessage(self, self, FPGM_PAINT);
 end;
 
 procedure TfpgWidget.SetFocus;
diff --git a/src/gui/gui_form.pas b/src/gui/gui_form.pas
index 8e0c51ec..a284ae54 100644
--- a/src/gui/gui_form.pas
+++ b/src/gui/gui_form.pas
@@ -155,6 +155,7 @@ begin
     else
       ActiveWidget.SetFocus;
   end;
+
   if Assigned(FOnActivate) then
     FOnActivate(self);
 end;
@@ -170,10 +171,8 @@ end;
 
 procedure TfpgForm.HandlePaint;
 begin
-  Canvas.BeginDraw;
-  inherited;
+  inherited HandlePaint;
   Canvas.Clear(FBackgroundColor);
-  Canvas.EndDraw(0, 0, FWidth, FHeight);
 end;
 
 procedure TfpgForm.AdjustWindowStyle;