don't include headers not needed when wxUSE_GUI == 0

[wxWidgets.git] / src / mac / carbon / dnd.cpp

diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp
index 4033d33e014de559f113c363fd8cfa9d8d75925f..c4f3c8cf63bc1b9e9f22edc4eafb5e544123716f 100644 (file)
--- a/src/mac/carbon/dnd.cpp
+++ b/src/mac/carbon/dnd.cpp
@@ -1,11 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        dnd.cpp
 // Purpose:     wxDropTarget, wxDropSource, wxDataObject implementation
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        dnd.cpp
 // Purpose:     wxDropTarget, wxDropSource, wxDataObject implementation

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) 1998 AUTHOR
+// Copyright:   (c) 1998 Stefan Csomor

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -24,6 +24,10 @@
 #include "wx/gdicmn.h"
 #include "wx/mac/private.h"
 
 #include "wx/gdicmn.h"
 #include "wx/mac/private.h"
 

+#ifndef __DARWIN__
+    #include <Scrap.h>
+#endif
+

 // ----------------------------------------------------------------------------
 // global
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global
 // ----------------------------------------------------------------------------


@@ -82,47 +86,47 @@ bool wxDropTarget::CurrentDragHasSupportedFormat()
     bool supported = false ;
     if ( gTrackingGlobals.m_currentSource != NULL )
     {
     bool supported = false ;
     if ( gTrackingGlobals.m_currentSource != NULL )
     {

-      wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject() ;
-      
-      if ( data )
-      {
-        size_t formatcount = data->GetFormatCount() ;
-        wxDataFormat *array = new wxDataFormat[ formatcount  ];
-        data->GetAllFormats( array );
-        for (size_t i = 0; !supported && i < formatcount ; i++)
+        wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject() ;
+        
+        if ( data )

         {
         {

-            wxDataFormat format = array[i] ;
-            if ( m_dataObject->IsSupported( format ) ) 
+            size_t formatcount = data->GetFormatCount() ;
+            wxDataFormat *array = new wxDataFormat[ formatcount  ];
+            data->GetAllFormats( array );
+            for (size_t i = 0; !supported && i < formatcount ; i++)

             {
             {

-              supported = true ;
-              break ;
+                wxDataFormat format = array[i] ;
+                if ( m_dataObject->IsSupported( format ) ) 
+                {
+                    supported = true ;
+                    break ;
+                }

             }
             }

+            delete[] array ;

         }
         }

-        delete[] array ;
-      }

     }
     if ( !supported )
     {
     }
     if ( !supported )
     {

-      UInt16 items ;
-      OSErr result;
-      CountDragItems((DragReference)m_currentDrag, &items);
-      for (UInt16 index = 1; index <= items && supported == false ; ++index) 
-      {
-          ItemReference theItem;
-          FlavorType theType ;
-          UInt16 flavors = 0 ;
-          GetDragItemReferenceNumber((DragReference)m_currentDrag, index, &theItem);
-          CountDragItemFlavors( (DragReference)m_currentDrag, theItem , &flavors ) ;
-          for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor )
-          {
-            result = GetFlavorType((DragReference)m_currentDrag, theItem, flavor , &theType);
-            if ( m_dataObject->IsSupportedFormat( wxDataFormat( theType ) ) )
+        UInt16 items ;
+        OSErr result;
+        CountDragItems((DragReference)m_currentDrag, &items);
+        for (UInt16 index = 1; index <= items && supported == false ; ++index) 
+        {
+            ItemReference theItem;
+            FlavorType theType ;
+            UInt16 flavors = 0 ;
+            GetDragItemReferenceNumber((DragReference)m_currentDrag, index, &theItem);
+            CountDragItemFlavors( (DragReference)m_currentDrag, theItem , &flavors ) ;
+            for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor )

             {
             {

-              supported = true ;
-              break ;
+                result = GetFlavorType((DragReference)m_currentDrag, theItem, flavor , &theType);
+                if ( m_dataObject->IsSupportedFormat( wxDataFormat( theType ) ) )
+                {
+                    supported = true ;
+                    break ;
+                }

             }
             }

-          }
-      }
+        }

     }
     return supported ;   
 }
     }
     return supported ;   
 }


