mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Removing NEW_CLIPBOARD_SUPPORT ifdef.

This commit is contained in:
mcafee%netscape.com 1999-04-22 05:41:51 +00:00
Родитель ada56b0089
Коммит 8c94674b00
4 изменённых файлов: 0 добавлений и 112 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

52
editor/base/nsEditor.cpp
Просмотреть файл

@ -42,9 +42,6 @@
#include "nsIAtom.h" #include "nsIAtom.h"
#include "nsVoidArray.h" #include "nsVoidArray.h"
#include "nsICaret.h" #include "nsICaret.h"
#ifndef NEW_CLIPBOARD_SUPPORT
#include "nsISelectionMgr.h"
#endif
#include "nsIContent.h" #include "nsIContent.h"
#include "nsIContentIterator.h" #include "nsIContentIterator.h"
@ -75,8 +72,6 @@
// END // END
#endif #endif
#ifdef NEW_CLIPBOARD_SUPPORT
// Drag & Drop, Clipboard // Drag & Drop, Clipboard
#include "nsWidgetsCID.h" #include "nsWidgetsCID.h"
#include "nsIClipboard.h" #include "nsIClipboard.h"
@ -88,15 +83,12 @@
// Drag & Drop, Clipboard Support // Drag & Drop, Clipboard Support
static NS_DEFINE_IID(kIClipboardIID, NS_ICLIPBOARD_IID); static NS_DEFINE_IID(kIClipboardIID, NS_ICLIPBOARD_IID);
static NS_DEFINE_CID(kCClipboardCID, NS_CLIPBOARD_CID); static NS_DEFINE_CID(kCClipboardCID, NS_CLIPBOARD_CID);
static NS_DEFINE_CID(kIGenericTransferableIID, NS_IGENERICTRANSFERABLE_IID); static NS_DEFINE_CID(kIGenericTransferableIID, NS_IGENERICTRANSFERABLE_IID);
static NS_DEFINE_CID(kCGenericTransferableCID, NS_GENERICTRANSFERABLE_CID); static NS_DEFINE_CID(kCGenericTransferableCID, NS_GENERICTRANSFERABLE_CID);
static NS_DEFINE_IID(kIDataFlavorIID, NS_IDATAFLAVOR_IID); static NS_DEFINE_IID(kIDataFlavorIID, NS_IDATAFLAVOR_IID);
static NS_DEFINE_IID(kCDataFlavorCID, NS_DATAFLAVOR_CID); static NS_DEFINE_IID(kCDataFlavorCID, NS_DATAFLAVOR_CID);
static NS_DEFINE_IID(kCXIFFormatConverterCID, NS_XIFFORMATCONVERTER_CID); static NS_DEFINE_IID(kCXIFFormatConverterCID, NS_XIFFORMATCONVERTER_CID);
static NS_DEFINE_IID(kIFormatConverterIID, NS_IFORMATCONVERTER_IID); static NS_DEFINE_IID(kIFormatConverterIID, NS_IFORMATCONVERTER_IID);
#endif
static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID); static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID);
static NS_DEFINE_IID(kIDOMTextIID, NS_IDOMTEXT_IID); static NS_DEFINE_IID(kIDOMTextIID, NS_IDOMTEXT_IID);
@ -922,34 +914,12 @@ NS_IMETHODIMP nsEditor::Cut()
return res; return res;
} }
#ifndef NEW_CLIPBOARD_SUPPORT
extern "C" NS_EXPORT nsISelectionMgr* GetSelectionMgr();
#endif
NS_IMETHODIMP nsEditor::Copy() NS_IMETHODIMP nsEditor::Copy()
{ {
//printf("nsEditor::Copy\n"); //printf("nsEditor::Copy\n");
#ifndef NEW_CLIPBOARD_SUPPORT
// Get the nsSelectionMgr:
// XXX BWEEP BWEEP TEMPORARY!
// The selection mgr needs to be a service.
// See http://bugzilla.mozilla.org/show_bug.cgi?id=3509.
// In the meantime, so I'm not blocked on writing the rest of the code,
// nsSelectionMgr uses the egregious hack of a global variable:
nsISelectionMgr* selectionMgr = GetSelectionMgr();
if (!selectionMgr)
{
printf("Can't get selection mgr!\n");
return NS_ERROR_FAILURE;
}
//NS_ADD_REF(theSelectionMgr);
return mPresShell->DoCopy(selectionMgr);
#else
return mPresShell->DoCopy(); return mPresShell->DoCopy();
#endif
} }
NS_IMETHODIMP nsEditor::Paste() NS_IMETHODIMP nsEditor::Paste()
@ -957,8 +927,6 @@ NS_IMETHODIMP nsEditor::Paste()
//printf("nsEditor::Paste\n"); //printf("nsEditor::Paste\n");
nsString stuffToPaste; nsString stuffToPaste;
#ifdef NEW_CLIPBOARD_SUPPORT
// Get Clipboard Service // Get Clipboard Service
nsIClipboard* clipboard; nsIClipboard* clipboard;
nsresult rv = nsServiceManager::GetService(kCClipboardCID, nsresult rv = nsServiceManager::GetService(kCClipboardCID,
@ -1008,26 +976,6 @@ NS_IMETHODIMP nsEditor::Paste()
} }
NS_IF_RELEASE(clipboard); NS_IF_RELEASE(clipboard);
#else
// Get the nsSelectionMgr:
// XXX BWEEP BWEEP TEMPORARY!
// The selection mgr needs to be a service.
// See http://bugzilla.mozilla.org/show_bug.cgi?id=3509.
// In the meantime, so I'm not blocked on writing the rest of the code,
// nsSelectionMgr uses the egregious hack of a global variable:
nsISelectionMgr* selectionMgr = GetSelectionMgr();
if (!selectionMgr)
{
printf("Can't get selection mgr!\n");
return NS_ERROR_FAILURE;
}
//NS_ADD_REF(theSelectionMgr);
// Now we have the selection mgr. Get its contents as text (for now):
selectionMgr->PasteTextBlocking(&stuffToPaste);
#endif
//printf("Trying to insert '%s'\n", stuffToPaste.ToNewCString()); //printf("Trying to insert '%s'\n", stuffToPaste.ToNewCString());
// Now let InsertText handle the hard stuff: // Now let InsertText handle the hard stuff:

