X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b2832ef0c9320b872d62cbf8f308ff4998af1ed..35d9ac0686a4af87a25fc342880d2af5ac33d17e:/src/mac/carbon/dnd.cpp

diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp
index 14da3edf45..dac1bb95ef 100644
--- a/src/mac/carbon/dnd.cpp
+++ b/src/mac/carbon/dnd.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        dnd.cpp
-// Purpose:     wxDropTarget, wxDropSource, wxDataObject implementation
+// Purpose:     wxDropTarget, wxDropSource implementations
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
@@ -9,11 +9,7 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "dnd.h"
-#endif
-
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_DRAG_AND_DROP
 
@@ -24,20 +20,26 @@
 #include "wx/gdicmn.h"
 #include "wx/mac/private.h"
 
+#ifndef __DARWIN__
+    #include <Scrap.h>
+#endif
+
+
 // ----------------------------------------------------------------------------
-// global
+// globals
 // ----------------------------------------------------------------------------
 
-void wxMacEnsureTrackingHandlersInstalled() ;
-
-typedef struct 
+typedef struct
 {
-    wxWindow* m_currentTargetWindow ;
-    wxDropTarget* m_currentTarget ;
-    wxDropSource* m_currentSource ;
-} MacTrackingGlobals ;
+    wxWindow* m_currentTargetWindow;
+    wxDropTarget* m_currentTarget;
+    wxDropSource* m_currentSource;
+}
+MacTrackingGlobals;
 
-MacTrackingGlobals gTrackingGlobals ; 
+MacTrackingGlobals gTrackingGlobals;
+
+void wxMacEnsureTrackingHandlersInstalled() ;
 
 //----------------------------------------------------------------------------
 // wxDropTarget
@@ -53,14 +55,13 @@ wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x),
                                        wxCoord WXUNUSED(y),
                                        wxDragResult def )
 {
-
     return CurrentDragHasSupportedFormat() ? def : wxDragNone;
 }
 
 bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
 {
-    if (!m_dataObject)
-        return FALSE;
+    if (m_dataObject == NULL)
+        return false;
 
     return CurrentDragHasSupportedFormat() ;
 }
@@ -68,7 +69,7 @@ bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
 wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
                                    wxDragResult def )
 {
-    if (!m_dataObject)
+    if (m_dataObject == NULL)
         return wxDragNone;
 
     if (!CurrentDragHasSupportedFormat())
@@ -77,45 +78,51 @@ wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
     return GetData() ? def : wxDragNone;
 }
 
-bool wxDropTarget::CurrentDragHasSupportedFormat() 
+bool wxDropTarget::CurrentDragHasSupportedFormat()
 {
     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  ];
+            wxDataFormat *array = new wxDataFormat[formatcount];
             data->GetAllFormats( array );
             for (size_t i = 0; !supported && i < formatcount ; i++)
             {
                 wxDataFormat format = array[i] ;
-                if ( m_dataObject->IsSupported( format ) ) 
+                if ( m_dataObject->IsSupported( format ) )
                 {
                     supported = true ;
                     break ;
                 }
             }
-            delete[] array ;
+
+            delete [] array ;
         }
     }
+
     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 ;
+
+        CountDragItems( (DragReference)m_currentDrag, &items );
+        for (UInt16 index = 1; index <= items && !supported; ++index)
         {
-            ItemReference theItem;
-            FlavorType theType ;
-            UInt16 flavors = 0 ;
-            GetDragItemReferenceNumber((DragReference)m_currentDrag, index, &theItem);
-            CountDragItemFlavors( (DragReference)m_currentDrag, theItem , &flavors ) ;
+            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);
+                result = GetFlavorType( (DragReference)m_currentDrag, theItem, flavor, &theType );
                 if ( m_dataObject->IsSupportedFormat( wxDataFormat( theType ) ) )
                 {
                     supported = true ;
@@ -124,102 +131,125 @@ bool wxDropTarget::CurrentDragHasSupportedFormat()
             }
         }
     }