@@ -131,109 +135,120 @@ bool wxDropTarget::GetData()
 {
     if (!m_dataObject)
         return FALSE;
 {
     if (!m_dataObject)
         return FALSE;

-        
+    

     if ( !CurrentDragHasSupportedFormat() )
         return FALSE ;
     if ( !CurrentDragHasSupportedFormat() )
         return FALSE ;

-     
+    

     bool transferred = false ;   
     if ( gTrackingGlobals.m_currentSource != NULL )
     {
     bool transferred = false ;   
     if ( gTrackingGlobals.m_currentSource != NULL )
     {

-      wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject() ;
-      
-      if ( data )
-      {
-        size_t formatcount = data->GetFormatCount() ;
-        wxDataFormat *array = new wxDataFormat[ formatcount  ];
-        data->GetAllFormats( array );
-        for (size_t i = 0; !transferred && i < formatcount ; i++)
+        wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject() ;
+        
+        if ( data )

         {
         {

-            wxDataFormat format = array[i] ;
-            if ( m_dataObject->IsSupported( format ) ) 
+            size_t formatcount = data->GetFormatCount() ;
+            wxDataFormat *array = new wxDataFormat[ formatcount  ];
+            data->GetAllFormats( array );
+            for (size_t i = 0; !transferred && i < formatcount ; i++)

             {
             {

-              int size = data->GetDataSize( format );
-              transferred = true ;
-
-              if (size == 0) 
-              {
-                m_dataObject->SetData(format , 0 , 0 ) ;
-              }
-              else
-              {
-                char *d = new char[size];
-                data->GetDataHere( format , (void*) d );
-                m_dataObject->SetData( format , size , d ) ;
-                delete[] d ;
-              }
+                wxDataFormat format = array[i] ;
+                if ( m_dataObject->IsSupported( format ) ) 
+                {
+                    int size = data->GetDataSize( format );
+                    transferred = true ;
+                    
+                    if (size == 0) 
+                    {
+                        m_dataObject->SetData(format , 0 , 0 ) ;
+                    }
+                    else
+                    {
+                        char *d = new char[size];
+                        data->GetDataHere( format , (void*) d );
+                        m_dataObject->SetData( format , size , d ) ;
+                        delete[] d ;
+                    }
+                }

             }
             }

-         }
-        delete[] array ;
-      }
+            delete[] array ;
+        }

     }
     if ( !transferred )
     {
     }
     if ( !transferred )
     {

-      UInt16 items ;
-      OSErr result;
-      bool firstFileAdded = false ;
-      CountDragItems((DragReference)m_currentDrag, &items);
-      for (UInt16 index = 1; index <= items; ++index) 
-      {
-          ItemReference theItem;
-          FlavorType theType ;
-          UInt16 flavors = 0 ;
-          GetDragItemReferenceNumber((DragReference)m_currentDrag, index, &theItem);
-          CountDragItemFlavors( (DragReference)m_currentDrag, theItem , &flavors ) ;
-          for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor )
-          {
-            result = GetFlavorType((DragReference)m_currentDrag, theItem, flavor , &theType);
-            wxDataFormat format(theType) ;
-            if ( m_dataObject->IsSupportedFormat( format ) )
+        UInt16 items ;
+        OSErr result;
+        bool firstFileAdded = false ;
+        CountDragItems((DragReference)m_currentDrag, &items);
+        for (UInt16 index = 1; index <= items; ++index) 
+        {
+            ItemReference theItem;
+            FlavorType theType ;
+            UInt16 flavors = 0 ;
+            GetDragItemReferenceNumber((DragReference)m_currentDrag, index, &theItem);
+            CountDragItemFlavors( (DragReference)m_currentDrag, theItem , &flavors ) ;
+            for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor )

             {
             {

-              FlavorFlags theFlags;
-              result = GetFlavorFlags((DragReference)m_currentDrag, theItem, theType, &theFlags);
-              if (result == noErr) 
-              {
-                  Size dataSize ;
-                  Ptr theData ;
-                  GetFlavorDataSize((DragReference)m_currentDrag, theItem, theType, &dataSize);
-                         if ( theType == 'TEXT' )
-                         {
-                               // this increment is only valid for allocating, on the next GetFlavorData
-                               // call it is reset again to the original value
-                           dataSize++ ;
-                         }
-                  theData = new char[dataSize];
-                  GetFlavorData((DragReference)m_currentDrag, theItem, theType, (void*) theData, &dataSize, 0L); 
-                  if( theType == 'TEXT' )
-                  {
-                    theData[dataSize]=0 ;       
-                    if ( wxApp::s_macDefaultEncodingIsPC )
-                    {
-                      wxMacConvertToPC((char*)theData,(char*)theData,dataSize) ;
-                    }
-                    m_dataObject->SetData( format, dataSize, theData );
-                  }
-                  else if ( theType == kDragFlavorTypeHFS )
-                  {
-                    HFSFlavor* theFile = (HFSFlavor*) theData ;
-                    wxString name = wxMacFSSpec2MacFilename( &theFile->fileSpec ) ;
-                    if (  firstFileAdded )
-                       ((wxFileDataObject*)m_dataObject)->AddFile( name ) ;
-                    else
+                result = GetFlavorType((DragReference)m_currentDrag, theItem, flavor , &theType);
+                wxDataFormat format(theType) ;
+                if ( m_dataObject->IsSupportedFormat( format ) )
+                {
+                    FlavorFlags theFlags;
+                    result = GetFlavorFlags((DragReference)m_currentDrag, theItem, theType, &theFlags);
+                    if (result == noErr) 

                     {
                     {

-                       ((wxFileDataObject*)m_dataObject)->SetData( 0 , name.c_str() ) ;
-                       firstFileAdded = true ; 
+                        Size dataSize ;
+                        Ptr theData ;
+                        GetFlavorDataSize((DragReference)m_currentDrag, theItem, theType, &dataSize);
+                        if ( theType == kScrapFlavorTypeText )
+                        {
+                            // this increment is only valid for allocating, on the next GetFlavorData
+                            // call it is reset again to the original value
+                            dataSize++ ;
+                        }
+                        else if ( theType == kScrapFlavorTypeUnicode )
+                        {
+                            // this increment is only valid for allocating, on the next GetFlavorData
+                            // call it is reset again to the original value
+                            dataSize++ ;
+                            dataSize++ ;
+                        }
+                        theData = new char[dataSize];
+                        GetFlavorData((DragReference)m_currentDrag, theItem, theType, (void*) theData, &dataSize, 0L); 
+                        if( theType == kScrapFlavorTypeText )
+                        {
+                            theData[dataSize]=0 ; 
+                            m_dataObject->SetData( wxDataFormat(wxDF_TEXT), dataSize , theData );
+                        }
+ #if wxUSE_UNICODE
+                        else if ( theType == kScrapFlavorTypeUnicode )
+                        {
+                            theData[dataSize]=0 ; 
+                            theData[dataSize+1]=0 ; 
+                            m_dataObject->SetData( wxDataFormat(wxDF_UNICODETEXT), dataSize , theData );
+                        }
+ #endif
+                        else if ( theType == kDragFlavorTypeHFS )
+                        {
+                            HFSFlavor* theFile = (HFSFlavor*) theData ;
+                            wxString name = wxMacFSSpec2MacFilename( &theFile->fileSpec ) ;
+                            if ( !firstFileAdded )
+                            {
+                                // reset file list
+                                ((wxFileDataObject*)m_dataObject)->SetData( 0 , "" ) ;
+                                firstFileAdded = true ;    
+                            }
+                            ((wxFileDataObject*)m_dataObject)->AddFile( name ) ;
+                        }
+                        else
+                        {
+                            m_dataObject->SetData( format, dataSize, theData );
+                        }
+                        delete[] theData;

                     }
                     }

-                  }
-                  else
-                  {
-                    m_dataObject->SetData( format, dataSize, theData );
-                  }
-                  delete[] theData;
-              }
-              break ;
+                    break ;
+                }

             }
             }

-          }
-      }
+        }

     }
     return TRUE ;   
 }
     }
     return TRUE ;   
 }


