From 4be1b4009d42ee215db3d5c108653c7249dfdab8 Mon Sep 17 00:00:00 2001 From: Merlijn Wajer Date: Sun, 7 Aug 2011 21:28:21 +0200 Subject: [PATCH] Revert "Should compile with latest LCL, donno if it works, but meh, just graphic components." This reverts commit 981ec3760a5fdde59fcde6038e968b9cbd43a354. --- Units/PascalScript/uPSI_ComCtrls.pas | 2 +- Units/PascalScript/uPSR_extctrls.pas | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Units/PascalScript/uPSI_ComCtrls.pas b/Units/PascalScript/uPSI_ComCtrls.pas index b1d2ca4..d6c6b61 100644 --- a/Units/PascalScript/uPSI_ComCtrls.pas +++ b/Units/PascalScript/uPSI_ComCtrls.pas @@ -311,7 +311,7 @@ begin T := Self.TabIndex; end; (*----------------------------------------------------------------------------*) procedure TTabControlNoteBookStringsNoteBook_R(Self: TTabControlNoteBookStrings; var T: TNoteBook); -begin T := TNoteBook(Self.NoteBook); end; +begin T := Self.NoteBook; end; (*----------------------------------------------------------------------------*) procedure TTabControlStringsTabWidth_W(Self: TTabControlStrings; const T: Smallint); diff --git a/Units/PascalScript/uPSR_extctrls.pas b/Units/PascalScript/uPSR_extctrls.pas index 080a8b1..c332bf5 100644 --- a/Units/PascalScript/uPSR_extctrls.pas +++ b/Units/PascalScript/uPSR_extctrls.pas @@ -85,14 +85,14 @@ procedure RIRegisterTPANEL(Cl: TPSRuntimeClassImporter); begin Cl.Add(TPANEL); end; -procedure TPagePageIndex_R(Self: TCustomPage; var T: INTEGER); begin T := Self.PageIndex; end; -procedure TPagePageIndex_W(Self: TCustomPage; T: INTEGER); begin Self.PageIndex := T; end; -procedure TPageOnShow_R(Self: TCustomPage; var T: TNotifyEvent); begin T := Self.OnShow; end; -procedure TPageOnShow_W(Self: TCustomPage; T: TNotifyEvent); begin Self.OnShow := T; end; +procedure TPagePageIndex_R(Self: TPAGE; var T: INTEGER); begin T := Self.PageIndex; end; +procedure TPagePageIndex_W(Self: TPAGE; T: INTEGER); begin Self.PageIndex := T; end; +procedure TPageOnShow_R(Self: TPAGE; var T: TNotifyEvent); begin T := Self.OnShow; end; +procedure TPageOnShow_W(Self: TPAGE; T: TNotifyEvent); begin Self.OnShow := T; end; {$IFNDEF CLX} procedure RIRegisterTPAGE(Cl: TPSRuntimeClassImporter); begin - with Cl.Add(TCustomPage) do + with Cl.Add(TPAGE) do begin RegisterPropertyHelper(@TPagePageIndex_R,@TPagePageIndex_W,'PageIndex'); RegisterEventPropertyHelper(@TPageOnShow_R,@TPageOnShow_W,'OnShow'); @@ -106,7 +106,7 @@ begin with Cl.Add(TNOTEBOOK) do begin {$IFDEF FPC} -// RegisterMethod(@TNoteBook.TabIndexAtClientPos,'TABINDEXATCLIENTPOS'); + RegisterMethod(@TNoteBook.TabIndexAtClientPos,'TABINDEXATCLIENTPOS'); {$ENDIF} RegisterPropertyHelper(@TNoteBookPageCount_R,nil,'PAGECOUNT'); end;