From dcc4eb02da215a2734a40f6dfbb79f6f57cd9579 Mon Sep 17 00:00:00 2001 From: "rods%netscape.com" Date: Tue, 15 Jun 1999 14:26:23 +0000 Subject: [PATCH] Changed special MULTI_MIME to be used by both classes git-svn-id: svn://10.0.0.236/trunk@35444 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/widget/src/windows/nsDataObjCollection.cpp | 2 +- mozilla/widget/src/windows/nsDataObjCollection.h | 2 ++ mozilla/widget/src/windows/nsDragService.cpp | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mozilla/widget/src/windows/nsDataObjCollection.cpp b/mozilla/widget/src/windows/nsDataObjCollection.cpp index 9dac9bb9580..a8d2d6e3e05 100644 --- a/mozilla/widget/src/windows/nsDataObjCollection.cpp +++ b/mozilla/widget/src/windows/nsDataObjCollection.cpp @@ -172,7 +172,7 @@ STDMETHODIMP nsDataObjCollection::GetDataHere(LPFORMATETC pFE, LPSTGMEDIUM pSTM) //----------------------------------------------------- STDMETHODIMP nsDataObjCollection::QueryGetData(LPFORMATETC pFE) { - UINT format = nsClipboard::GetFormat("multiple"); + UINT format = nsClipboard::GetFormat(MULTI_MIME); PRNTDEBUG("nsDataObjCollection::QueryGetData "); PRNTDEBUG3("format: %d Mulitple: %d\n", pFE->cfFormat, format); diff --git a/mozilla/widget/src/windows/nsDataObjCollection.h b/mozilla/widget/src/windows/nsDataObjCollection.h index 50c073022f9..233d6252903 100644 --- a/mozilla/widget/src/windows/nsDataObjCollection.h +++ b/mozilla/widget/src/windows/nsDataObjCollection.h @@ -27,6 +27,8 @@ class CEnumFormatEtc; class nsITransferable; +#define MULTI_MIME "Mozilla/IDataObjectCollectionFormat" + /* * This ole registered class is used to facilitate drag-drop of objects which * can be adapted by an object derived from CfDragDrop. The CfDragDrop is diff --git a/mozilla/widget/src/windows/nsDragService.cpp b/mozilla/widget/src/windows/nsDragService.cpp index c2855c8dc2a..a09f2fbd9d7 100644 --- a/mozilla/widget/src/windows/nsDragService.cpp +++ b/mozilla/widget/src/windows/nsDragService.cpp @@ -30,7 +30,6 @@ #include #include "OLEIDL.H" -static const char * MULTI_MIME = "Mozilla/IDataObjectCollectionFormat"; static NS_DEFINE_IID(kIDragServiceIID, NS_IDRAGSERVICE_IID); static NS_DEFINE_IID(kIDragSessionIID, NS_IDRAGSESSION_IID);