@@ -246,9 +261,10 @@ bool wxDropTarget::GetData()
 // drag request
 
 wxDropSource::wxDropSource(wxWindow *win,
 // drag request
 
 wxDropSource::wxDropSource(wxWindow *win,

-                           const wxIcon &iconCopy,
-                           const wxIcon &iconMove,
-                           const wxIcon &iconNone)
+                           const wxCursor &cursorCopy,
+                           const wxCursor &cursorMove,
+                           const wxCursor &cursorStop)
+            : wxDropSourceBase(cursorCopy, cursorMove, cursorStop)

 {
     wxMacEnsureTrackingHandlersInstalled() ;
     m_window = win;
 {
     wxMacEnsureTrackingHandlersInstalled() ;
     m_window = win;


@@ -256,9 +272,10 @@ wxDropSource::wxDropSource(wxWindow *win,
 
 wxDropSource::wxDropSource(wxDataObject& data,
                            wxWindow *win,
 
 wxDropSource::wxDropSource(wxDataObject& data,
                            wxWindow *win,

-                           const wxIcon &iconCopy,
-                           const wxIcon &iconMove,
-                           const wxIcon &iconNone)
+                           const wxCursor &cursorCopy,
+                           const wxCursor &cursorMove,
+                           const wxCursor &cursorStop)
+            : wxDropSourceBase(cursorCopy, cursorMove, cursorStop)

 {
     wxMacEnsureTrackingHandlersInstalled() ;
     SetData( data );
 {
     wxMacEnsureTrackingHandlersInstalled() ;
     SetData( data );


@@ -273,13 +290,13 @@ wxDropSource::~wxDropSource()
 wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))
 {
     wxASSERT_MSG( m_data, wxT("Drop source: no data") );
 wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))
 {
     wxASSERT_MSG( m_data, wxT("Drop source: no data") );

-
+    

     if (!m_data)
         return (wxDragResult) wxDragNone;
     if (!m_data)
         return (wxDragResult) wxDragNone;

-
+    

     if (m_data->GetFormatCount() == 0)
         return (wxDragResult) wxDragNone;
     if (m_data->GetFormatCount() == 0)
         return (wxDragResult) wxDragNone;

-
+    

     OSErr result;
     DragReference theDrag;
     RgnHandle dragRegion;
     OSErr result;
     DragReference theDrag;
     RgnHandle dragRegion;


@@ -300,45 +317,44 @@ wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))
         OSType type = formats[i].GetFormatId() ;
         if ( type == 'TEXT' )
         {
         OSType type = formats[i].GetFormatId() ;
         if ( type == 'TEXT' )
         {

-          dataSize-- ;
-          if ( wxApp::s_macDefaultEncodingIsPC )
-          {
-            wxMacConvertFromPC((char*)dataPtr,(char*)dataPtr,dataSize) ;
-          }
-          AddDragItemFlavor(theDrag, theItem, type , dataPtr, dataSize, 0);
+            dataSize-- ;
+            dataPtr[ dataSize ] = 0 ;
+            wxString st( (wxChar*) dataPtr ) ;
+            wxCharBuffer buf = st.mb_str( wxConvLocal) ;
+            AddDragItemFlavor(theDrag, theItem, type , buf.data(), strlen(buf), 0);

         }
         else if (type == kDragFlavorTypeHFS )
         {
         }
         else if (type == kDragFlavorTypeHFS )
         {

-          HFSFlavor  theFlavor ;
-               OSErr err = noErr;
-               CInfoPBRec cat;
- 
-          wxMacFilename2FSSpec( dataPtr , &theFlavor.fileSpec ) ;
-
-               cat.hFileInfo.ioNamePtr = theFlavor.fileSpec.name;
-               cat.hFileInfo.ioVRefNum = theFlavor.fileSpec.vRefNum;
-               cat.hFileInfo.ioDirID = theFlavor.fileSpec.parID;
-               cat.hFileInfo.ioFDirIndex = 0;
-               err = PBGetCatInfoSync(&cat);
-               if (err == noErr )
-               {
-               theFlavor.fdFlags = cat.hFileInfo.ioFlFndrInfo.fdFlags;
-               if (theFlavor.fileSpec.parID == fsRtParID) {
-                       theFlavor.fileCreator = 'MACS';
-                       theFlavor.fileType = 'disk';
-               } else if ((cat.hFileInfo.ioFlAttrib & ioDirMask) != 0) {
-                       theFlavor.fileCreator = 'MACS';
-                       theFlavor.fileType = 'fold';
-               } else {
-                       theFlavor.fileCreator = cat.hFileInfo.ioFlFndrInfo.fdCreator;
-                       theFlavor.fileType = cat.hFileInfo.ioFlFndrInfo.fdType;
-               }
-            AddDragItemFlavor(theDrag, theItem, type , &theFlavor, sizeof(theFlavor), 0);  
-          }    
+            HFSFlavor  theFlavor ;
+            OSErr err = noErr;
+            CInfoPBRec cat;
+            
+            wxMacFilename2FSSpec( wxString( dataPtr , *wxConvCurrent ) , &theFlavor.fileSpec ) ;
+            
+            cat.hFileInfo.ioNamePtr = theFlavor.fileSpec.name;
+            cat.hFileInfo.ioVRefNum = theFlavor.fileSpec.vRefNum;
+            cat.hFileInfo.ioDirID = theFlavor.fileSpec.parID;
+            cat.hFileInfo.ioFDirIndex = 0;
+            err = PBGetCatInfoSync(&cat);
+            if (err == noErr )
+            {
+                theFlavor.fdFlags = cat.hFileInfo.ioFlFndrInfo.fdFlags;
+                if (theFlavor.fileSpec.parID == fsRtParID) {
+                    theFlavor.fileCreator = 'MACS';
+                    theFlavor.fileType = 'disk';
+                } else if ((cat.hFileInfo.ioFlAttrib & ioDirMask) != 0) {
+                    theFlavor.fileCreator = 'MACS';
+                    theFlavor.fileType = 'fold';
+                } else {
+                    theFlavor.fileCreator = cat.hFileInfo.ioFlFndrInfo.fdCreator;
+                    theFlavor.fileType = cat.hFileInfo.ioFlFndrInfo.fdType;
+                }
+                AddDragItemFlavor(theDrag, theItem, type , &theFlavor, sizeof(theFlavor), 0);  
+            }    

         }
         else
         {
         }
         else
         {

-          AddDragItemFlavor(theDrag, theItem, type , dataPtr, dataSize, 0);      
+            AddDragItemFlavor(theDrag, theItem, type , dataPtr, dataSize, 0);      

         }
         delete[] dataPtr ;
     }
         }
         delete[] dataPtr ;
     }


