From f9749ea7b7a0e2fc561a8c5eedf4f7d3e5339ef6 Mon Sep 17 00:00:00 2001 From: "mcafee%netscape.com" Date: Fri, 16 Apr 1999 17:36:33 +0000 Subject: [PATCH] Removing //#define NEW_CLIPBOARD_SUPPORT git-svn-id: svn://10.0.0.236/trunk@27852 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsPresShell.cpp | 4 ---- mozilla/layout/html/base/src/nsPresShell.cpp | 4 ---- mozilla/webshell/tests/viewer/nsSetupRegistry.cpp | 2 -- mozilla/xpfe/AppCores/src/nsBrowserAppCore.cpp | 3 --- 4 files changed, 13 deletions(-) diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index 42f72cb691e..1fbdcdf7a19 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -68,10 +68,6 @@ #include "nsIDataFlavor.h" -// XXX This is just a temporary thing until -//the new Clipboard support comes on line -//#define NEW_CLIPBOARD_SUPPORT - #ifdef NEW_CLIPBOARD_SUPPORT // Drag & Drop, Clipboard #include "nsWidgetsCID.h" diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index 42f72cb691e..1fbdcdf7a19 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/layout/html/base/src/nsPresShell.cpp @@ -68,10 +68,6 @@ #include "nsIDataFlavor.h" -// XXX This is just a temporary thing until -//the new Clipboard support comes on line -//#define NEW_CLIPBOARD_SUPPORT - #ifdef NEW_CLIPBOARD_SUPPORT // Drag & Drop, Clipboard #include "nsWidgetsCID.h" diff --git a/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp b/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp index b6dc41370df..fc8ba5b6ade 100644 --- a/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp +++ b/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp @@ -212,8 +212,6 @@ static NS_DEFINE_IID(kObserverCID, NS_OBSERVER_CID); static NS_DEFINE_IID(kProfileCID, NS_PROFILE_CID); #endif -//#define NEW_CLIPBOARD_SUPPORT - #ifdef NEW_CLIPBOARD_SUPPORT static NS_DEFINE_IID(kClipboardCID, NS_CLIPBOARD_CID); static NS_DEFINE_IID(kTransferableCID, NS_TRANSFERABLE_CID); diff --git a/mozilla/xpfe/AppCores/src/nsBrowserAppCore.cpp b/mozilla/xpfe/AppCores/src/nsBrowserAppCore.cpp index af3b4b668c0..76eccac99d3 100644 --- a/mozilla/xpfe/AppCores/src/nsBrowserAppCore.cpp +++ b/mozilla/xpfe/AppCores/src/nsBrowserAppCore.cpp @@ -1349,9 +1349,6 @@ nsBrowserAppCore::PrintPreview() NS_IMETHODIMP nsBrowserAppCore::Copy() { - -//#define NEW_CLIPBOARD_SUPPORT - #ifdef NEW_CLIPBOARD_SUPPORT nsIPresShell * presShell = GetPresShellFor(mContentAreaWebShell); if (nsnull != presShell) {