paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-13 10:19:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

gtk: simplify DestroyWindowFromPointCB and other minor corrections to WindowFromPoint

Browse Source 
git-svn-id: trunk@21598 -
This commit is contained in:
paul 2009-09-07 09:45:07 +00:00
parent 7a9dad39ed
commit 91915ea85b
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lcl/interfaces/gtk/gtkcallback.inc
View File

@ -1058,9 +1058,8 @@ begin
FreeWidgetInfo(Widget); FreeWidgetInfo(Widget);
end; end;
function DestroyWindowFromPointCB(Widget: PGtkWidget; data: gPointer): GBoolean; cdecl; procedure DestroyWindowFromPointCB(Widget: PGtkWidget; data: gPointer); cdecl;
begin begin
Result := CallBackDefaultReturn;
if PGtkWidget(LastWFPResult) <> Widget then Exit; if PGtkWidget(LastWFPResult) <> Widget then Exit;
LastWFPResult := 0; LastWFPResult := 0;
LastWFPMousePos := Point(High(Integer), High(Integer)); LastWFPMousePos := Point(High(Integer), High(Integer));

2
lcl/interfaces/gtk/gtkproc.pp
View File

@ -140,7 +140,7 @@ function GTKKillFocusCB(widget: PGtkWidget; event:PGdkEventFocus;
function GTKKillFocusCBAfter(widget: PGtkWidget; event:PGdkEventFocus; function GTKKillFocusCBAfter(widget: PGtkWidget; event:PGdkEventFocus;
data: gPointer): GBoolean; cdecl; data: gPointer): GBoolean; cdecl;
function gtkdestroyCB(widget: PGtkWidget; data: gPointer): GBoolean; cdecl; function gtkdestroyCB(widget: PGtkWidget; data: gPointer): GBoolean; cdecl;
function DestroyWindowFromPointCB(Widget: PGtkWidget; data: gPointer): GBoolean; cdecl; procedure DestroyWindowFromPointCB(Widget: PGtkWidget; data: gPointer); cdecl;
function gtkdeleteCB(widget: PGtkWidget; event: PGdkEvent; function gtkdeleteCB(widget: PGtkWidget; event: PGdkEvent;
data: gPointer): GBoolean; cdecl; data: gPointer): GBoolean; cdecl;
function gtkresizeCB(widget: PGtkWidget; data: gPointer): GBoolean; cdecl; function gtkresizeCB(widget: PGtkWidget; data: gPointer): GBoolean; cdecl;

5
lcl/interfaces/gtk/gtkwinapi.inc
View File

@ -9744,8 +9744,13 @@ begin
LastWFPResult := Result; LastWFPResult := Result;
// connect handler // connect handler
if LastWFPResult <> 0 then if LastWFPResult <> 0 then
{$IFDEF gtk1}
gtk_signal_connect(PGtkObject(LastWFPResult), 'destroy',
TGTKSignalFunc(@DestroyWindowFromPointCB), nil);
{$else}
g_signal_connect(GPointer(LastWFPResult), 'destroy', g_signal_connect(GPointer(LastWFPResult), 'destroy',
TGTKSignalFunc(@DestroyWindowFromPointCB), nil); TGTKSignalFunc(@DestroyWindowFromPointCB), nil);
{$endif}
end; end;
//##apiwiz##eps## // Do not remove //##apiwiz##eps## // Do not remove