From 02d0e9cc251815888303d75b42dadaa26cda2294 Mon Sep 17 00:00:00 2001 From: alexs75 Date: Wed, 12 Apr 2017 12:47:22 +0000 Subject: [PATCH] RxFPC: RxLazReport - fix HInstance on load resource git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5835 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/rx/trunk/LazReport/lrrxcontrols.pas | 2 +- components/rx/trunk/rxdbgrid_print/rxdbgridprintgrid.pas | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/rx/trunk/LazReport/lrrxcontrols.pas b/components/rx/trunk/LazReport/lrrxcontrols.pas index 1377c97e4..34dea8a87 100644 --- a/components/rx/trunk/LazReport/lrrxcontrols.pas +++ b/components/rx/trunk/LazReport/lrrxcontrols.pas @@ -146,7 +146,7 @@ begin if not assigned(cmpBMP) then begin cmpBMP := TBitmap.Create; - cmpBMP.LoadFromResourceName(0, lrClass.ClassName); + cmpBMP.LoadFromResourceName(HInstance, lrClass.ClassName); frRegisterObject(lrClass, cmpBMP, lrClass.ClassName, nil, otlUIControl, nil); end; end; diff --git a/components/rx/trunk/rxdbgrid_print/rxdbgridprintgrid.pas b/components/rx/trunk/rxdbgrid_print/rxdbgridprintgrid.pas index 4d0f3fb24..eb5bffc6c 100644 --- a/components/rx/trunk/rxdbgrid_print/rxdbgridprintgrid.pas +++ b/components/rx/trunk/rxdbgrid_print/rxdbgridprintgrid.pas @@ -111,7 +111,7 @@ type procedure Register; implementation -uses math, RxDBGridPrintGrid_SetupUnit, Forms, Controls, rxdconst; +uses math, RxDBGridPrintGrid_SetupUnit, Forms, Controls, rxdconst, LCLIntf; {$R rxdbgridprintgrid.res}