X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/427ff66291af2d8dd34ff5ee68c81436997144a1..79a73b4f86090278c242a8cca5fd9147a31a4419:/src/mac/carbon/dnd.cpp?ds=inline

diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp
index d4eb35abba..22ced39ede 100644
--- a/src/mac/carbon/dnd.cpp
+++ b/src/mac/carbon/dnd.cpp
@@ -206,7 +206,7 @@ bool wxDropTarget::GetData()
                         if( theType == 'TEXT' )
                         {
                             theData[dataSize]=0 ; 
-                            wxString convert = wxMacMakeStringFromCString( theData ) ;    
+                            wxString convert( theData , wxConvLocal ) ;    
                             m_dataObject->SetData( format, convert.Length() * sizeof(wxChar), (const wxChar*) convert );
                         }
                         else if ( theType == kDragFlavorTypeHFS )
@@ -302,7 +302,7 @@ wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))
             dataSize-- ;
             dataPtr[ dataSize ] = 0 ;
             wxString st( (wxChar*) dataPtr ) ;
-            wxCharBuffer buf = wxMacStringToCString( st ) ;
+            wxCharBuffer buf = st.mb_str( wxConvLocal) ;
             AddDragItemFlavor(theDrag, theItem, type , buf.data(), strlen(buf), 0);
         }
         else if (type == kDragFlavorTypeHFS )
@@ -378,7 +378,11 @@ wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))
     DisposeDrag(theDrag);
     gTrackingGlobals.m_currentSource = NULL ;
     
-    return wxDragCopy ;
+    KeyMap keymap;
+    GetKeys(keymap);
+    bool optionDown = keymap[1] & 4;
+    wxDragResult dndresult = optionDown ? wxDragCopy : wxDragMove;
+    return dndresult;
 }
 
 bool wxDropSource::MacInstallDefaultCursor(wxDragResult effect)
@@ -429,6 +433,12 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
     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:
@@ -446,6 +456,8 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
             GetDragMouse(theDrag, &mouse, 0L);
             localMouse = mouse;
             GlobalToLocal(&localMouse);
+
+
             
 //            if (attributes & kDragHasLeftSenderWindow) 
             {
@@ -478,41 +490,14 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
                         trackingGlobals->m_currentTargetWindow = win ;
                         trackingGlobals->m_currentTarget = win->GetDropTarget() ;
                         {
-                        	wxDragResult result = wxDragNone ;
+
                         	if ( trackingGlobals->m_currentTarget )
                         	{
                             	trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
                             	result = trackingGlobals->m_currentTarget->OnEnter(
-                                	localx , localy , wxDragCopy ) ;
+                                	localx , localy , result ) ;
                             }
                                 
-                            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 ;
-                            		}
-                            	}
-                            }
                            
                             if ( result != wxDragNone )
                             {
@@ -533,9 +518,44 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
                     {
                         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);
@@ -575,7 +595,11 @@ pascal OSErr wxMacWindowDragReceiveHandler(WindowPtr theWindow,
             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);