@@ -349,38 +365,57 @@ wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))
     
     EventRecord* ev = NULL ;
 #if !TARGET_CARBON // TODO
     
     EventRecord* ev = NULL ;
 #if !TARGET_CARBON // TODO

-       ev = (EventRecord*) wxTheApp->MacGetCurrentEvent() ;
+    ev = (EventRecord*) wxTheApp->MacGetCurrentEvent() ;

 #else
 #else

-       EventRecord rec ;
-       ev = &rec ;
-       wxMacConvertEventToRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ;
+    EventRecord rec ;
+    ev = &rec ;
+    wxMacConvertEventToRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ;

 #endif
     const short dragRegionOuterBoundary = 10 ;
     const short dragRegionInnerBoundary = 9 ;
     
     SetRectRgn( dragRegion , ev->where.h - dragRegionOuterBoundary , 
 #endif
     const short dragRegionOuterBoundary = 10 ;
     const short dragRegionInnerBoundary = 9 ;
     
     SetRectRgn( dragRegion , ev->where.h - dragRegionOuterBoundary , 

-      ev->where.v  - dragRegionOuterBoundary ,
-      ev->where.h + dragRegionOuterBoundary , 
-      ev->where.v + dragRegionOuterBoundary ) ;
-
+        ev->where.v  - dragRegionOuterBoundary ,
+        ev->where.h + dragRegionOuterBoundary , 
+        ev->where.v + dragRegionOuterBoundary ) ;
+    

     SetRectRgn( tempRgn , ev->where.h - dragRegionInnerBoundary , 
     SetRectRgn( tempRgn , ev->where.h - dragRegionInnerBoundary , 

-      ev->where.v  - dragRegionInnerBoundary ,
-      ev->where.h + dragRegionInnerBoundary , 
-      ev->where.v + dragRegionInnerBoundary ) ;
-
+        ev->where.v  - dragRegionInnerBoundary ,
+        ev->where.h + dragRegionInnerBoundary , 
+        ev->where.v + dragRegionInnerBoundary ) ;
+    

     DiffRgn( dragRegion , tempRgn , dragRegion ) ;
     DisposeRgn( tempRgn ) ;    
     DiffRgn( dragRegion , tempRgn , dragRegion ) ;
     DisposeRgn( tempRgn ) ;    

