paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-04 08:19:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

gtk: report LCL page index instead of gtk page index on notebook page change

Browse Source 
git-svn-id: trunk@20087 -
This commit is contained in:
paul 2009-05-21 06:31:13 +00:00
parent f68867536b
commit 7526bb803e
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lcl/interfaces/gtk/gtkwsextctrls.pp
View File

@ -262,6 +262,21 @@ end;
{ TGtkWSCustomNotebook }
function NotebookPageRealToLCLIndex(const ANotebook: TCustomNotebook; AIndex: integer): integer;
var
I: Integer;
begin
Result := AIndex;
if csDesigning in ANotebook.ComponentState then exit;
I := 0;
while (I < ANotebook.PageCount) and (I <= Result) do
begin
if not ANotebook.Page[I].TabVisible then Inc(Result);
Inc(I);
end;
end;
function GtkWSNotebook_SwitchPage(widget: PGtkWidget; page: Pgtkwidget; pagenum: integer; data: gPointer): GBoolean; cdecl;
var
Mess: TLMNotify;
@ -288,7 +303,7 @@ begin
FillChar(NMHdr, SizeOf(NMHdr), 0);
NMHdr.code := TCN_SELCHANGING;
NMHdr.hwndFrom := PtrUInt(widget);
NMHdr.idFrom := pagenum; //use this to set pageindex to the correct page.
NMHdr.idFrom := NotebookPageRealToLCLIndex(TCustomNotebook(Data), pagenum); //use this to set pageindex to the correct page.
Mess.NMHdr := @NMHdr;
Mess.Result := 0;
DeliverMessage(Data, Mess);
@ -306,7 +321,7 @@ begin
FillChar(NMHdr, SizeOf(NMHdr), 0);
NMHdr.code := TCN_SELCHANGE;
NMHdr.hwndFrom := PtrUInt(widget);
NMHdr.idFrom := pagenum; //use this to set pageindex to the correct page.
NMHdr.idFrom := NotebookPageRealToLCLIndex(TCustomNotebook(Data), pagenum); //use this to set pageindex to the correct page.
Mess.NMHdr := @NMHdr;
DeliverMessage(Data, Mess);
end;

2
lcl/interfaces/win32/win32callback.inc
View File

@ -2013,7 +2013,7 @@ begin
with NMHdr^ do
case code of
TCN_SELCHANGE:
idFrom := ShowHideTabPage(HWndFrom, true);
idFrom := ShowHideTabPage(HWndFrom, True);
NM_CUSTOMDRAW:
begin
if WindowInfo^.WinControl is TCustomListView then