From a7bfcf6c9b4fe20028f633a00769ecde367a316b Mon Sep 17 00:00:00 2001 From: sekelsenmat Date: Sun, 2 Oct 2011 18:03:18 +0000 Subject: [PATCH] Removes TPageControl.OnPageChanged to fix bug #19903 double OnChange calls git-svn-id: trunk@32622 - --- ide/componentpalette.pas | 2 +- ide/sourceeditor.pp | 2 +- lcl/comctrls.pp | 2 -- lcl/include/customnotebook.inc | 4 ++-- lcl/include/tabcontrol.inc | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ide/componentpalette.pas b/ide/componentpalette.pas index eaa38858a0..c2b3f96dbd 100644 --- a/ide/componentpalette.pas +++ b/ide/componentpalette.pas @@ -244,7 +244,7 @@ begin ClearButtons; FPageControl:=AValue; if FPageControl<>nil then begin - FPageControl.OnPageChanged:=@ActivePageChanged; + FPageControl.OnChange:=@ActivePageChanged; end; UpdateNoteBookButtons; end; diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp index 8013523dde..e8a8ccf7c0 100644 --- a/ide/sourceeditor.pp +++ b/ide/sourceeditor.pp @@ -5133,7 +5133,7 @@ Begin else Options:=Options-[nboShowCloseButtons]; TabPosition := EditorOpts.TabPosition; - OnPageChanged := @NotebookPageChanged; + OnChange := @NotebookPageChanged; OnCloseTabClicked := @CloseTabClicked; OnMouseDown:=@NotebookMouseDown; TabDragMode := dmAutomatic; diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp index 1fc0a58f6e..9370ead137 100644 --- a/lcl/comctrls.pp +++ b/lcl/comctrls.pp @@ -423,7 +423,6 @@ type write FOnCloseTabClicked; property OnGetImageIndex: TTabGetImageEvent read FOnGetImageIndex write FOnGetImageIndex; - property OnPageChanged: TNotifyEvent read FOnPageChanged write FOnPageChanged; property Options: TNoteBookOptions read FOptions write SetOptions default []; property Page[Index: Integer]: TCustomPage read GetPage; property PageCount: integer read GetPageCount; @@ -575,7 +574,6 @@ type property OnMouseLeave; property OnMouseMove; property OnMouseUp; - property OnPageChanged; property OnResize; property OnStartDock; property OnStartDrag; diff --git a/lcl/include/customnotebook.inc b/lcl/include/customnotebook.inc index 4cc0fe2990..c559018f08 100644 --- a/lcl/include/customnotebook.inc +++ b/lcl/include/customnotebook.inc @@ -278,8 +278,8 @@ end; procedure TCustomTabControl.DoChange; begin - if Assigned(OnPageChanged) then - OnPageChanged(Self); + if Assigned(OnChange) then + OnChange(Self); end; {------------------------------------------------------------------------------ diff --git a/lcl/include/tabcontrol.inc b/lcl/include/tabcontrol.inc index d15989559b..f338b5a248 100644 --- a/lcl/include/tabcontrol.inc +++ b/lcl/include/tabcontrol.inc @@ -237,7 +237,7 @@ begin FNoteBook.Parent := TabControl; FNoteBook.OnGetImageIndex := @NBGetImageIndex; FNoteBook.OnChanging := @NBChanging; - FNoteBook.OnPageChanged := @NBPageChanged; + FNoteBook.OnChange := @NBPageChanged; TabControlBoundsChange; end;