removed nsObject from it

widget/src/motif/nsAppShell.cpp

@@ -17,6 +17,16 @@
  */
 
 #include "nsAppShell.h"
+#include "nsIAppShell.h"
+
+//-------------------------------------------------------------------------
+//
+// nsISupports implementation macro
+//
+//-------------------------------------------------------------------------
+NS_DEFINE_IID(kIAppShellIID, NS_IAPPSHELL_IID);
+NS_IMPL_ISUPPORTS(nsAppShell,kIAppShellIID);
+
 
 //-------------------------------------------------------------------------
 //
@@ -61,7 +71,7 @@ void nsAppShell::Exit()
 // nsAppShell constructor
 //
 //-------------------------------------------------------------------------
-nsAppShell::nsAppShell(nsISupports *aOuter) : nsObject(aOuter)  
+nsAppShell::nsAppShell()
 { 
 }
 
@@ -74,24 +84,6 @@ nsAppShell::~nsAppShell()
 {
 }
 
-//-------------------------------------------------------------------------
-//
-// Query interface implementation
-//
-//-------------------------------------------------------------------------
-nsresult nsAppShell::QueryObject(const nsIID& aIID, void** aInstancePtr)
-{
-    nsresult result = NS_NOINTERFACE;
-    static NS_DEFINE_IID(kInsAppShellIID, NS_IAPPSHELL_IID);
-    if (result == NS_NOINTERFACE && aIID.Equals(kInsAppShellIID)) {
-        *aInstancePtr = (void*) ((nsIAppShell*)this);
-        AddRef();
-        result = NS_OK;
-    }
-
-    return result;
-}
-
 //-------------------------------------------------------------------------
 //
 // GetNativeData

widget/src/motif/nsAppShell.h

@@ -19,7 +19,6 @@
 #ifndef nsAppShell_h__
 #define nsAppShell_h__
 
-#include "nsObject.h"
 #include "nsIAppShell.h"
 
 #include <Xm/MainW.h>
@@ -28,20 +27,17 @@
  * Native MOTIF Application shell wrapper
  */
 
-class nsAppShell : public nsIAppShell, public nsObject
+class nsAppShell : public nsIAppShell
 {
   private:
     Widget       mTopLevel;
     XtAppContext mAppContext;
 
   public:
-                            nsAppShell(nsISupports *aOuter); 
-    virtual                 ~nsAppShell();
+    nsAppShell();
+    virtual ~nsAppShell();
 
-    // nsISupports. Forward to the nsObject base class
-    BASE_SUPPORT
-
-    virtual nsresult        QueryObject(const nsIID& aIID, void** aInstancePtr);
+    NS_DECL_ISUPPORTS
 
     // nsIAppShellInterface
   

widget/src/motif/nsWidgetFactory.cpp

@@ -143,7 +143,7 @@ fprintf(stderr, "Entering Eidget Factory\n");fflush(stderr);
     }
 
     else if (aIID.Equals(kIAppShellIID)) {
-      nsIAppShell *appInst = (nsIAppShell*)new nsAppShell(aOuter);
+      nsIAppShell *appInst = (nsIAppShell*)new nsAppShell();
       if (appInst == NULL) {  
           return NS_ERROR_OUT_OF_MEMORY;  
       }