-    return supported ;   
+
+    return supported ;
 }
 
 bool wxDropTarget::GetData()
 {
-    if (!m_dataObject)
-        return FALSE;
-    
+    if (m_dataObject == NULL)
+        return false;
+
     if ( !CurrentDragHasSupportedFormat() )
-        return FALSE ;
-    
-    bool transferred = false ;   
+        return false ;
+
+    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  ];
+            wxDataFormat *array = new wxDataFormat[formatcount];
             data->GetAllFormats( array );
             for (size_t i = 0; !transferred && i < formatcount ; i++)
             {
                 wxDataFormat format = array[i] ;
-                if ( m_dataObject->IsSupported( format ) ) 
+                if ( m_dataObject->IsSupported( format ) )
                 {
                     int size = data->GetDataSize( format );
                     transferred = true ;
-                    
-                    if (size == 0) 
+
+                    if (size == 0)
                     {
-                        m_dataObject->SetData(format , 0 , 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 [] d ;
                     }
                 }
             }
-            delete[] array ;
+
+            delete [] array ;
         }
     }
+
     if ( !transferred )
     {
         UInt16 items ;
         OSErr result;
+        ItemReference theItem;
+        FlavorType theType ;
+        FlavorFlags theFlags;
+        UInt16 flavors ;
         bool firstFileAdded = false ;
-        CountDragItems((DragReference)m_currentDrag, &items);
-        for (UInt16 index = 1; index <= items; ++index) 
+
+        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 ) ;
+            flavors = 0 ;
+            GetDragItemReferenceNumber( (DragReference)m_currentDrag, index, &theItem );
+            CountDragItemFlavors( (DragReference)m_currentDrag, theItem , &flavors );
+            wxDataFormat preferredFormat = m_dataObject->GetPreferredFormat( wxDataObject::Set );
+            bool hasPreferredFormat = false ;
+
+            for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor )
+            {
+                result = GetFlavorType( (DragReference)m_currentDrag, theItem, flavor, &theType );
+                wxDataFormat format( theType );
+                if ( preferredFormat == format )
+                {
+                    hasPreferredFormat = true ;
+                    break ;
+                }
+            }
+
             for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor )
             {
-                result = GetFlavorType((DragReference)m_currentDrag, theItem, flavor , &theType);
-                wxDataFormat format(theType) ;
-                if ( m_dataObject->IsSupportedFormat( format ) )
+                result = GetFlavorType( (DragReference)m_currentDrag, theItem, flavor, &theType );
+                wxDataFormat format( theType ) ;
+                if ( (hasPreferredFormat && format == preferredFormat)
+                    || (!hasPreferredFormat && m_dataObject->IsSupportedFormat( format )))
                 {
-                    FlavorFlags theFlags;
-                    result = GetFlavorFlags((DragReference)m_currentDrag, theItem, theType, &theFlags);
-                    if (result == noErr) 
+                    result = GetFlavorFlags( (DragReference)m_currentDrag, theItem, theType, &theFlags );
+                    if (result == noErr)
                     {
                         Size dataSize ;
                         Ptr theData ;
-                        GetFlavorDataSize((DragReference)m_currentDrag, theItem, theType, &dataSize);
+
+                        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
+                            // 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
+                            // 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 )
+
+                        GetFlavorData( (DragReference)m_currentDrag, theItem, theType, (void*) theData, &dataSize, 0L );
+                        if ( theType == kScrapFlavorTypeText )
                         {
-                            theData[dataSize]=0 ; 
+                            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 ; 
+                            theData[dataSize + 0] =
+                            theData[dataSize + 1] = 0 ;
                             m_dataObject->SetData( wxDataFormat(wxDF_UNICODETEXT), dataSize , theData );
                         }
  #endif
@@ -231,22 +261,25 @@ bool wxDropTarget::GetData()
                             {
                                 // reset file list
                                 ((wxFileDataObject*)m_dataObject)->SetData( 0 , "" ) ;
-                                firstFileAdded = true ;    
+                                firstFileAdded = true ;
                             }
+
                             ((wxFileDataObject*)m_dataObject)->AddFile( name ) ;
                         }
                         else
                         {
                             m_dataObject->SetData( format, dataSize, theData );
                         }
-                        delete[] theData;
+
+                        delete [] theData;
                     }
                     break ;
                 }
             }
         }
     }
-    return TRUE ;   
+
+    return true ;
 }
 
 //-------------------------------------------------------------------------
