Finishing clipboard ifdef so we can remove the old clipboard.

git-svn-id: svn://10.0.0.236/trunk@26678 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/editor/libeditor/base/nsEditor.cpp

@@ -40,7 +40,9 @@
 #include "nsIAtom.h"
 #include "nsVoidArray.h"
 #include "nsICaret.h"
+#ifndef NEW_CLIPBOARD_SUPPORT
 #include "nsISelectionMgr.h"
+#endif
 
 #include "nsIContent.h"
 #include "nsIContentIterator.h"
@@ -71,8 +73,6 @@
 // END
 #endif
 
-//#define NEW_CLIPBOARD_SUPPORT
-
 #ifdef NEW_CLIPBOARD_SUPPORT
 
 // Drag & Drop, Clipboard
@@ -836,12 +836,15 @@ NS_IMETHODIMP nsEditor::Cut()
   return res;
 }
 
+#ifndef NEW_CLIPBOARD_SUPPORT
 extern "C" NS_EXPORT nsISelectionMgr* GetSelectionMgr();
+#endif
 
 NS_IMETHODIMP nsEditor::Copy()
 {
   //printf("nsEditor::Copy\n");
 
+#ifndef NEW_CLIPBOARD_SUPPORT
   // Get the nsSelectionMgr:
   // XXX BWEEP BWEEP TEMPORARY!
   // The selection mgr needs to be a service.
@@ -857,6 +860,10 @@ NS_IMETHODIMP nsEditor::Copy()
 
   //NS_ADD_REF(theSelectionMgr);
   return mPresShell->DoCopy(selectionMgr);
+#else
+  return mPresShell->DoCopy();
+#endif
+
 }
 
 NS_IMETHODIMP nsEditor::Paste()