Removed treelay sample

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

diff --git a/src/mac/dnd.cpp b/src/mac/dnd.cpp
index b9df2ac0049fdbb811a6fcb96d3642ab1b8b3076..d4eb35abba7cd2728476b3fe365bce1bba8e3390 100644 (file)
--- a/src/mac/dnd.cpp
+++ b/src/mac/dnd.cpp
@@ -205,12 +205,9 @@ bool wxDropTarget::GetData()
                         GetFlavorData((DragReference)m_currentDrag, theItem, theType, (void*) theData, &dataSize, 0L); 
                         if( theType == 'TEXT' )
                         {
                         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 );
+                            theData[dataSize]=0 ; 
+                            wxString convert = wxMacMakeStringFromCString( theData ) ;    
+                            m_dataObject->SetData( format, convert.Length() * sizeof(wxChar), (const wxChar*) convert );

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


@@ -246,9 +243,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 +254,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 );


@@ -301,11 +300,10 @@ wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))
         if ( type == 'TEXT' )
         {
             dataSize-- ;
         if ( type == 'TEXT' )
         {
             dataSize-- ;

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

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


@@ -383,6 +381,21 @@ wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))
     return wxDragCopy ;
 }
 
     return wxDragCopy ;
 }
 

+bool wxDropSource::MacInstallDefaultCursor(wxDragResult effect)
+{
+    const wxCursor& cursor = GetCursor(effect);
+    if ( cursor.Ok() )
+    {
+        cursor.MacInstall() ;
+
+        return TRUE;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+

 bool gTrackingGlobalsInstalled = false ;
 
 // passing the globals via refcon is not needed by the CFM and later architectures anymore
 bool gTrackingGlobalsInstalled = false ;
 
 // passing the globals via refcon is not needed by the CFM and later architectures anymore


@@ -464,19 +477,52 @@ 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 )
+                               wxDragResult result = wxDragNone ;
+                               if ( trackingGlobals->m_currentTarget )
+                               {
+                               trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
+                               result = trackingGlobals->m_currentTarget->OnEnter(
+                                       localx , localy , wxDragCopy ) ;
+                            }
+                                
+                            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 )

                             {
                             {

-                              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() ;
+                                SetRectRgn( hiliteRgn , x , y , x+win->GetSize().x ,y+win->GetSize().y) ;
+                                ShowDragHilite(theDrag, hiliteRgn, true);
+                                DisposeRgn( hiliteRgn ) ;

                             }
                         }
                     }
                             }
                         }
                     }