lazreport: less notes

git-svn-id: trunk@36418 -

components/lazreport/source/lr_barc.pas

@@ -95,7 +95,7 @@ type
     procedure SaveToStream(Stream: TStream); override;
     procedure Draw(aCanvas: TCanvas); override;
     procedure Print(Stream: TStream); override;
-    procedure DefinePopupMenu(Popup: TPopupMenu); override;
+    procedure DefinePopupMenu({%H-}Popup: TPopupMenu); override;
     
     procedure LoadFromXML(XML: TLrXMLConfig; const Path: String); override;
     procedure SaveToXML(XML: TLrXMLConfig; const Path: String); override;
@@ -133,7 +133,7 @@ type
     RB2: TRadioButton;
     RB3: TRadioButton;
     RB4: TRadioButton;
-    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
+    procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure VarBtnClick(Sender: TObject);
     procedure DBBtnClick(Sender: TObject);
@@ -191,7 +191,7 @@ const
 {$HINTS OFF}
 function isNumeric(St: String): Boolean;
 var
-  R: Double;
+  {%H-}R: Double;
   E: Integer;
 begin
   Val(St, R, E);
@@ -753,14 +753,9 @@ begin
 end;
 
 initialization
-
+  frBarCodeForm := TfrBarCodeForm.Create(nil);
-//  frBarCodeForm:=nil;
+  frRegisterObject(TfrBarCodeView, frBarCodeForm.Image1.Picture.Bitmap,
-  if not assigned(frBarCodeForm) {and not (csDesigning in ComponentState)} then
+                         sInsBarcode, frBarCodeForm);
-  begin
-    frBarCodeForm := TfrBarCodeForm.Create(nil);
-    frRegisterObject(TfrBarCodeView, frBarCodeForm.Image1.Picture.Bitmap,
-                           sInsBarcode, frBarCodeForm);
-  end;
 finalization
   if Assigned(frBarCodeForm) then
     frBarCodeForm.Free;

components/lazreport/source/lr_color.pas

@@ -27,7 +27,7 @@ type
     FOtherBtn: TSpeedButton;
     FOnColorSelected: TNotifyEvent;
     procedure ButtonClick(Sender: TObject);
-    procedure SetColor(Value: TColor);
+    procedure SetColor(Value: TColor); reintroduce;
   public
     constructor Create(AOwner: TComponent); override;
     property Color: TColor read FColor write SetColor;

components/lazreport/source/lr_desgn.pas

@@ -164,14 +164,14 @@ type
     procedure DrawDialog;
 
     procedure MDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
-    procedure MUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
+    procedure MUp(Sender: TObject; Button: TMouseButton; {%H-}Shift: TShiftState; {%H-}X, {%H-}Y: Integer);
     procedure MMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
-    procedure CMMouseLeave(var Message: TLMessage); message CM_MOUSELEAVE;
+    procedure CMMouseLeave(var {%H-}Message: TLMessage); message CM_MOUSELEAVE;
     procedure DClick(Sender: TObject);
     procedure MoveResize(Kx,Ky:Integer; UseFrames,AResize: boolean);
   protected
     procedure Paint; override;
-    procedure WMEraseBkgnd(var Message: TLMEraseBkgnd); message LM_ERASEBKGND;
+    procedure WMEraseBkgnd(var {%H-}Message: TLMEraseBkgnd); message LM_ERASEBKGND;
   public
     constructor Create(AOwner: TComponent); override;
 
@@ -522,7 +522,7 @@ type
     procedure GetDefaultSize(var dx, dy: Integer);
     function SelStatus: TfrSelectionStatus;
     procedure UpdScrollbars;
-    procedure InsertFieldsFormCloseQuery(Sender: TObject; var CanClose: boolean);
+    procedure InsertFieldsFormCloseQuery(Sender: TObject; var {%H-}CanClose: boolean);
     procedure InsertDbFields;
     {$ifdef sbod}
     procedure DrawStatusPanel(const ACanvas:TCanvas; const rect:  TRect);
@@ -552,7 +552,7 @@ type
     procedure ShowMemoEditor;
     procedure ShowEditor;
     procedure RedrawPage; override;
-    procedure OnModify(sender: TObject);
+    procedure OnModify({%H-}sender: TObject);
     function PointsToUnits(x: Integer): Double;  override;
     function UnitsToPoints(x: Double): Integer;  override;
     procedure MoveObjects(dx, dy: Integer; aResize: Boolean);
