paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-27 00:02:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

win32(ce): fix deletion of notebook/pagecontrol page by RemovePage

Browse Source 
git-svn-id: trunk@12519 -
This commit is contained in:
paul 2007-10-19 11:20:22 +00:00
parent c114b0811b
commit 6ccb6125c6
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lcl/interfaces/win32/win32wsextctrls.pp
View File

@ -236,6 +236,10 @@ implementation
uses uses
Forms, LMessages, ShellAPI; Forms, LMessages, ShellAPI;
type
TCustomPageAccess = class(TCustomPage)
end;
function IsNotebookGroupFocused(const ANotebook: TCustomNotebook): boolean; function IsNotebookGroupFocused(const ANotebook: TCustomNotebook): boolean;
var var
lNotebookHandle, lWindow: HWND; lNotebookHandle, lWindow: HWND;
@ -329,8 +333,10 @@ var
PageIndex: integer; PageIndex: integer;
PageControlHandle: HWND; PageControlHandle: HWND;
begin begin
// remove tab from pagecontrol // remove tab from pagecontrol only if not pfRemoving is set
if (AWinControl.Parent <> nil) and (AWinControl.Parent.HandleAllocated) then // if pfRemoving is set then Tab has been deleted by RemovePage
if (AWinControl.Parent <> nil) and (AWinControl.Parent.HandleAllocated) and
not (pfRemoving in TCustomPageAccess(AWinControl).Flags) then
begin begin
PageControlHandle := AWinControl.Parent.Handle; PageControlHandle := AWinControl.Parent.Handle;
PageIndex := TCustomPage(AWinControl).PageIndex; PageIndex := TCustomPage(AWinControl).PageIndex;

10
lcl/interfaces/wince/wincewsextctrls.pp
View File

@ -223,6 +223,10 @@ implementation
uses uses
LMessages; LMessages;
type
TCustomPageAccess = class(TCustomPage)
end;
function IsNotebookGroupFocused(const ANotebook: TCustomNotebook): boolean; function IsNotebookGroupFocused(const ANotebook: TCustomNotebook): boolean;
var var
lNotebookHandle, lWindow: HWND; lNotebookHandle, lWindow: HWND;
@ -309,8 +313,10 @@ var
PageIndex: integer; PageIndex: integer;
PageControlHandle: HWND; PageControlHandle: HWND;
begin begin
// remove tab from pagecontrol // remove tab from pagecontrol only if not pfRemoving is set
if (AWinControl.Parent <> nil) and (AWinControl.Parent.HandleAllocated) then // if pfRemoving is set then Tab has been deleted by RemovePage
if (AWinControl.Parent <> nil) and (AWinControl.Parent.HandleAllocated) and
not (pfRemoving in TCustomPageAccess(AWinControl).Flags) then
begin begin
PageControlHandle := AWinControl.Parent.Handle; PageControlHandle := AWinControl.Parent.Handle;
PageIndex := TCustomPage(AWinControl).PageIndex; PageIndex := TCustomPage(AWinControl).PageIndex;