4
editor/base/nsEditorEventListeners.cpp
Просмотреть файл

@ -39,8 +39,6 @@
static NS_DEFINE_IID(kIDOMElementIID, NS_IDOMELEMENT_IID); static NS_DEFINE_IID(kIDOMElementIID, NS_IDOMELEMENT_IID);
static NS_DEFINE_IID(kIDOMCharacterDataIID, NS_IDOMCHARACTERDATA_IID); static NS_DEFINE_IID(kIDOMCharacterDataIID, NS_IDOMCHARACTERDATA_IID);
#ifdef NEW_CLIPBOARD_SUPPORT
// Drag & Drop, Clipboard // Drag & Drop, Clipboard
#include "nsIServiceManager.h" #include "nsIServiceManager.h"
#include "nsWidgetsCID.h" #include "nsWidgetsCID.h"
@ -65,14 +63,12 @@ static NS_DEFINE_IID(kCDataFlavorCID, NS_DATAFLAVOR_CID);
static NS_DEFINE_IID(kCXIFFormatConverterCID, NS_XIFFORMATCONVERTER_CID); static NS_DEFINE_IID(kCXIFFormatConverterCID, NS_XIFFORMATCONVERTER_CID);
static NS_DEFINE_IID(kIFormatConverterIID, NS_IFORMATCONVERTER_IID); static NS_DEFINE_IID(kIFormatConverterIID, NS_IFORMATCONVERTER_IID);
#endif
/* /*
* nsTextEditorKeyListener implementation * nsTextEditorKeyListener implementation
*/ */
NS_IMPL_ADDREF(nsTextEditorKeyListener) NS_IMPL_ADDREF(nsTextEditorKeyListener)
NS_IMPL_RELEASE(nsTextEditorKeyListener) NS_IMPL_RELEASE(nsTextEditorKeyListener)

