From 031024e70bc8a5a6a49c63df3eba60ccd6ff9be7 Mon Sep 17 00:00:00 2001
From: "pierre%netscape.com"
 <pierre%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 30 Apr 1999 22:55:58 +0000
Subject: [PATCH] Fixed previous checkin: Destroy() calls the inherited
 function and returns a value.

git-svn-id: svn://10.0.0.236/trunk@29907 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/widget/src/mac/nsTextWidget.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mozilla/widget/src/mac/nsTextWidget.cpp b/mozilla/widget/src/mac/nsTextWidget.cpp
index 06aef13d343..984c5c8db3f 100644
--- a/mozilla/widget/src/mac/nsTextWidget.cpp
+++ b/mozilla/widget/src/mac/nsTextWidget.cpp
@@ -19,9 +19,6 @@
 #include "nsTextWidget.h"
 #include <ToolUtils.h>
 #include <Appearance.h>
-#if TARGET_CARBON
-#include <ControlDefinitions.h>
-#endif
 
 
 NS_IMPL_ADDREF(nsTextWidget);
@@ -104,19 +101,22 @@ NS_IMETHODIMP nsTextWidget::Create(nsIWidget *aParent,
 }
 
 
+//-------------------------------------------------------------------------
+//	Destroy
 //
-// Destroy
-//
+//-------------------------------------------------------------------------
 // The repeater in this widget needs to use out of band notification
-// to sever its dies with the nsTimer. If we just rely on the 
+// to sever its ties with the nsTimer. If we just rely on the 
 // dtor to do it, it will never get called because the nsTimer holds a ref to
 // this object.
 //
 NS_IMETHODIMP
-nsTextWidget :: Destroy ( )
+nsTextWidget::Destroy()
 {
+  Inherited::Destroy();
   if (mRepeating) RemoveFromRepeatList();
   if (mIdling) RemoveFromIdleList();
+  return NS_OK;
 }