From cf68b64a5078c2ce6fe5c7874036ab4ccbe61269 Mon Sep 17 00:00:00 2001
From: "mcafee%netscape.com" <mcafee%netscape.com>
Date: Thu, 22 Apr 1999 06:48:51 +0000
Subject: [PATCH] Removing NEWW_CLIPBOARD_SUPPORT ifdef.

---
 widget/src/build/nsGTKWidgetFactory.cpp | 4 ----
 widget/src/gtk/nsWindow.cpp             | 6 ++----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/widget/src/build/nsGTKWidgetFactory.cpp b/widget/src/build/nsGTKWidgetFactory.cpp
index 5a76160eb49f..16f415f613fd 100644
--- a/widget/src/build/nsGTKWidgetFactory.cpp
+++ b/widget/src/build/nsGTKWidgetFactory.cpp
@@ -47,9 +47,7 @@
 #include "nsMenuButton.h"
 
 // Drag & Drop, Clipboard
-#ifdef NEW_CLIPBOARD_SUPPORT
 #include "nsClipboard.h"
-#endif
 #include "nsTransferable.h"
 #include "nsDataFlavor.h"
 #include "nsXIFFormatConverter.h"
@@ -255,11 +253,9 @@ nsresult nsWidgetFactory::CreateInstance(nsISupports *aOuter,
     else if (mClassID.Equals(kCGenericTransferable)) {
         inst = (nsISupports*)(nsIGenericTransferable *)new nsTransferable();
     }
-#ifdef NEW_CLIPBOARD_SUPPORT
     else if (mClassID.Equals(kCClipboard)) {
         inst = (nsISupports*)new nsClipboard();
     }
-#endif
     else if (mClassID.Equals(kCXIFFormatConverter)) {
         inst = (nsISupports*)new nsXIFFormatConverter();
     }
diff --git a/widget/src/gtk/nsWindow.cpp b/widget/src/gtk/nsWindow.cpp
index 2949030f42ef..ba905dfe5a22 100644
--- a/widget/src/gtk/nsWindow.cpp
+++ b/widget/src/gtk/nsWindow.cpp
@@ -250,11 +250,9 @@ NS_METHOD nsWindow::CreateNative(GtkWidget *parentWidget)
                      GTK_SIGNAL_FUNC(handle_delete_event),
                      this);
 
-#ifdef NEW_CLIPBOARD_SUPPORT
+    // XXX Hack, give the clipboard class a pointer to
+    // any top-level window, how about mShell.
     nsClipboard::SetTopLevelWidget(mShell);
-#else
-    nsSelectionMgr::SetTopLevelWidget(mShell);
-#endif
   }
 
   // Force cursor to default setting