@@ -263,6 +296,7 @@ wxDropSource::wxDropSource(wxWindow *win,
             : wxDropSourceBase(cursorCopy, cursorMove, cursorStop)
 {
     wxMacEnsureTrackingHandlersInstalled() ;
+
     m_window = win;
 }
 
@@ -274,6 +308,7 @@ wxDropSource::wxDropSource(wxDataObject& data,
             : wxDropSourceBase(cursorCopy, cursorMove, cursorStop)
 {
     wxMacEnsureTrackingHandlersInstalled() ;
+
     SetData( data );
     m_window = win;
 }
@@ -282,136 +317,153 @@ wxDropSource::~wxDropSource()
 {
 }
 
-
-wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))
+wxDragResult wxDropSource::DoDragDrop(int flags)
 {
     wxASSERT_MSG( m_data, wxT("Drop source: no data") );
-    
+
     if (!m_data)
         return (wxDragResult) wxDragNone;
-    
     if (m_data->GetFormatCount() == 0)
         return (wxDragResult) wxDragNone;
-    
+
     OSErr result;
     DragReference theDrag;
     RgnHandle dragRegion;
-    if ((result = NewDrag(&theDrag)))
-    {
+    if ((result = NewDrag(&theDrag)) != noErr)
         return wxDragNone ;
-    }
+
     // add data to drag
     size_t formatCount = m_data->GetFormatCount() ;
     wxDataFormat *formats = new wxDataFormat[formatCount] ;
     m_data->GetAllFormats( formats ) ;
     ItemReference theItem = 1 ;
+
     for ( size_t i = 0 ; i < formatCount ; ++i )
     {
         size_t dataSize = m_data->GetDataSize( formats[i] ) ;
         Ptr dataPtr = new char[dataSize] ;
         m_data->GetDataHere( formats[i] , dataPtr ) ;
         OSType type = formats[i].GetFormatId() ;
-        if ( type == 'TEXT' )
+        if ( type == 'TEXT' || type == 'utxt' )
         {
-            dataSize-- ;
+            if ( 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);
+            if ( type == 'utxt' )
+            {
+                if ( dataSize > 0 )
+                    dataSize-- ;
+                dataPtr[ dataSize ] = 0 ;
+            }
+
+            AddDragItemFlavor( theDrag, theItem, type , dataPtr, dataSize, 0 );
         }
         else if (type == kDragFlavorTypeHFS )
         {
             HFSFlavor  theFlavor ;
             OSErr err = noErr;
             CInfoPBRec cat;
-            
-            wxMacFilename2FSSpec( dataPtr , &theFlavor.fileSpec ) ;
-            
+
+            wxMacFilename2FSSpec( wxString( dataPtr, *wxConvCurrent ), &theFlavor.fileSpec ) ;
+
+            memset( &cat, 0, sizeof(cat) );
             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 )
+            err = PBGetCatInfoSync( &cat );
+            if (err == noErr)
             {
                 theFlavor.fdFlags = cat.hFileInfo.ioFlFndrInfo.fdFlags;
-                if (theFlavor.fileSpec.parID == fsRtParID) {
+                if (theFlavor.fileSpec.parID == fsRtParID)
+                {
                     theFlavor.fileCreator = 'MACS';
                     theFlavor.fileType = 'disk';
-                } else if ((cat.hFileInfo.ioFlAttrib & ioDirMask) != 0) {
+                }
+                else if ((cat.hFileInfo.ioFlAttrib & ioDirMask) != 0)
+                {
                     theFlavor.fileCreator = 'MACS';
                     theFlavor.fileType = 'fold';
-                } else {
+                }
+                else
+                {
                     theFlavor.fileCreator = cat.hFileInfo.ioFlFndrInfo.fdCreator;
                     theFlavor.fileType = cat.hFileInfo.ioFlFndrInfo.fdType;
                 }
-                AddDragItemFlavor(theDrag, theItem, type , &theFlavor, sizeof(theFlavor), 0);  
-            }    
+
+                AddDragItemFlavor( theDrag, theItem, type , &theFlavor, sizeof(theFlavor), 0 );
+            }
         }
         else
         {
-            AddDragItemFlavor(theDrag, theItem, type , dataPtr, dataSize, 0);      
+            AddDragItemFlavor( theDrag, theItem, type , dataPtr, dataSize, 0 );
         }
-        delete[] dataPtr ;
+
+        delete [] dataPtr ;
     }
