MG: fixed BadCursor bug and Circle Reference of FixedWidget of csPanel

git-svn-id: trunk@730 -
This commit is contained in:
lazarus 2002-02-09 01:45:57 +00:00
parent 2074dee40b
commit 3b59710734

View File

@ -562,29 +562,42 @@ end;
*Note: Tells GTK Engine to halt and destroy *Note: Tells GTK Engine to halt and destroy
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
procedure TGtkObject.AppTerminate; procedure TGtkObject.AppTerminate;
procedure DestroyGdkCursor(var Cursor: pGDKCursor);
begin
gdk_Cursor_Destroy(Cursor);
Cursor:=nil;
end;
procedure DeleteAndNilBrush(var h: HBRUSH);
begin
DeleteObject(h);
h:=0;
end;
begin begin
gdk_Cursor_Destroy(Cursor_Watch); DestroyGdkCursor(Cursor_Watch);
gdk_Cursor_Destroy(Cursor_Arrow); DestroyGdkCursor(Cursor_Arrow);
gdk_Cursor_Destroy(Cursor_Cross); DestroyGdkCursor(Cursor_Cross);
gdk_Cursor_Destroy(Cursor_Hand1); DestroyGdkCursor(Cursor_Hand1);
gdk_Cursor_Destroy(Cursor_XTerm); DestroyGdkCursor(Cursor_XTerm);
gdk_Cursor_Destroy(Cursor_StdArrow); DestroyGdkCursor(Cursor_StdArrow);
gdk_Cursor_Destroy(Cursor_HSplit); DestroyGdkCursor(Cursor_HSplit);
gdk_Cursor_Destroy(Cursor_VSplit); DestroyGdkCursor(Cursor_VSplit);
gdk_Cursor_Destroy(Cursor_SizeNWSE); DestroyGdkCursor(Cursor_SizeNWSE);
gdk_Cursor_Destroy(Cursor_SizeNS); DestroyGdkCursor(Cursor_SizeNS);
gdk_Cursor_Destroy(Cursor_SizeNESW); DestroyGdkCursor(Cursor_SizeNESW);
gdk_Cursor_Destroy(Cursor_SizeWE); DestroyGdkCursor(Cursor_SizeWE);
gtk_object_unref(PGTKObject(FGTKToolTips)); gtk_object_unref(PGTKObject(FGTKToolTips));
FGTKToolTips := nil; FGTKToolTips := nil;
DeleteObject(FStockNullBrush); DeleteAndNilBrush(FStockNullBrush);
DeleteObject(FStockBlackBrush); DeleteAndNilBrush(FStockBlackBrush);
DeleteObject(FStockLtGrayBrush); DeleteAndNilBrush(FStockLtGrayBrush);
DeleteObject(FStockGrayBrush); DeleteAndNilBrush(FStockGrayBrush);
DeleteObject(FStockDkGrayBrush); DeleteAndNilBrush(FStockDkGrayBrush);
DeleteObject(FStockWhiteBrush); DeleteAndNilBrush(FStockWhiteBrush);
// MG: using gtk_main_quit is not a clean way to close // MG: using gtk_main_quit is not a clean way to close
//gtk_main_quit; //gtk_main_quit;
@ -3645,8 +3658,8 @@ begin
begin begin
p := gtk_fixed_new(); p := gtk_fixed_new();
gtk_widget_show (p); gtk_widget_show (p);
SetFixedWidget(p, p); SetFixedWidget(p, nil);
SetMainWidget(p, p); SetMainWidget(nil, p);
end; end;
csPopupMenu : csPopupMenu :
@ -5266,6 +5279,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.152 2002/08/05 07:43:29 lazarus
MG: fixed BadCursor bug and Circle Reference of FixedWidget of csPanel
Revision 1.151 2002/08/04 07:09:28 lazarus Revision 1.151 2002/08/04 07:09:28 lazarus
MG: fixed client events MG: fixed client events