From 7bcc2b529aef0d09a70733ab2bb9933184e841dc Mon Sep 17 00:00:00 2001
From: "pierre%netscape.com" <pierre%netscape.com>
Date: Tue, 20 Apr 1999 03:58:29 +0000
Subject: [PATCH] removed the NS_IWINDOW_IID hack

---
 widget/public/nsIWidget.h            | 14 --------------
 widget/tests/scribble/Scribble.cpp   |  3 +--
 widget/tests/widget/nsWidgetTest.cpp |  3 +--
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/widget/public/nsIWidget.h b/widget/public/nsIWidget.h
index 67d709014f4f..adcd8b7d19b2 100644
--- a/widget/public/nsIWidget.h
+++ b/widget/public/nsIWidget.h
@@ -69,20 +69,6 @@ typedef nsEventStatus (*PR_CALLBACK EVENT_CALLBACK)(nsGUIEvent *event);
 { 0x18032ad5, 0xb265, 0x11d1, \
 { 0xaa, 0x2a, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }
 
-// The following definition should have been temporary. The plan was to create
-// a new class called "nsIWindow" and use it on all the platforms in order
-// to differentiate real user windows from simple widgets. The Mac needs it
-// and it appeared that it would make sense to have it on Windows and Unix too.
-// Well, it did not happen yet so we keep this temporary definition.
-#ifdef XP_MAC
-// {18032AD6-B265-11d1-AA2A-000000000000}
-#define NS_IWINDOW_IID \
-{ 0x18032ad6, 0xb265, 0x11d1, \
-{ 0xaa, 0x2a, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }
-#else
-#define NS_IWINDOW_IID	NS_IWIDGET_IID
-#endif
-
 
 // Hide the native window systems real window type so as to avoid
 // including native window system types and api's. This is necessary
diff --git a/widget/tests/scribble/Scribble.cpp b/widget/tests/scribble/Scribble.cpp
index 11759bd44637..5a5a61abc323 100644
--- a/widget/tests/scribble/Scribble.cpp
+++ b/widget/tests/scribble/Scribble.cpp
@@ -92,7 +92,6 @@ static NS_DEFINE_IID(kCToolkitCID, NS_TOOLKIT_CID);
 static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID);
 static NS_DEFINE_IID(kIAppShellIID, NS_IAPPSHELL_IID);
 static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID);
-static NS_DEFINE_IID(kIWindowIID, NS_IWINDOW_IID);	//еее
 static NS_DEFINE_IID(kIButtonIID, NS_IBUTTON_IID);
 static NS_DEFINE_IID(kIScrollbarIID, NS_ISCROLLBAR_IID);
 static NS_DEFINE_IID(kICheckButtonIID, NS_ICHECKBUTTON_IID);
@@ -547,7 +546,7 @@ nsresult CreateApplication(int * argc, char ** argv)
     //
     // create the main window
     //
-    nsComponentManager::CreateInstance(kCWindowCID, nsnull, kIWindowIID,
+    nsComponentManager::CreateInstance(kCWindowCID, nsnull, kIWidgetIID,
                                  (void **)&(scribbleData.mainWindow));
     nsRect rect(100, 100, 600, 700);
     scribbleData.mainWindow->Create((nsIWidget*)NULL, 
diff --git a/widget/tests/widget/nsWidgetTest.cpp b/widget/tests/widget/nsWidgetTest.cpp
index 367de772ae7c..6787c39c6be6 100644
--- a/widget/tests/widget/nsWidgetTest.cpp
+++ b/widget/tests/widget/nsWidgetTest.cpp
@@ -167,7 +167,6 @@ static NS_DEFINE_IID(kCToolkitCID, NS_TOOLKIT_CID);
 
 
 // interface ids
-static NS_DEFINE_IID(kIWindowIID,         NS_IWINDOW_IID);
 static NS_DEFINE_IID(kISupportsIID,       NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kIWidgetIID,         NS_IWIDGET_IID);
 static NS_DEFINE_IID(kIButtonIID,         NS_IBUTTON_IID);
@@ -1279,7 +1278,7 @@ nsresult WidgetTest(int *argc, char **argv)
     //
     // create the main window
     //
-    nsComponentManager::CreateInstance(kCWindowCID, nsnull, kIWindowIID, (void**)&window);
+    nsComponentManager::CreateInstance(kCWindowCID, nsnull, kIWidgetIID, (void**)&window);
     nsRect rect(100, 100, 600, 700);
     window->Create((nsIWidget*) nsnull, rect, HandleEvent, 
                    (nsIDeviceContext *) nsnull,