-      
+    

     // TODO:work with promises in order to return data only when drag
     // was successfully completed
     // TODO:work with promises in order to return data only when drag
     // was successfully completed

-
+    

     gTrackingGlobals.m_currentSource = this ;
     result = TrackDrag(theDrag, ev , dragRegion);
     DisposeRgn(dragRegion);
     DisposeDrag(theDrag);
     gTrackingGlobals.m_currentSource = NULL ;
     gTrackingGlobals.m_currentSource = this ;
     result = TrackDrag(theDrag, ev , dragRegion);
     DisposeRgn(dragRegion);
     DisposeDrag(theDrag);
     gTrackingGlobals.m_currentSource = NULL ;

+    
+    KeyMap keymap;
+    GetKeys(keymap);
+    bool optionDown = keymap[1] & 4;
+    wxDragResult dndresult = optionDown ? wxDragCopy : wxDragMove;
+    return dndresult;
+}
+
+bool wxDropSource::MacInstallDefaultCursor(wxDragResult effect)
+{
+    const wxCursor& cursor = GetCursor(effect);
+    if ( cursor.Ok() )
+    {
+        cursor.MacInstall() ;

 
 

-    return wxDragCopy ;
+        return TRUE;
+    }
+    else
+    {
+        return FALSE;
+    }

 }
 
 bool gTrackingGlobalsInstalled = false ;
 }
 
 bool gTrackingGlobalsInstalled = false ;