52
editor/libeditor/base/nsEditor.cpp
Просмотреть файл

@ -42,9 +42,6 @@
#include "nsIAtom.h" #include "nsIAtom.h"
#include "nsVoidArray.h" #include "nsVoidArray.h"
#include "nsICaret.h" #include "nsICaret.h"
#ifndef NEW_CLIPBOARD_SUPPORT
#include "nsISelectionMgr.h"
#endif
#include "nsIContent.h" #include "nsIContent.h"
#include "nsIContentIterator.h" #include "nsIContentIterator.h"
@ -75,8 +72,6 @@
// END // END
#endif #endif
#ifdef NEW_CLIPBOARD_SUPPORT
// Drag & Drop, Clipboard // Drag & Drop, Clipboard
#include "nsWidgetsCID.h" #include "nsWidgetsCID.h"
#include "nsIClipboard.h" #include "nsIClipboard.h"
@ -88,15 +83,12 @@
// Drag & Drop, Clipboard Support // Drag & Drop, Clipboard Support
static NS_DEFINE_IID(kIClipboardIID, NS_ICLIPBOARD_IID); static NS_DEFINE_IID(kIClipboardIID, NS_ICLIPBOARD_IID);
static NS_DEFINE_CID(kCClipboardCID, NS_CLIPBOARD_CID); static NS_DEFINE_CID(kCClipboardCID, NS_CLIPBOARD_CID);
static NS_DEFINE_CID(kIGenericTransferableIID, NS_IGENERICTRANSFERABLE_IID); static NS_DEFINE_CID(kIGenericTransferableIID, NS_IGENERICTRANSFERABLE_IID);
static NS_DEFINE_CID(kCGenericTransferableCID, NS_GENERICTRANSFERABLE_CID); static NS_DEFINE_CID(kCGenericTransferableCID, NS_GENERICTRANSFERABLE_CID);
static NS_DEFINE_IID(kIDataFlavorIID, NS_IDATAFLAVOR_IID); static NS_DEFINE_IID(kIDataFlavorIID, NS_IDATAFLAVOR_IID);
static NS_DEFINE_IID(kCDataFlavorCID, NS_DATAFLAVOR_CID); static NS_DEFINE_IID(kCDataFlavorCID, NS_DATAFLAVOR_CID);
static NS_DEFINE_IID(kCXIFFormatConverterCID, NS_XIFFORMATCONVERTER_CID); static NS_DEFINE_IID(kCXIFFormatConverterCID, NS_XIFFORMATCONVERTER_CID);
static NS_DEFINE_IID(kIFormatConverterIID, NS_IFORMATCONVERTER_IID); static NS_DEFINE_IID(kIFormatConverterIID, NS_IFORMATCONVERTER_IID);
#endif
static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID); static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID);
static NS_DEFINE_IID(kIDOMTextIID, NS_IDOMTEXT_IID); static NS_DEFINE_IID(kIDOMTextIID, NS_IDOMTEXT_IID);
@ -922,34 +914,12 @@ NS_IMETHODIMP nsEditor::Cut()
return res; return res;
} }
#ifndef NEW_CLIPBOARD_SUPPORT
extern "C" NS_EXPORT nsISelectionMgr* GetSelectionMgr();
#endif
NS_IMETHODIMP nsEditor::Copy() NS_IMETHODIMP nsEditor::Copy()
{ {
//printf("nsEditor::Copy\n"); //printf("nsEditor::Copy\n");
#ifndef NEW_CLIPBOARD_SUPPORT
// Get the nsSelectionMgr:
// XXX BWEEP BWEEP TEMPORARY!
// The selection mgr needs to be a service.
// See http://bugzilla.mozilla.org/show_bug.cgi?id=3509.
// In the meantime, so I'm not blocked on writing the rest of the code,
// nsSelectionMgr uses the egregious hack of a global variable:
nsISelectionMgr* selectionMgr = GetSelectionMgr();
if (!selectionMgr)
{
printf("Can't get selection mgr!\n");
return NS_ERROR_FAILURE;
}
//NS_ADD_REF(theSelectionMgr);
return mPresShell->DoCopy(selectionMgr);
#else
return mPresShell->DoCopy(); return mPresShell->DoCopy();
#endif
} }
NS_IMETHODIMP nsEditor::Paste() NS_IMETHODIMP nsEditor::Paste()
@ -957,8 +927,6 @@ NS_IMETHODIMP nsEditor::Paste()
//printf("nsEditor::Paste\n"); //printf("nsEditor::Paste\n");
nsString stuffToPaste; nsString stuffToPaste;
#ifdef NEW_CLIPBOARD_SUPPORT
// Get Clipboard Service // Get Clipboard Service
nsIClipboard* clipboard; nsIClipboard* clipboard;
nsresult rv = nsServiceManager::GetService(kCClipboardCID, nsresult rv = nsServiceManager::GetService(kCClipboardCID,
@ -1008,26 +976,6 @@ NS_IMETHODIMP nsEditor::Paste()
} }
NS_IF_RELEASE(clipboard); NS_IF_RELEASE(clipboard);
#else
// Get the nsSelectionMgr:
// XXX BWEEP BWEEP TEMPORARY!
// The selection mgr needs to be a service.
// See http://bugzilla.mozilla.org/show_bug.cgi?id=3509.
// In the meantime, so I'm not blocked on writing the rest of the code,
// nsSelectionMgr uses the egregious hack of a global variable:
nsISelectionMgr* selectionMgr = GetSelectionMgr();
if (!selectionMgr)
{
printf("Can't get selection mgr!\n");
return NS_ERROR_FAILURE;
}
//NS_ADD_REF(theSelectionMgr);
// Now we have the selection mgr. Get its contents as text (for now):
selectionMgr->PasteTextBlocking(&stuffToPaste);
#endif
//printf("Trying to insert '%s'\n", stuffToPaste.ToNewCString()); //printf("Trying to insert '%s'\n", stuffToPaste.ToNewCString());
// Now let InsertText handle the hard stuff: // Now let InsertText handle the hard stuff:

