*** empty log message ***

5 files changed, 20 insertions, 24 deletions

diff --git a/dtrans/test/win32/dnd/atlwindow.cxx b/dtrans/test/win32/dnd/atlwindow.cxx
index bd2a6803dac4..40605ac7f80e 100644
--- a/dtrans/test/win32/dnd/atlwindow.cxx
+++ b/dtrans/test/win32/dnd/atlwindow.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: atlwindow.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jl $ $Date: 2001-02-08 17:12:03 $
+ *  last change: $Author: jl $ $Date: 2001-02-12 13:14:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -222,7 +222,7 @@ LRESULT AWindow::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled
         {
             Reference<XTransferable> data( static_cast<XTransferable*>( new CTransferable( A2W(pBuffer))) );
 
-            m_xDragSource->executeDrag( DragGestureEvent(),
+            m_xDragSource->startDrag( DragGestureEvent(),
                 ACTION_LINK|ACTION_MOVE|ACTION_COPY,
                 0,
                 0,
diff --git a/dtrans/test/win32/dnd/dndTest.cxx b/dtrans/test/win32/dnd/dndTest.cxx
index 075d00ff3fdf..b60b3aac1812 100644
--- a/dtrans/test/win32/dnd/dndTest.cxx
+++ b/dtrans/test/win32/dnd/dndTest.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dndTest.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jl $ $Date: 2001-02-08 17:12:03 $
+ *  last change: $Author: jl $ $Date: 2001-02-12 13:14:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -157,7 +157,7 @@ DWORD WINAPI MTAFunc(LPVOID pParams)
     ThreadData data= *( ThreadData*)pParams;
     SetEvent(data.evtThreadReady);
 
-    data.source->executeDrag( DragGestureEvent(),
+    data.source->startDrag( DragGestureEvent(),
             ACTION_LINK|ACTION_MOVE|ACTION_COPY,
             0,
             0,
diff --git a/dtrans/test/win32/dnd/makefile.mk b/dtrans/test/win32/dnd/makefile.mk
index d1bbbc1bd191..62513fa99f74 100644
--- a/dtrans/test/win32/dnd/makefile.mk
+++ b/dtrans/test/win32/dnd/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: jl $ $Date: 2001-02-08 17:12:03 $
+#   last change: $Author: jl $ $Date: 2001-02-12 13:14:36 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -114,7 +114,7 @@ APP1TARGET=	$(TARGET)
 APP1OBJS=	$(OBJ)$/dndTest.obj	\
             $(OBJ)$/atlwindow.obj \
             $(OBJ)$/targetlistener.obj \
-            $(OBJ)$/implhelper.obj		\
+            $(SLO)$/implhelper.obj		\
             $(OBJ)$/transferable.obj	\
             $(OBJ)$/sourcelistener.obj
 
diff --git a/dtrans/test/win32/dnd/targetlistener.cxx b/dtrans/test/win32/dnd/targetlistener.cxx
index a66e4e0cde5f..653c386d5592 100644
--- a/dtrans/test/win32/dnd/targetlistener.cxx
+++ b/dtrans/test/win32/dnd/targetlistener.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: targetlistener.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: jl $ $Date: 2001-02-08 15:10:08 $
+ *  last change: $Author: jl $ $Date: 2001-02-12 13:14:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -88,8 +88,8 @@ void SAL_CALL DropTargetListener::drop( const DropTargetDropEvent& e )
     throw(RuntimeException)
 {
 //  e.Context->dropComplete( sal_True);
-//  e.Context->accept( ACTION_COPY);
-    e.Context->reject();
+//  e.Context->acceptDrop( ACTION_COPY);
+    e.Context->rejectDrop();
 
     // if the Transferable contains text, then we send it to the edit window
 //  Sequence<DataFlavor> flavors= e.Transferable->getTransferDataFlavors();
@@ -105,20 +105,15 @@ void SAL_CALL DropTargetListener::drop( const DropTargetDropEvent& e )
     SendMessage( m_hEdit, WM_SETTEXT, 0, (LPARAM) seq.getConstArray() );
 }
 
-void SAL_CALL DropTargetListener::dragEnter( const DropTargetDragEvent& dtde )
+void SAL_CALL DropTargetListener::dragEnter( const DropTargetDragEnterEvent& dtde )
      throw(RuntimeException)
 {
     //If one drags something that is not moveable
     if( !(dtde.SourceActions & dtde.DropAction) )
-        dtde.Context->accept( ACTION_COPY);
+        dtde.Context->acceptDrag( ACTION_COPY);
 
 //  dtde.Context->rejectDrag( );
 
-    Sequence<DataFlavor> seq= dtde.Context->getCurrentDataFlavors();
-    for( int i=0; i < seq.getLength(); i++)
-    {
-        DataFlavor& f= seq[i];
-    }
 }
 
 void SAL_CALL DropTargetListener::dragExit( const DropTargetEvent& dte )
@@ -130,7 +125,7 @@ void SAL_CALL DropTargetListener::dragOver( const DropTargetDragEvent& dtde )
      throw(RuntimeException)
 {
     if( !(dtde.SourceActions & dtde.DropAction) )
-        dtde.Context->accept( ACTION_COPY);
+        dtde.Context->acceptDrag( ACTION_COPY);
 }
 
 void SAL_CALL DropTargetListener::dropActionChanged( const DropTargetDragEvent& dtde )
diff --git a/dtrans/test/win32/dnd/targetlistener.hxx b/dtrans/test/win32/dnd/targetlistener.hxx
index bacadda47683..9b24cb950ea2 100644
--- a/dtrans/test/win32/dnd/targetlistener.hxx
+++ b/dtrans/test/win32/dnd/targetlistener.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: targetlistener.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: jl $ $Date: 2001-02-08 15:10:21 $
+ *  last change: $Author: jl $ $Date: 2001-02-12 13:14:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,6 +67,7 @@
 #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
 #include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
 #include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp>
 
 using namespace ::com::sun::star::datatransfer;
 using namespace ::com::sun::star::datatransfer::dnd;
@@ -88,7 +89,7 @@ public:
 
     virtual void SAL_CALL drop( const DropTargetDropEvent& dtde )
         throw(RuntimeException);
-    virtual void SAL_CALL dragEnter( const DropTargetDragEvent& dtde )
+    virtual void SAL_CALL dragEnter( const DropTargetDragEnterEvent& dtde )
         throw(RuntimeException);
     virtual void SAL_CALL dragExit( const DropTargetEvent& dte )
         throw(RuntimeException);