Removing NEWW_CLIPBOARD_SUPPORT ifdef.

This commit is contained in:
mcafee%netscape.com 1999-04-22 06:48:51 +00:00
parent 69c6ca164e
commit cf68b64a50
2 changed files with 2 additions and 8 deletions

View File

@ -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();
}

View File

@ -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