removing nsIDataFlavor and nsIGenericTransferable

widget/public/makefile.win

@@ -26,9 +26,7 @@ EXPORTS=nsui.h \
   nsIFormatConverter.h \
   nsIClipboardOwner.h \
   nsIClipboard.h \
-  nsIDataFlavor.h \
   nsITransferable.h \
-  nsIGenericTransferable.h \
   nsIDragService.h \
   nsIDragSession.h \
   nsIWidget.h \

widget/src/build/nsWinWidgetFactory.cpp

@@ -52,7 +52,6 @@
 #include "nsClipboard.h"
 #include "nsTransferable.h"
 #include "nsXIFFormatConverter.h"
-#include "nsDataFlavor.h"
 #include "nsDragService.h"
 //#include "nsFileListTransferable.h"
 
@@ -88,7 +87,6 @@ static NS_DEFINE_IID(kCDataObj,       NS_DATAOBJ_CID);
 static NS_DEFINE_IID(kCClipboard,     NS_CLIPBOARD_CID);
 static NS_DEFINE_IID(kCTransferable,  NS_TRANSFERABLE_CID);
 static NS_DEFINE_IID(kCXIFFormatConverter,  NS_XIFFORMATCONVERTER_CID);
-static NS_DEFINE_IID(kCDataFlavor,    NS_DATAFLAVOR_CID);
 static NS_DEFINE_IID(kCDragService,   NS_DRAGSERVICE_CID);
 static NS_DEFINE_IID(kCFileListTransferable, NS_FILELISTTRANSFERABLE_CID);
 
@@ -243,9 +241,6 @@ nsresult nsWidgetFactory::CreateInstance( nsISupports* aOuter,
     else if (mClassID.Equals(kCPopUpMenu)) {
         inst = (nsISupports*)new nsPopUpMenu();
     }
-    else if (mClassID.Equals(kCDataFlavor)) {
-        inst = (nsISupports*)new nsDataFlavor();
-    }
     else if (mClassID.Equals(kCTransferable)) {
         inst = (nsISupports*)new nsTransferable();
     }

widget/src/xpwidgets/makefile.win

@@ -28,7 +28,6 @@ CPPSRCS = \
 	nsMenuButton.cpp        \
 	nsImageButton.cpp         \
 	nsBaseClipboard.cpp         \
-	nsDataFlavor.cpp         \
 	nsTransferable.cpp         \
 	nsXIFFormatConverter.cpp         \
 	$(NULL)
@@ -41,7 +40,6 @@ OBJS= \
 	.\$(OBJDIR)\nsMenuButton.obj  \
 	.\$(OBJDIR)\nsImageButton.obj  \
 	.\$(OBJDIR)\nsBaseClipboard.obj  \
-	.\$(OBJDIR)\nsDataFlavor.obj  \
 	.\$(OBJDIR)\nsTransferable.obj  \
 	.\$(OBJDIR)\nsXIFFormatConverter.obj  \
 	$(NULL)

widget/src/xpwidgets/nsTransferable.cpp

@@ -18,7 +18,6 @@
 
 #include "nsTransferable.h"
 #include "nsString.h"
-#include "nsDataFlavor.h"
 #include "nsWidgetsCID.h"
 #include "nsVoidArray.h"
 #include "nsIFormatConverter.h"

widget/src/xpwidgets/nsTransferable.h

@@ -21,7 +21,6 @@
 
 #include "nsIFormatConverter.h"
 #include "nsITransferable.h"
-#include "nsIGenericTransferable.h"
 #include "nsCOMPtr.h"