@@ -416,6 +451,12 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
     DragAttributes attributes;
     GetDragAttributes(theDrag, &attributes);
     wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ; 
     DragAttributes attributes;
     GetDragAttributes(theDrag, &attributes);
     wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ; 

+
+    KeyMap keymap;
+    GetKeys(keymap);
+    bool optionDown = keymap[1] & 4;
+    wxDragResult result = optionDown ? wxDragCopy : wxDragMove;
+

     switch(theMessage) 
     {
         case kDragTrackingEnterHandler:
     switch(theMessage) 
     {
         case kDragTrackingEnterHandler:


@@ -423,7 +464,7 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
         case kDragTrackingLeaveHandler:
             break;
         case kDragTrackingEnterWindow:
         case kDragTrackingLeaveHandler:
             break;
         case kDragTrackingEnterWindow:

-           trackingGlobals->m_currentTargetWindow = NULL ;
+            trackingGlobals->m_currentTargetWindow = NULL ;

             trackingGlobals->m_currentTarget = NULL ;
             break;
         case kDragTrackingInWindow:
             trackingGlobals->m_currentTarget = NULL ;
             break;
         case kDragTrackingInWindow:


@@ -433,12 +474,19 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
             GetDragMouse(theDrag, &mouse, 0L);
             localMouse = mouse;
             GlobalToLocal(&localMouse);
             GetDragMouse(theDrag, &mouse, 0L);
             localMouse = mouse;
             GlobalToLocal(&localMouse);

+
+

             
 //            if (attributes & kDragHasLeftSenderWindow) 
             {
             
 //            if (attributes & kDragHasLeftSenderWindow) 
             {

-                wxPoint point(localMouse.h , localMouse.v) ;
+//                wxPoint point(localMouse.h , localMouse.v) ;

                 wxWindow *win = NULL ;
                 wxWindow *win = NULL ;

-                toplevel->MacGetWindowFromPointSub( point , &win ) ;
+                ControlPartCode controlPart ;
+                ControlRef control = wxMacFindControlUnderMouse( localMouse ,
+                    theWindow , &controlPart ) ;
+                if ( control )
+                    win = wxFindControlFromMacControl( control ) ;
+                // TODO toplevel->MacGetWindowFromPointSub( point , &win ) ;

                 int localx , localy ;
                 localx = localMouse.h ;
                 localy = localMouse.v ;
                 int localx , localy ;
                 localx = localMouse.h ;
                 localy = localMouse.v ;


@@ -464,19 +512,26 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
                         // this window is entered
                         trackingGlobals->m_currentTargetWindow = win ;
                         trackingGlobals->m_currentTarget = win->GetDropTarget() ;
                         // this window is entered
                         trackingGlobals->m_currentTargetWindow = win ;
                         trackingGlobals->m_currentTarget = win->GetDropTarget() ;

-                        if ( trackingGlobals->m_currentTarget )

                         {
                         {

-                          trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
-                           if ( trackingGlobals->m_currentTarget->OnEnter(
-                                localx , localy , wxDragCopy ) != wxDragNone )
+
+                               if ( trackingGlobals->m_currentTarget )
+                               {
+                               trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
+                               result = trackingGlobals->m_currentTarget->OnEnter(
+                                       localx , localy , result ) ;
+                            }
+                                
+                           
+                            if ( result != wxDragNone )

                             {
                             {

-                              int x , y ;
-                              x = y = 0 ;
-                              win->MacWindowToRootWindow( &x , &y ) ;
-                              RgnHandle hiliteRgn = NewRgn() ;
-                              SetRectRgn( hiliteRgn , x , y , x+win->GetSize().x ,y+win->GetSize().y) ;
-                              ShowDragHilite(theDrag, hiliteRgn, true);
-                              DisposeRgn( hiliteRgn ) ;
+                                int x , y ;
+                                x = y = 0 ;
+                                win->MacWindowToRootWindow( &x , &y ) ;
+                                RgnHandle hiliteRgn = NewRgn() ;
+                                Rect r = { y , x , y+win->GetSize().y , x+win->GetSize().x } ;
+                                RectRgn( hiliteRgn , &r ) ;
+                                ShowDragHilite(theDrag, hiliteRgn, true);
+                                DisposeRgn( hiliteRgn ) ;

                             }
                         }
                     }
                             }
                         }
                     }


@@ -487,9 +542,44 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
                     {
                         trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
                         trackingGlobals->m_currentTarget->OnDragOver(
                     {
                         trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
                         trackingGlobals->m_currentTarget->OnDragOver(

-                            localx , localy , wxDragCopy ) ;
+                            localx , localy , result ) ;

                     }
                 }
                     }
                 }

