Bug 500247 mozilla-central nsITreeView drag'n'drop API changed r+sr=Standard8
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Wed, 24 Jun 2009 23:37:46 +0100
changeset 2937 688999061f8dc5bce6d24488f7fcba30ed8917e1
parent 2936 4bd70de4cf76d37dc53512d7f25927ea9135b3ec
child 2938 3278b3249a0f16750ab01b29af218a40e531d99c
push idunknown
push userunknown
push dateunknown
bugs500247
Bug 500247 mozilla-central nsITreeView drag'n'drop API changed r+sr=Standard8
mailnews/addrbook/src/nsAbView.cpp
mailnews/base/src/nsMsgDBView.cpp
mailnews/news/src/nsNntpIncomingServer.cpp
--- a/mailnews/addrbook/src/nsAbView.cpp
+++ b/mailnews/addrbook/src/nsAbView.cpp
@@ -381,22 +381,35 @@ NS_IMETHODIMP nsAbView::IsSeparator(PRIn
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbView::IsSorted(PRBool *_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
+#ifdef MOZILLA_1_9_1_BRANCH
 NS_IMETHODIMP nsAbView::CanDrop(PRInt32 index, PRInt32 orientation, PRBool *_retval)
+#else
+NS_IMETHODIMP nsAbView::CanDrop(PRInt32 index,
+                                PRInt32 orientation,
+                                nsIDOMDataTransfer *dataTransfer,
+                                PRBool *_retval)
+#endif
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
+#ifdef MOZILLA_1_9_1_BRANCH
 NS_IMETHODIMP nsAbView::Drop(PRInt32 row, PRInt32 orientation)
+#else
+NS_IMETHODIMP nsAbView::Drop(PRInt32 row,
+                             PRInt32 orientation,
+                             nsIDOMDataTransfer *dataTransfer)
+#endif
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP nsAbView::GetParentIndex(PRInt32 rowIndex, PRInt32 *_retval)
 {
   *_retval = -1;
   return NS_OK;
--- a/mailnews/base/src/nsMsgDBView.cpp
+++ b/mailnews/base/src/nsMsgDBView.cpp
@@ -6923,31 +6923,44 @@ nsresult nsMsgDBView::GetImapDeleteModel
 }
 
 
 //
 // CanDrop
 //
 // Can't drop on the thread pane.
 //
+#ifdef MOZILLA_1_9_1_BRANCH
 NS_IMETHODIMP nsMsgDBView::CanDrop(PRInt32 index, PRInt32 orient, PRBool *_retval)
+#else
+NS_IMETHODIMP nsMsgDBView::CanDrop(PRInt32 index,
+                                   PRInt32 orient,
+                                   nsIDOMDataTransfer *dataTransfer,
+                                   PRBool *_retval)
+#endif
 {
   NS_ENSURE_ARG_POINTER(_retval);
   *_retval = PR_FALSE;
 
   return NS_OK;
 }
 
 
 //
 // Drop
 //
 // Can't drop on the thread pane.
 //
+#ifdef MOZILLA_1_9_1_BRANCH
 NS_IMETHODIMP nsMsgDBView::Drop(PRInt32 row, PRInt32 orient)
+#else
+NS_IMETHODIMP nsMsgDBView::Drop(PRInt32 row,
+                                PRInt32 orient,
+                                nsIDOMDataTransfer *dataTransfer)
+#endif
 {
   return NS_OK;
 }
 
 
 //
 // IsSorted
 //
--- a/mailnews/news/src/nsNntpIncomingServer.cpp
+++ b/mailnews/news/src/nsNntpIncomingServer.cpp
@@ -1900,23 +1900,36 @@ nsNntpIncomingServer::IsSeparator(PRInt3
 
 NS_IMETHODIMP
 nsNntpIncomingServer::IsSorted(PRBool *_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
+#ifdef MOZILLA_1_9_1_BRANCH
 nsNntpIncomingServer::CanDrop(PRInt32 index, PRInt32 orientation, PRBool *_retval)
+#else
+nsNntpIncomingServer::CanDrop(PRInt32 index,
+                              PRInt32 orientation,
+                              nsIDOMDataTransfer *dataTransfer,
+                              PRBool *_retval)
+#endif
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
+#ifdef MOZILLA_1_9_1_BRANCH
 nsNntpIncomingServer::Drop(PRInt32 row, PRInt32 orientation)
+#else
+nsNntpIncomingServer::Drop(PRInt32 row,
+                           PRInt32 orientation,
+                           nsIDOMDataTransfer *dataTransfer)
+#endif
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 nsNntpIncomingServer::GetParentIndex(PRInt32 rowIndex, PRInt32 *_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;