@@ -1383,7 +1383,7 @@ begin
   begin
     DrawPage(dmSelection);
     Down := False;
-    GetCursorPos(p);
+    GetCursorPos(p{%H-});
     //FDesigner.Popup1Popup(nil);
     
     FDesigner.Popup1.PopUp(p.X,p.Y);
@@ -2275,9 +2275,9 @@ end;
 
 function EnumFontsProc(
   var LogFont: TEnumLogFontEx;
-  var Metric: TNewTextMetricEx;
+  var {%H-}Metric: TNewTextMetricEx;
   FontType: Longint;
-  Data: LParam):LongInt; stdcall;
+  {%H-}Data: LParam):LongInt; stdcall;
 var
   S: String;
 begin
@@ -3669,7 +3669,6 @@ end;
 
 procedure TfrDesignerForm.DuplicateView(View: TfrView; Data: PtrInt);
 var
-  DeltaX,DeltaY: Integer;
   t: TfrView;
 begin
   // check if view is unique instance band kind and if there is already one

components/lazreport/source/lr_dopt.pas

@@ -56,8 +56,8 @@ type
     TabSheet2: TTabSheet;
     procedure FormActivate(Sender: TObject);
     procedure FormCreate(Sender: TObject);
-    procedure ListBox1DrawItem(Control: TWinControl; Index: Integer;
+    procedure ListBox1DrawItem({%H-}Control: TWinControl; Index: Integer;
-      ARect: TRect; State: TOwnerDrawState);
+      ARect: TRect; {%H-}State: TOwnerDrawState);
   private
     { Private declarations }
   public
@@ -108,8 +108,6 @@ end;
 
 procedure TfrDocOptForm.ListBox1DrawItem(Control: TWinControl; Index: Integer;
   ARect: TRect; State: TOwnerDrawState);
-var
-  ImgRect:TRect;
 begin
   ListBox1.Canvas.FillRect(ARect);       { clear the rectangle }
   if ListBox1.Items.Count > Index then

components/lazreport/source/lr_flds.pas

@@ -33,10 +33,10 @@ type
     procedure FormDeactivate(Sender: TObject);
     procedure ValListDblClick(Sender: TObject);
     procedure ValListKeyDown(Sender: TObject; var Key: Word;
-      Shift: TShiftState);
+      {%H-}Shift: TShiftState);
     procedure FormKeyDown(Sender: TObject; var Key: Word;
-      Shift: TShiftState);
+      {%H-}Shift: TShiftState);
-    procedure ValListSelectionChange(Sender: TObject; User: boolean);
+    procedure ValListSelectionChange(Sender: TObject; {%H-}User: boolean);
   private
     { Private declarations }
     procedure FillValCombo;

components/lazreport/source/lr_newrp.pas

@@ -17,7 +17,7 @@ interface
 uses
   Classes, SysUtils, FileUtil, LResources,
   Forms, Controls, Graphics, Dialogs,
-  Buttons, StdCtrls,ExtCtrls, BarChart, ButtonPanel,
+  Buttons, StdCtrls,ExtCtrls, ButtonPanel,
   LR_Const;
 
 type

components/lazreport/source/lr_var.pas

@@ -31,13 +31,13 @@ type
     Label1: TLabel;
     procedure ValListDblClick(Sender: TObject);
     procedure ValListKeyDown(Sender: TObject; var Key: Word;
-      Shift: TShiftState);
+      {%H-}Shift: TShiftState);
     procedure ValComboClick(Sender: TObject);
     procedure FormActivate(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDeactivate(Sender: TObject);
     procedure FormKeyDown(Sender: TObject; var Key: Word;
-      Shift: TShiftState);
+      {%H-}Shift: TShiftState);
   private
     { Private declarations }
     function CurVal: String;

components/lazreport/source/lr_view.pas

@@ -211,10 +211,6 @@ type
 var
   LastScale     : Double = 1;
   LastScaleMode : TfrScaleMode = mdNone;
-  CurPreview    : TfrPreviewForm;
-  RecordNum     : Integer;
-
-
 {----------------------------------------------------------------------------}
 constructor TfrPreview.Create(AOwner: TComponent);
 begin
@@ -1274,8 +1270,7 @@ begin
   RedrawAll;
 end;
 
-type
+//type THackBtn = class(TBitBtn);
-  THackBtn = class(TBitBtn);
 
 procedure TfrPreviewForm.HelpBtnClick(Sender: TObject);
 begin