Fixed some refcnt bugs

widget/src/gtk/nsWidget.cpp

@@ -111,6 +111,7 @@ NS_IMETHODIMP nsWidget::Destroy(void)
   GtkAllocation *old_size = NULL;
   if (!mIsDestroying) {
     nsBaseWidget::Destroy();
+    NS_IF_RELEASE(mParent);
   }
   if (mWidget) {
     // see if we need to destroy the old size information
@@ -155,7 +156,6 @@ void nsWidget::OnDestroy()
 
 nsIWidget* nsWidget::GetParent(void)
 {
-//  NS_NOTYETIMPLEMENTED("nsWidget::GetParent");
   if (nsnull != mParent) {
     NS_ADDREF(mParent);
   }

widget/src/gtk/nsWindow.cpp

@@ -85,7 +85,7 @@ nsWindow::nsWindow()
   mDisplayed = PR_FALSE;
   mLowerLeft = PR_FALSE;
   mBorderStyle = GTK_WINDOW_TOPLEVEL;
-  mIsDestroying = PR_FALSE;
+  mIsDestroyingWindow = PR_FALSE;
   mOnDestroyCalled = PR_FALSE;
   mFont = nsnull;
 }
@@ -97,7 +97,7 @@ nsWindow::nsWindow()
 //-------------------------------------------------------------------------
 nsWindow::~nsWindow()
 {
-  mIsDestroying = PR_TRUE;
+  mIsDestroyingWindow = PR_TRUE;
   if (nsnull != mShell) {
     Destroy();
   }
@@ -152,7 +152,7 @@ NS_METHOD nsWindow::Destroy()
   // knows about the close so that if this is the main application
   // window, for example, the application will exit as it should.
 
-  if (mIsDestroying == PR_TRUE) {
+  if (mIsDestroyingWindow == PR_TRUE) {
     nsBaseWidget::Destroy();
     if (PR_FALSE == mOnDestroyCalled)
         nsWidget::OnDestroy();
@@ -246,8 +246,10 @@ NS_METHOD nsWindow::CreateNative(GtkWidget *parentWidget)
     gtk_widget_show (mVBox);
     gtk_container_add(GTK_CONTAINER(mShell), mVBox);
     gtk_box_pack_start(GTK_BOX(mVBox), mWidget, PR_TRUE, PR_TRUE, 0);
-    // this is done in CreateWidget now...
-    //mIsToplevel = PR_TRUE;
+
+    // Distinguish top-level windows from child windows
+    mIsToplevel = PR_TRUE;
+
     gtk_signal_connect(GTK_OBJECT(mShell),
                      "delete_event",
                      GTK_SIGNAL_FUNC(handle_delete_event),
@@ -262,7 +264,6 @@ NS_METHOD nsWindow::CreateNative(GtkWidget *parentWidget)
 
   // Force cursor to default setting
   gtk_widget_set_name(mWidget, "nsWindow");
-  mIsToplevel = PR_TRUE;
   mCursor = eCursor_select;
   SetCursor(eCursor_standard);
   return NS_OK;
@@ -617,3 +618,10 @@ PRBool ChildWindow::IsChild() const
 {
   return PR_TRUE;
 }
+
+NS_METHOD ChildWindow::Destroy()
+{
+  // Skip over baseclass Destroy method which doesn't do what we want;
+  // instead make sure widget destroy method gets invoked.
+  return nsWidget::Destroy();
+}

widget/src/gtk/nsWindow.h

@@ -74,11 +74,11 @@ public:
     virtual PRBool IsChild() const;
 
     void SetIsDestroying(PRBool val) {
-      mIsDestroying = val;
+      mIsDestroyingWindow = val;
     }
 
     PRBool IsDestroying() const {
-      return mIsDestroying;
+      return mIsDestroyingWindow;
     }
 
      // Utility methods
@@ -120,7 +120,7 @@ protected:
   nsIFontMetrics *mFontMetrics;
   PRBool      mVisible;
   PRBool      mDisplayed;
-  PRBool      mIsDestroying;
+  PRBool      mIsDestroyingWindow;
 
   GtkWindowType mBorderStyle;
 
@@ -141,8 +141,9 @@ protected:
 //
 class ChildWindow : public nsWindow {
 public:
-    ChildWindow();
-    virtual PRBool IsChild() const;
+  ChildWindow();
+  virtual PRBool IsChild() const;
+  NS_IMETHOD Destroy(void);
 };
 
 #endif // Window_h__