-    delete[] formats ;
-    
+
+    delete [] formats ;
+
     dragRegion = NewRgn();
     RgnHandle tempRgn = NewRgn() ;
-    
+
     EventRecord* ev = NULL ;
+
 #if !TARGET_CARBON // TODO
     ev = (EventRecord*) wxTheApp->MacGetCurrentEvent() ;
 #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 , 
+
+    SetRectRgn(
+        dragRegion , ev->where.h - dragRegionOuterBoundary ,
         ev->where.v  - dragRegionOuterBoundary ,
-        ev->where.h + 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.h + dragRegionInnerBoundary ,
         ev->where.v + dragRegionInnerBoundary ) ;
-    
+
     DiffRgn( dragRegion , tempRgn , dragRegion ) ;
-    DisposeRgn( tempRgn ) ;    
-    
-    // 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 ;
-    
-    KeyMap keymap;
-    GetKeys(keymap);
-    bool optionDown = keymap[1] & 4;
-    wxDragResult dndresult = optionDown ? wxDragCopy : wxDragMove;
+    DisposeRgn( tempRgn ) ;
+
+    // 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;
+
+    bool optionDown = GetCurrentKeyModifiers() & optionKey;
+    wxDragResult dndresult = wxDragCopy;
+    if ( flags != wxDrag_CopyOnly )
+        // on mac the option key is always the indication for copy
+        dndresult = optionDown ? wxDragCopy : wxDragMove;
+
     return dndresult;
 }
 
 bool wxDropSource::MacInstallDefaultCursor(wxDragResult effect)
 {
     const wxCursor& cursor = GetCursor(effect);
-    if ( cursor.Ok() )
-    {
-        cursor.MacInstall() ;
+    bool result = cursor.Ok();
 
-        return TRUE;
-    }
-    else
-    {
-        return FALSE;
-    }
+    if ( result )
+        cursor.MacInstall();
+
+    return result;
 }
 
 bool gTrackingGlobalsInstalled = false ;
@@ -419,74 +471,83 @@ bool gTrackingGlobalsInstalled = false ;
 // passing the globals via refcon is not needed by the CFM and later architectures anymore
 // but I'll leave it in there, just in case...
 
-pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, WindowPtr theWindow,
-  void *handlerRefCon, DragReference theDrag) ;
-pascal OSErr wxMacWindowDragReceiveHandler(WindowPtr theWindow, void *handlerRefCon,
-DragReference theDrag) ;
+pascal OSErr wxMacWindowDragTrackingHandler(
+    DragTrackingMessage theMessage, WindowPtr theWindow,
+    void *handlerRefCon, DragReference theDrag );
+pascal OSErr wxMacWindowDragReceiveHandler(
+    WindowPtr theWindow, void *handlerRefCon,
+    DragReference theDrag );
 
 void wxMacEnsureTrackingHandlersInstalled()
 {
-    if( !gTrackingGlobalsInstalled )
+    if ( !gTrackingGlobalsInstalled )
     {
         OSErr result;
 
-        result = InstallTrackingHandler(NewDragTrackingHandlerUPP(wxMacWindowDragTrackingHandler), 0L,&gTrackingGlobals);
-        wxASSERT( result == noErr ) ;
-        result = InstallReceiveHandler(NewDragReceiveHandlerUPP(wxMacWindowDragReceiveHandler), 0L, &gTrackingGlobals);
-        wxASSERT( result == noErr ) ;
+        result = InstallTrackingHandler( NewDragTrackingHandlerUPP(wxMacWindowDragTrackingHandler), 0L, &gTrackingGlobals );
+        wxASSERT( result == noErr );
+
+        result = InstallReceiveHandler( NewDragReceiveHandlerUPP(wxMacWindowDragReceiveHandler), 0L, &gTrackingGlobals );
+        wxASSERT( result == noErr );
 
-        gTrackingGlobalsInstalled = true ;
+        gTrackingGlobalsInstalled = true;
     }
 }
 
-pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, WindowPtr theWindow,
-  void *handlerRefCon, DragReference theDrag)
-{ 
+pascal OSErr wxMacWindowDragTrackingHandler(
+    DragTrackingMessage theMessage, WindowPtr theWindow,
+    void *handlerRefCon, DragReference theDrag )
+{
     MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*) handlerRefCon;
+
     Point mouse, localMouse;
     DragAttributes attributes;
-    GetDragAttributes(theDrag, &attributes);
-    wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ; 
 
-    KeyMap keymap;
-    GetKeys(keymap);
-    bool optionDown = keymap[1] & 4;
+    GetDragAttributes( theDrag, &attributes );
+
+    wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ;
+
+    bool optionDown = GetCurrentKeyModifiers() & optionKey ;
     wxDragResult result = optionDown ? wxDragCopy : wxDragMove;
 
-    switch(theMessage) 
+    switch (theMessage)
     {
         case kDragTrackingEnterHandler:
-            break;
         case kDragTrackingLeaveHandler:
             break;
+
         case kDragTrackingEnterWindow:
-            trackingGlobals->m_currentTargetWindow = NULL ;
-            trackingGlobals->m_currentTarget = NULL ;
+            if (trackingGlobals != NULL)
+            {
+                trackingGlobals->m_currentTargetWindow = NULL ;
+                trackingGlobals->m_currentTarget = NULL ;
+            }
             break;
+
         case kDragTrackingInWindow:
+            if (trackingGlobals == NULL)
+                break;
             if (toplevel == NULL)
                 break;
 
-            GetDragMouse(theDrag, &mouse, 0L);
+            GetDragMouse( theDrag, &mouse, 0L );
             localMouse = mouse;
-            GlobalToLocal(&localMouse);
+            GlobalToLocal( &localMouse );
 
-
-            
-//            if (attributes & kDragHasLeftSenderWindow) 
             {
-                wxPoint point(localMouse.h , localMouse.v) ;
                 wxWindow *win = NULL ;
                 ControlPartCode controlPart ;
-                ControlRef control = wxMacFindControlUnderMouse( localMouse ,
-                    theWindow , &controlPart ) ;
+                ControlRef control = wxMacFindControlUnderMouse(
+                    toplevel , localMouse , theWindow , &controlPart ) ;
                 if ( control )
                     win = wxFindControlFromMacControl( control ) ;
-                // TODO toplevel->MacGetWindowFromPointSub( point , &win ) ;
+                else
+                    win = toplevel ;
+
                 int localx , localy ;
                 localx = localMouse.h ;
                 localy = localMouse.v ;
-                //TODO : should we use client coordinates
+
                 if ( win )
                     win->MacRootWindowToWindow( &localx , &localy ) ;
                 if ( win != trackingGlobals->m_currentTargetWindow )
@@ -496,37 +557,36 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
                         // this window is left
                         if ( trackingGlobals->m_currentTarget )
                         {
-                            HideDragHilite(theDrag);
-                            trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
-                            trackingGlobals->m_currentTarget->OnLeave() ;
+                            HideDragHilite( theDrag );
+                            trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag );
+                            trackingGlobals->m_currentTarget->OnLeave();
                             trackingGlobals->m_currentTarget = NULL;
-                            trackingGlobals->m_currentTargetWindow = NULL ;
+                            trackingGlobals->m_currentTargetWindow = NULL;
                         }
                     }
+
                     if ( win )
                     {
                         // this window is entered
                         trackingGlobals->m_currentTargetWindow = win ;
                         trackingGlobals->m_currentTarget = win->GetDropTarget() ;
                         {
-
-                        	if ( trackingGlobals->m_currentTarget )
-                        	{
-                            	trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
-                            	result = trackingGlobals->m_currentTarget->OnEnter(
-                                	localx , localy , result ) ;
+                            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() ;
-                                Rect r = { y , x , y+win->GetSize().y , x+win->GetSize().x } ;
+                                Rect r = { y , x , y + win->GetSize().y , x + win->GetSize().x } ;
                                 RectRgn( hiliteRgn , &r ) ;
-                                ShowDragHilite(theDrag, hiliteRgn, true);
+                                ShowDragHilite( theDrag, hiliteRgn, true );
                                 DisposeRgn( hiliteRgn ) ;
                             }
                         }
@@ -534,20 +594,19 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
                 }
                 else
                 {
-                    if( trackingGlobals->m_currentTarget )
+                    if ( trackingGlobals->m_currentTarget )
                     {
                         trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
-                        trackingGlobals->m_currentTarget->OnDragOver(
-                            localx , localy , result ) ;
+                        trackingGlobals->m_currentTarget->OnDragOver( localx , localy , result ) ;
                     }
                 }
 
                 // set cursor for OnEnter and OnDragOver
-                if ( trackingGlobals->m_currentSource && trackingGlobals->m_currentSource->GiveFeedback( result ) == FALSE )
+                if ( trackingGlobals->m_currentSource && !trackingGlobals->m_currentSource->GiveFeedback( result ) )
                 {
-                  if ( trackingGlobals->m_currentSource->MacInstallDefaultCursor( result ) == FALSE )
+                  if ( !trackingGlobals->m_currentSource->MacInstallDefaultCursor( result ) )
                   {
-                      switch( result )
+                      switch ( result )
                       {
                           case wxDragCopy :
                               {
@@ -555,12 +614,14 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
                                   cursor.MacInstall() ;
                               }
                               break ;
+
                           case wxDragMove :
                               {
                                   wxCursor cursor(wxCURSOR_ARROW) ;
                                   cursor.MacInstall() ;
                               }
                               break ;
+
                           case wxDragNone :
                               {
                                   wxCursor cursor(wxCURSOR_NO_ENTRY) ;
@@ -571,57 +632,66 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
                           case wxDragError:
                           case wxDragLink:
                           case wxDragCancel:
+                          default:
                               // put these here to make gcc happy
                               ;
                       }
-                  }
+                   }
                 }
-                
-          }
-            // MyTrackItemUnderMouse(localMouse, theWindow);
+            }
             break;