4
editor/libeditor/text/nsEditorEventListeners.cpp
Просмотреть файл

@ -39,8 +39,6 @@
static NS_DEFINE_IID(kIDOMElementIID, NS_IDOMELEMENT_IID); static NS_DEFINE_IID(kIDOMElementIID, NS_IDOMELEMENT_IID);
static NS_DEFINE_IID(kIDOMCharacterDataIID, NS_IDOMCHARACTERDATA_IID); static NS_DEFINE_IID(kIDOMCharacterDataIID, NS_IDOMCHARACTERDATA_IID);
#ifdef NEW_CLIPBOARD_SUPPORT
// Drag & Drop, Clipboard // Drag & Drop, Clipboard
#include "nsIServiceManager.h" #include "nsIServiceManager.h"
#include "nsWidgetsCID.h" #include "nsWidgetsCID.h"
@ -65,14 +63,12 @@ static NS_DEFINE_IID(kCDataFlavorCID, NS_DATAFLAVOR_CID);
static NS_DEFINE_IID(kCXIFFormatConverterCID, NS_XIFFORMATCONVERTER_CID); static NS_DEFINE_IID(kCXIFFormatConverterCID, NS_XIFFORMATCONVERTER_CID);
static NS_DEFINE_IID(kIFormatConverterIID, NS_IFORMATCONVERTER_IID); static NS_DEFINE_IID(kIFormatConverterIID, NS_IFORMATCONVERTER_IID);
#endif
/* /*
* nsTextEditorKeyListener implementation * nsTextEditorKeyListener implementation
*/ */
NS_IMPL_ADDREF(nsTextEditorKeyListener) NS_IMPL_ADDREF(nsTextEditorKeyListener)
NS_IMPL_RELEASE(nsTextEditorKeyListener) NS_IMPL_RELEASE(nsTextEditorKeyListener)