paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-25 09:42:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

MG: fixed Menu.Free and gdkwindow=nil bug

Browse Source 
git-svn-id: trunk@1891 -
This commit is contained in:
lazarus 2002-08-17 23:39:43 +00:00
parent 0f491c43c3
commit bdb01de603
1 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2907,10 +2907,26 @@ begin
if (ClientWidget <> nil) and (GetControlWindow(ClientWidget)<>nil) then begin if (ClientWidget <> nil) and (GetControlWindow(ClientWidget)<>nil) then begin
ClientWindow:=GetControlWindow(ClientWidget); ClientWindow:=GetControlWindow(ClientWidget);
MainWindow:=GetControlWindow(Widget); MainWindow:=GetControlWindow(Widget);
gdk_window_get_origin(MainWindow,@MainOrigin.X,@MainOrigin.Y); if MainWindow<>nil then begin
gdk_window_get_origin(MainWindow,@MainOrigin.X,@MainOrigin.Y);
end else begin
{$IFDEF RaiseExceptionOnNilPointers}
RaiseException('TGTKObject.GetClientBounds Window=nil');
{$ENDIF}
MainOrigin.X:=0;
MainOrigin.Y:=0;
end;
inc(MainOrigin.X,Widget^.Allocation.X); inc(MainOrigin.X,Widget^.Allocation.X);
inc(MainOrigin.Y,Widget^.Allocation.Y); inc(MainOrigin.Y,Widget^.Allocation.Y);
gdk_window_get_origin(ClientWindow,@ClientOrigin.X,@ClientOrigin.Y); if ClientWindow<>nil then
gdk_window_get_origin(ClientWindow,@ClientOrigin.X,@ClientOrigin.Y)
else begin
{$IFDEF RaiseExceptionOnNilPointers}
RaiseException('TGTKObject.GetClientBounds ClientWindow=nil');
{$ENDIF}
ClientOrigin.X:=0;
ClientOrigin.Y:=0;
end;
ARect.Left:=ClientOrigin.X-MainOrigin.X; ARect.Left:=ClientOrigin.X-MainOrigin.X;
ARect.Top:=ClientOrigin.Y-MainOrigin.Y; ARect.Top:=ClientOrigin.Y-MainOrigin.Y;
ARect.Right:=ARect.Left+ClientWidget^.Allocation.Width; ARect.Right:=ARect.Left+ClientWidget^.Allocation.Width;
@ -4123,6 +4139,9 @@ begin
inc(P.Y,DCOrigin.Y); inc(P.Y,DCOrigin.Y);
Result := 1; Result := 1;
end else begin end else begin
{$IFDEF RaiseExceptionOnNilPointers}
RaiseException('TGTKObject.GetWindowOrgEx Window=nil');
{$ENDIF}
writeln('TgtkObject.GetWindowOrgEx:', writeln('TgtkObject.GetWindowOrgEx:',
' WARNING: DC ',HexStr(Cardinal(DC),8),' without gdkwindow.', ' WARNING: DC ',HexStr(Cardinal(DC),8),' without gdkwindow.',
' Widget=',HexStr(Cardinal(hwnd),8)); ' Widget=',HexStr(Cardinal(hwnd),8));
@ -4146,15 +4165,17 @@ function TgtkObject.GetWindowRect(Handle: hwnd; var ARect: TRect): Integer;
var var
X, Y, W, H: Integer; X, Y, W, H: Integer;
Widget: PGTKWidget; Widget: PGTKWidget;
Window: PGdkWindow;
begin begin
//Writeln('GetWindowRect'); //Writeln('GetWindowRect');
Result := 0; //default Result := 0; //default
if Handle <> 0 then if Handle <> 0 then
begin begin
Widget := pgtkwidget(Handle); Widget := pgtkwidget(Handle);
if GetControlWindow(Widget) <> nil then Begin Window:=GetControlWindow(Widget);
gdk_window_get_origin(GetControlWindow(Widget), @X, @Y); if Window <> nil then Begin
gdk_window_get_size(GetControlWindow(Widget), @W, @H); gdk_window_get_origin(Window, @X, @Y);
gdk_window_get_size(Window, @W, @H);
end end
else else
Begin Begin
@ -5482,6 +5503,7 @@ Function TGTKObject.ScreenToClient(Handle : HWND; var P : TPoint) : Integer;
var var
X, Y: Integer; X, Y: Integer;
Widget: PGTKWidget; Widget: PGTKWidget;
Window: PgdkWindow;
Begin Begin
if Handle = 0 if Handle = 0
@ -5493,15 +5515,22 @@ Begin
begin begin
Widget := GetFixedWidget(pgtkwidget(Handle)); Widget := GetFixedWidget(pgtkwidget(Handle));
if Widget = nil then if Widget = nil then
Widget := pgtkwidget(Handle); Widget := pgtkwidget(Handle);
if Widget = nil then if Widget = nil then
begin begin
X := 0; X := 0;
Y := 0; Y := 0;
end end
else else begin
gdk_window_get_origin(GetControlWindow(Widget), @X, @Y); Window:=GetControlWindow(Widget);
end; if Window<>nil then
gdk_window_get_origin(Window, @X, @Y)
else begin
X:=0;
Y:=0;
end;
end;
end;
//writeln('[TGTKObject.ScreenToClient] ',x,',',y,' P=',P.X,',',P.Y); //writeln('[TGTKObject.ScreenToClient] ',x,',',y,' P=',P.X,',',P.Y);
dec(P.X, X); dec(P.X, X);
@ -7128,6 +7157,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.135 2002/09/19 16:45:54 lazarus
MG: fixed Menu.Free and gdkwindow=nil bug
Revision 1.134 2002/09/18 17:07:29 lazarus Revision 1.134 2002/09/18 17:07:29 lazarus
MG: added patch from Andrew MG: added patch from Andrew