gtk: simplify DestroyWindowFromPointCB and other minor corrections to WindowFromPoint

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

View File

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

View File

@ -140,7 +140,7 @@ function GTKKillFocusCB(widget: PGtkWidget; event:PGdkEventFocus;
function GTKKillFocusCBAfter(widget: PGtkWidget; event:PGdkEventFocus;
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;
data: gPointer): GBoolean; cdecl;
function gtkresizeCB(widget: PGtkWidget; data: gPointer): GBoolean; cdecl;

View File

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