From: <dav...@us...> - 2011-09-17 04:25:44
|
Revision: 941 http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=941&view=rev Author: davidvtaylor Date: 2011-09-17 04:25:37 +0000 (Sat, 17 Sep 2011) Log Message: ----------- * Change the TDateSet.DataEvent Info parameter type from Longint to NativeInt for DXE2 or later Modified Paths: -------------- trunk/Source/Core/InstantPresentation.pas Modified: trunk/Source/Core/InstantPresentation.pas =================================================================== --- trunk/Source/Core/InstantPresentation.pas 2011-09-17 04:18:35 UTC (rev 940) +++ trunk/Source/Core/InstantPresentation.pas 2011-09-17 04:25:37 UTC (rev 941) @@ -410,7 +410,11 @@ function CreateAccessor: TInstantAccessor; virtual; procedure CreateFields; override; function CreateNestedDataSet(DataSetField: TDataSetField): TDataSet; override; + {$IFDEF D16+} + procedure DataEvent(Event: TDataEvent; Info: NativeInt); override; + {$ELSE} procedure DataEvent(Event: TDataEvent; Info: Longint); override; + {$ENDIF} procedure DestroyAccessor; procedure DoAfterDelete; override; procedure DoAfterPostField(Field: TField); virtual; @@ -581,7 +585,11 @@ FOnMasterDisable: TNotifyEvent; protected procedure ActiveChanged; override; + {$IFDEF D16+} + procedure DataEvent(Event: TDataEvent; Info: NativeInt); override; + {$ELSE} procedure DataEvent(Event: TDataEvent; Info: Longint); override; + {$ENDIF} procedure DoMasterChange; procedure DoMasterDisable; function GetDetailDataSet: TDataSet; override; @@ -610,7 +618,11 @@ procedure SyncWithParent(Field: TDataSetField); protected procedure SetSubject(Value: TObject); virtual; + {$IFDEF D16+} + procedure DataEvent(Event: TDataEvent; Info: NativeInt); override; + {$ELSE} procedure DataEvent(Event: TDataEvent; Info: Longint); override; + {$ENDIF} function GetSubject: TObject; override; procedure MasterChanged(Sender: TObject); procedure SetDataSetField(const Value: TDataSetField); override; @@ -2550,7 +2562,8 @@ Result := Accessor.CreateObject; end; -procedure TInstantCustomExposer.DataEvent(Event: TDataEvent; Info: Longint); +procedure TInstantCustomExposer.DataEvent(Event: TDataEvent; + Info: {$IFDEF D16+}NativeInt{$ELSE}Longint{$ENDIF}); var I: Integer; DataSet: TDataSet; @@ -4385,7 +4398,8 @@ FDetailExposer := ADetailExposer; end; -procedure TInstantExposerLink.DataEvent(Event: TDataEvent; Info: Integer); +procedure TInstantExposerLink.DataEvent(Event: TDataEvent; + Info: {$IFDEF D16+}NativeInt{$ELSE}Longint{$ENDIF}); begin inherited; if not DetailExposer.Active and (Event = deRecordChange) then @@ -4445,7 +4459,7 @@ { TInstantExposer } procedure TInstantExposer.DataEvent(Event: TDataEvent; - Info: Integer); + Info: {$IFDEF D16+}NativeInt{$ELSE}Longint{$ENDIF}); begin case Event of deParentScroll: |