+
+                // set cursor for OnEnter and OnDragOver
+                if ( trackingGlobals->m_currentSource && trackingGlobals->m_currentSource->GiveFeedback( result ) == FALSE )
+                {
+                  if ( trackingGlobals->m_currentSource->MacInstallDefaultCursor( result ) == FALSE )
+                  {
+                      switch( result )
+                      {
+                          case wxDragCopy :
+                              {
+                                  wxCursor cursor(wxCURSOR_COPY_ARROW) ;
+                                  cursor.MacInstall() ;
+                              }
+                              break ;
+                          case wxDragMove :
+                              {
+                                  wxCursor cursor(wxCURSOR_ARROW) ;
+                                  cursor.MacInstall() ;
+                              }
+                              break ;
+                          case wxDragNone :
+                              {
+                                  wxCursor cursor(wxCURSOR_NO_ENTRY) ;
+                                  cursor.MacInstall() ;
+                              }
+                              break ;
+
+                          case wxDragError:
+                          case wxDragLink:
+                          case wxDragCancel:
+                              // put these here to make gcc happy
+                              ;
+                      }
+                  }
+                }

                 
           }
             // MyTrackItemUnderMouse(localMouse, theWindow);
                 
           }
             // MyTrackItemUnderMouse(localMouse, theWindow);


@@ -529,7 +619,11 @@ pascal OSErr wxMacWindowDragReceiveHandler(WindowPtr theWindow,
             trackingGlobals->m_currentTargetWindow->MacRootWindowToWindow( &localx , &localy ) ;
         if ( trackingGlobals->m_currentTarget->OnDrop( localx , localy ) )
         {
             trackingGlobals->m_currentTargetWindow->MacRootWindowToWindow( &localx , &localy ) ;
         if ( trackingGlobals->m_currentTarget->OnDrop( localx , localy ) )
         {

-            trackingGlobals->m_currentTarget->OnData( localx , localy , wxDragCopy ) ;
+            KeyMap keymap;
+            GetKeys(keymap);
+            bool optionDown = keymap[1] & 4;
+            wxDragResult result = optionDown ? wxDragCopy : wxDragMove;
+            trackingGlobals->m_currentTarget->OnData( localx , localy , result ) ;

         }
     }
     return(noErr);
         }
     }
     return(noErr);