+
         case kDragTrackingLeaveWindow:
-            if (trackingGlobals->m_currentTarget) 
+            if (trackingGlobals == NULL)
+                break;
+
+            if (trackingGlobals->m_currentTarget)
             {
-                trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
-                trackingGlobals->m_currentTarget->OnLeave() ;
-                HideDragHilite(theDrag);
-                trackingGlobals->m_currentTarget = NULL ;
+                trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag );
+                trackingGlobals->m_currentTarget->OnLeave();
+                HideDragHilite( theDrag );
+                trackingGlobals->m_currentTarget = NULL;
             }
-            trackingGlobals->m_currentTargetWindow = NULL ;
+            trackingGlobals->m_currentTargetWindow = NULL;
+            break;
+
+        default:
             break;
     }
-    return(noErr);
+
+    return noErr;
 }
 
-pascal OSErr wxMacWindowDragReceiveHandler(WindowPtr theWindow,
-                                           void *handlerRefCon,
-                                           DragReference theDrag)
-{ 
-    MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*) handlerRefCon;
+pascal OSErr wxMacWindowDragReceiveHandler(
+    WindowPtr theWindow,
+    void *handlerRefCon,
+    DragReference theDrag)
+{
+    MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*)handlerRefCon;
     if ( trackingGlobals->m_currentTarget )
     {
-        Point mouse,localMouse ;
-        int localx,localy ;
-        
+        Point mouse, localMouse ;
+        int localx, localy ;
+
         trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
         GetDragMouse(theDrag, &mouse, 0L);
         localMouse = mouse;
         GlobalToLocal(&localMouse);
         localx = localMouse.h ;
         localy = localMouse.v ;
-        //TODO : should we use client coordinates
+
+        // TODO : should we use client coordinates?
         if ( trackingGlobals->m_currentTargetWindow )
             trackingGlobals->m_currentTargetWindow->MacRootWindowToWindow( &localx , &localy ) ;
         if ( trackingGlobals->m_currentTarget->OnDrop( localx , localy ) )
         {
-            KeyMap keymap;
-            GetKeys(keymap);
-            bool optionDown = keymap[1] & 4;
+            bool optionDown = GetCurrentKeyModifiers() & optionKey ;
             wxDragResult result = optionDown ? wxDragCopy : wxDragMove;
             trackingGlobals->m_currentTarget->OnData( localx , localy , result ) ;
         }
     }
-    return(noErr);
+
+    return noErr;
 }
+
 #endif