cursors from xpm and d&d cursor support

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mac/carbon/cursor.cpp

@@ -18,44 +18,59 @@
 #include "wx/app.h"
 #include "wx/cursor.h"
 #include "wx/icon.h"
+#include "wx/image.h"
+#include "wx/xpmdecod.h"
+
 #include "wx/mac/private.h"
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)
 #endif
 
-const short kwxCursorHandId = 9 ;
+const short kwxCursorBullseye = 10 ;
-const short kwxCursorSizeWEId = 10 ;
+const short kwxCursorBlank = 11 ;
-const short kwxCursorSizeNSId = 11 ;
+const short kwxCursorPencil = 12 ;
-#if !TARGET_CARBON
+const short kwxCursorMagnifier = 13 ;
-Cursor*		MacArrowCursorPtr = &qd.arrow ;
+const short kwxCursorNoEntry = 14 ;
-CursHandle	MacArrowCursor = &MacArrowCursorPtr ;
+const short kwxCursorPaintBrush = 15 ;
-#else
+const short kwxCursorPointRight = 16 ;
-bool		MacArrowInstalled = false ;
+const short kwxCursorPointLeft = 17 ;
-Cursor 		MacArrow ;
+const short kwxCursorQuestionArrow = 18 ;
-Cursor*		MacArrowCursorPtr = &MacArrow ;
+const short kwxCursorRightArrow = 19 ;
-CursHandle	MacArrowCursor = &MacArrowCursorPtr ;
+const short kwxCursorSizeNS = 20 ;
-#endif
+const short kwxCursorSize = 21 ;
-CursHandle	gMacCurrentCursor = NULL ;
+const short kwxCursorSizeNESW = 22 ;
+const short kwxCursorSizeNWSE = 23 ;
+const short kwxCursorRoller = 24 ;
+
+wxCursor    gMacCurrentCursor ;
 
 wxCursorRefData::wxCursorRefData()
 {
-#if TARGET_CARBON
+    m_width = 16; 
-	if ( !MacArrowInstalled )
+    m_height = 16;
-	{
-		MacArrowCursorPtr = GetQDGlobalsArrow( &MacArrow ) ;
-		MacArrowInstalled = true ;
-	}
-#endif
-    m_width = 32; 
-    m_height = 32;
     m_hCursor = NULL ;
+    m_disposeHandle = false ;
+    m_releaseHandle = false ;
+    m_isColorCursor = false ;
+    m_themeCursor = -1 ;
 }
 
 wxCursorRefData::~wxCursorRefData()
 {
-//	if ( m_hCursor && ( m_hCursor != MacArrowCursor ) )
+    if ( m_isColorCursor )
-//		::ReleaseResource( (Handle) m_hCursor ) ;
+    {
+        ::DisposeCCursor( (CCrsrHandle) m_hCursor ) ;
+    }
+    else if ( m_disposeHandle )
+    {
+        ::DisposeHandle( (Handle ) m_hCursor ) ;
+    } 
+    else if ( m_releaseHandle )
+    {
+        // we don't release the resource since it may already
+        // be in use again
+    }
 }
 
 // Cursors
@@ -68,11 +83,262 @@ wxCursor::wxCursor(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSE
 {
 }
 
-wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int hotSpotY)
+wxCursor::wxCursor( const wxImage &image )
+{
+    CreateFromImage( image ) ;
+}
+
+wxCursor::wxCursor(const char **bits) 
+{
+    (void) CreateFromXpm(bits);
+}
+
+wxCursor::wxCursor(char **bits) 
+{
+    (void) CreateFromXpm((const char **)bits);
+}
+
+bool wxCursor::CreateFromXpm(const char **bits)
+{
+    wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid cursor data") )
+    wxXPMDecoder decoder;
+    wxImage img = decoder.ReadData(bits);
+    wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid cursor data") )    
+	CreateFromImage( img ) ;
+    return TRUE;
+}
+
+short GetCTabIndex( CTabHandle colors , RGBColor *col )
+{
+    short retval = 0 ;
+    unsigned long bestdiff = 0xFFFF ;
+    for ( int i = 0 ; i < (**colors).ctSize ; ++i )
+    {
+        unsigned long diff = abs(col->red -  (**colors).ctTable[i].rgb.red ) +
+            abs(col->green -  (**colors).ctTable[i].rgb.green ) +
+            abs(col->blue -  (**colors).ctTable[i].rgb.blue ) ;
+        if ( diff < bestdiff )
+        {
+            bestdiff = diff ;
+            retval = (**colors).ctTable[i].value ;
+        }
+    }
+    return retval ;
+}
+
+void wxCursor::CreateFromImage(const wxImage & image) 
 {
     m_refData = new wxCursorRefData;
 
-    // TODO: create cursor from a file
+    wxImage image16 = image.Scale(16,16) ;
+       unsigned char * rgbBits = image16.GetData();
+ 
+    
+    int w = image16.GetWidth()  ;
+    int h = image16.GetHeight() ;
+    bool bHasMask = image16.HasMask() ;
+
+       int hotSpotX = image16.GetOptionInt(wxCUR_HOTSPOT_X);
+    int hotSpotY = image16.GetOptionInt(wxCUR_HOTSPOT_Y);
+    if (hotSpotX < 0 || hotSpotX >= w)
+            hotSpotX = 0;
+    if (hotSpotY < 0 || hotSpotY >= h)
+            hotSpotY = 0;
+            
+#if 0
+    // monochrome implementation
+    M_CURSORDATA->m_hCursor = NewHandle( sizeof( Cursor ) ) ;
+    M_CURSORDATA->m_disposeHandle = true ;
+    HLock( (Handle) M_CURSORDATA->m_hCursor ) ;
+    CursPtr cp = *(CursHandle)M_CURSORDATA->m_hCursor ;
+    memset( cp->data , 0 , sizeof( Bits16 ) ) ;
+    memset( cp->mask , 0 , sizeof( Bits16 ) ) ;
+    
+    unsigned char mr = image16.GetMaskRed() ;
+    unsigned char mg = image16.GetMaskGreen() ;
+    unsigned char mb = image16.GetMaskBlue() ;
+    for ( int y = 0 ; y < h ; ++y )
+    {
+        short rowbits = 0 ;
+        short maskbits = 0 ;
+        
+        for ( int x = 0 ; x < w ; ++x )
+        {
+            long pos = (y * w + x) * 3;
+
+            unsigned char r = rgbBits[pos] ;
+            unsigned char g = rgbBits[pos+1] ;
+            unsigned char b = rgbBits[pos+2] ;
+            if ( bHasMask && r==mr && g==mg && b==mb )
+            {
+                // masked area, does not appear anywhere
+            }
+            else
+            {
+                if ( (int)r + (int)g + (int)b < 0x0200 )
+                {
+                    rowbits |= ( 1 << (15-x) ) ;
+                }
+                maskbits |= ( 1 << (15-x) ) ;
+            }
+        }
+        cp->data[y] = rowbits ;
+        cp->mask[y] = maskbits ;
+    }
+    if ( !bHasMask )
+    {
+        memcpy( cp->mask , cp->data , sizeof( Bits16) ) ;
+    }
+    cp->hotSpot.h = hotSpotX ;
+    cp->hotSpot.v = hotSpotY ;
+    HUnlock( (Handle) M_CURSORDATA->m_hCursor ) ;
+#else
+    PixMapHandle pm = (PixMapHandle) NewHandleClear( sizeof (PixMap))  ;
+    short extent = 16 ;
+    short bytesPerPixel = 1 ;
+    short depth = 8 ;
+    Rect bounds = { 0 , 0 , extent , extent } ;
+    CCrsrHandle ch = (CCrsrHandle) NewHandleClear ( sizeof( CCrsr ) ) ;
+    CTabHandle newColors = GetCTable( 8 ) ;
+    HandToHand((Handle *) &newColors);
+    // set the values to the indices
+    for ( int i = 0 ; i < (**newColors).ctSize ; ++i )
+    {
+        (**newColors).ctTable[i].value = i ;
+    }
+    HLock( (Handle) ch) ;
+    (**ch).crsrType = 0x8001 ; // color cursors
+    (**ch).crsrMap = pm ; 
+    short bytesPerRow = bytesPerPixel * extent ;
+
+    (**pm).baseAddr = 0; 
+    (**pm).rowBytes = bytesPerRow | 0x8000;
+    (**pm).bounds = bounds;        
+    (**pm).pmVersion = 0;           
+    (**pm).packType = 0;            
+    (**pm).packSize = 0;            
+    (**pm).hRes = 0x00480000; /* 72 DPI default res */
+    (**pm).vRes = 0x00480000; /* 72 DPI default res */
+    (**pm).pixelSize = depth;
+    (**pm).pixelType = 0;
+    (**pm).cmpCount = 1; 
+    (**pm).cmpSize = depth;
+    (**pm).pmTable = newColors;
+
+    (**ch).crsrData = NewHandleClear( extent * bytesPerRow ) ;  
+    (**ch).crsrXData = NULL ;
+    (**ch).crsrXValid = 0;
+    (**ch).crsrXHandle = NULL;
+
+    (**ch).crsrHotSpot.h = hotSpotX ;
+    (**ch).crsrHotSpot.v = hotSpotY ;
+    (**ch).crsrXTable = NULL ; 
+    (**ch).crsrID = GetCTSeed() ;
+    
+    memset( (**ch).crsr1Data  , 0 , sizeof( Bits16 ) ) ;
+    memset( (**ch).crsrMask , 0 , sizeof( Bits16 ) ) ;
+    
+    unsigned char mr = image16.GetMaskRed() ;
+    unsigned char mg = image16.GetMaskGreen() ;
+    unsigned char mb = image16.GetMaskBlue() ;
+    for ( int y = 0 ; y < h ; ++y )
+    {
+        short rowbits = 0 ;
+        short maskbits = 0 ;
+        
+        for ( int x = 0 ; x < w ; ++x )
+        {
+            long pos = (y * w + x) * 3;
+
+            unsigned char r = rgbBits[pos] ;
+            unsigned char g = rgbBits[pos+1] ;
+            unsigned char b = rgbBits[pos+2] ;
+            RGBColor col = { 0xFFFF ,0xFFFF, 0xFFFF } ;
+            
+            if ( bHasMask && r==mr && g==mg && b==mb )
+            {
+                // masked area, does not appear anywhere
+            }
+            else
+            {
+                if ( (int)r + (int)g + (int)b < 0x0200 )
+                {
+                    rowbits |= ( 1 << (15-x) ) ;
+                }
+                maskbits |= ( 1 << (15-x) ) ;
+                
+                col = *((RGBColor*) wxColor( r , g , b ).GetPixel()) ;
+            }
+            *((*(**ch).crsrData) + y * bytesPerRow + x) = 
+                GetCTabIndex( newColors , &col) ;
+        }
+        (**ch).crsr1Data[y] = rowbits ;
+        (**ch).crsrMask[y] = maskbits ;
+    }
+    if ( !bHasMask )
+    {
+        memcpy( (**ch).crsrMask , (**ch).crsr1Data , sizeof( Bits16) ) ;
+    }
+    
+    HUnlock((Handle) ch) ;
+    M_CURSORDATA->m_hCursor = ch ;
+    M_CURSORDATA->m_isColorCursor = true ;
+#endif
+}
+
+wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int hotSpotY)
+{
+    m_refData = new wxCursorRefData;
+    if ( flags == wxBITMAP_TYPE_MACCURSOR_RESOURCE )
+    {
+        Str255 theName ;
+
+    #if TARGET_CARBON
+        c2pstrcpy( (StringPtr) theName , cursor_file ) ;
+    #else
+        strcpy( (char *) theName , cursor_file ) ;
+        c2pstr( (char *) theName ) ;
+    #endif
+        
+        wxStAppResource resload ;
+        Handle resHandle = ::GetNamedResource( 'crsr' , theName ) ;
+        if ( resHandle )
+        {
+            short theId = -1 ;
+            OSType theType ;
+            GetResInfo( resHandle , &theId , &theType , theName ) ;
+            ReleaseResource( resHandle ) ;
+            M_CURSORDATA->m_hCursor = GetCCursor( theId ) ;
+            if ( M_CURSORDATA->m_hCursor )
+                M_CURSORDATA->m_isColorCursor = true ;
+        }
+        else
+        {       
+            Handle resHandle = ::GetNamedResource( 'CURS' , theName ) ;
+            if ( resHandle )
+            {
+                short theId = -1 ;
+                OSType theType ;
+                GetResInfo( resHandle , &theId , &theType , theName ) ;
+                ReleaseResource( resHandle ) ;
+                 M_CURSORDATA->m_hCursor = GetCursor( theId ) ;
+                if ( M_CURSORDATA->m_hCursor )
+                    M_CURSORDATA->m_releaseHandle = true ;
+            }
+        }
+    }
+    else
+    {
+        wxImage image ;
+        image.LoadFile( cursor_file , flags ) ;
+        if( image.Ok() )
+        {
+            image.SetOption(wxCUR_HOTSPOT_X,hotSpotX ) ;
+            image.SetOption(wxCUR_HOTSPOT_Y,hotSpotY ) ;
+            delete m_refData ;
+            CreateFromImage(image) ;
+        }
+    }
 }
 
 // Cursors by stock number
@@ -80,151 +346,155 @@ wxCursor::wxCursor(int cursor_type)
 {
   m_refData = new wxCursorRefData;
   
-  
   switch (cursor_type)
-  {
+    {
+    case wxCURSOR_COPY_ARROW:
+        M_CURSORDATA->m_themeCursor = kThemeCopyArrowCursor ;
+        break;
     case wxCURSOR_WAIT:
-      M_CURSORDATA->m_hCursor = ::GetCursor(watchCursor);
+        M_CURSORDATA->m_themeCursor = kThemeWatchCursor ;
       break;
     case wxCURSOR_IBEAM:
-      M_CURSORDATA->m_hCursor = ::GetCursor(iBeamCursor);
+        M_CURSORDATA->m_themeCursor = kThemeIBeamCursor ;
       break;
     case wxCURSOR_CROSS:
-      M_CURSORDATA->m_hCursor = ::GetCursor(crossCursor);
+        M_CURSORDATA->m_themeCursor = kThemeCrossCursor;
       break;
     case wxCURSOR_SIZENWSE:
       {
         wxStAppResource resload ;
-        M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId);
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNWSE);
       }
       break;
     case wxCURSOR_SIZENESW:
       {
         wxStAppResource resload ;
-        M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId);
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNESW);
       }
       break;
     case wxCURSOR_SIZEWE:
       {
-        wxStAppResource resload ;
+            M_CURSORDATA->m_themeCursor = kThemeResizeLeftRightCursor;
-        M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId);
       }
       break;
     case wxCURSOR_SIZENS:
       {
         wxStAppResource resload ;
-        M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNSId);
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNS);
-      }
-      break;
-    case wxCURSOR_CHAR:
-        {
-          M_CURSORDATA->m_hCursor = MacArrowCursor;
-          break;
         }
+        break;
+    case wxCURSOR_SIZING:
+        {
+            wxStAppResource resload ;
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSize);
+        }
+        break;
     case wxCURSOR_HAND:
         {
-          wxStAppResource resload ;
+            M_CURSORDATA->m_themeCursor = kThemePointingHandCursor;
-          M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
         }
         break;
     case wxCURSOR_BULLSEYE:
         {
           wxStAppResource resload ;
-          M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorBullseye);
         }
         break;
     case wxCURSOR_PENCIL:
         {
           wxStAppResource resload ;
-          M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorPencil);
         }
         break;
     case wxCURSOR_MAGNIFIER:
         {
           wxStAppResource resload ;
-          M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorMagnifier);
         }
         break;
     case wxCURSOR_NO_ENTRY:
         {
           wxStAppResource resload ;
-          M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorNoEntry);
         }
         break;
-    case wxCURSOR_LEFT_BUTTON:
-    {
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
-      break;
-    }
-    case wxCURSOR_RIGHT_BUTTON:
-    {
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
-      break;
-    }
-    case wxCURSOR_MIDDLE_BUTTON:
-    {
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
-      break;
-    }
-    case wxCURSOR_SIZING:
-    {
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
-      break;
-    }
     case wxCURSOR_WATCH:
     {
-      M_CURSORDATA->m_hCursor = ::GetCursor(watchCursor);
+            M_CURSORDATA->m_themeCursor = kThemeWatchCursor;
+            break;
+        }
+    case wxCURSOR_PAINT_BRUSH:
+        {
+            wxStAppResource resload ;
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorPaintBrush);
+            break;
+        }
+    case wxCURSOR_POINT_LEFT:
+        {
+            wxStAppResource resload ;
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorPointLeft);
+            break;
+        }
+    case wxCURSOR_POINT_RIGHT:
+        {
+            wxStAppResource resload ;
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorPointRight);
+            break;
+        }
+    case wxCURSOR_QUESTION_ARROW:
+        {
+            wxStAppResource resload ;
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorQuestionArrow);
+            break;
+        }
+    case wxCURSOR_BLANK:
+        {
+            wxStAppResource resload ;
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorBlank);
+            break;
+        }
+    case wxCURSOR_RIGHT_ARROW:
+        {
+            wxStAppResource resload ;
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorRightArrow);
       break;
     }
     case wxCURSOR_SPRAYCAN:
     {
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
+            wxStAppResource resload ;
-      break;
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorRoller);
-    }
+            break;
-    case wxCURSOR_PAINT_BRUSH:
+        }
-    {
+    case wxCURSOR_CHAR:
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
-      break;
-    }
-    case wxCURSOR_POINT_LEFT:
-    {
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
-      break;
-    }
-    case wxCURSOR_POINT_RIGHT:
-    {
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
-      break;
-    }
-    case wxCURSOR_QUESTION_ARROW:
-    {
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
-      break;
-    }
-    case wxCURSOR_BLANK:
-    {
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
-      break;
-    }
-    default:
     case wxCURSOR_ARROW:
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
+    case wxCURSOR_LEFT_BUTTON:
-      break;
+    case wxCURSOR_RIGHT_BUTTON:
-	}
+    case wxCURSOR_MIDDLE_BUTTON:
+    default:
+        M_CURSORDATA->m_themeCursor = kThemeArrowCursor ;
+        break;
+    }
+    if ( M_CURSORDATA->m_themeCursor == -1 )
+        M_CURSORDATA->m_releaseHandle = true ;
 }
 
 void wxCursor::MacInstall() const 
 {
-	if ( m_refData && M_CURSORDATA->m_hCursor )
+    gMacCurrentCursor = *this ;
-	{
+    if ( m_refData && M_CURSORDATA->m_themeCursor != -1 )
-		CursHandle ch = ((CursHandle)M_CURSORDATA->m_hCursor) ;
+    {
-		::SetCursor(  *ch ) ;
+        SetThemeCursor( M_CURSORDATA->m_themeCursor ) ;
-		gMacCurrentCursor = ch ;
+    }
-	}
+    else if ( m_refData && M_CURSORDATA->m_hCursor )
-	else
+    {
-	{
+        if ( M_CURSORDATA->m_isColorCursor )
-		::SetCursor( *MacArrowCursor ) ;
+            ::SetCCursor( (CCrsrHandle) M_CURSORDATA->m_hCursor ) ;
-		gMacCurrentCursor = NULL ;
+        else
+            ::SetCursor( * (CursHandle) M_CURSORDATA->m_hCursor ) ;
+    }
+    else
+    {
+        SetThemeCursor( kThemeArrowCursor ) ;
 	}
 }
 

src/mac/carbon/dnd.cpp

@@ -245,6 +245,28 @@ bool wxDropTarget::GetData()
 //-----------------------------------------------------------------------------
 // drag request
 
+wxDropSource::wxDropSource(wxWindow *win,
+                           const wxCursor &cursorCopy,
+                           const wxCursor &cursorMove,
+                           const wxCursor &cursorStop)
+            : wxDropSourceBase(cursorCopy, cursorMove, cursorStop)
+{
+    wxMacEnsureTrackingHandlersInstalled() ;
+    m_window = win;
+}
+
+wxDropSource::wxDropSource(wxDataObject& data,
+                           wxWindow *win,
+                           const wxCursor &cursorCopy,
+                           const wxCursor &cursorMove,
+                           const wxCursor &cursorStop)
+            : wxDropSourceBase(cursorCopy, cursorMove, cursorStop)
+{
+    wxMacEnsureTrackingHandlersInstalled() ;
+    SetData( data );
+    m_window = win;
+}
+
 wxDropSource::wxDropSource(wxWindow *win,
                            const wxIcon &iconCopy,
                            const wxIcon &iconMove,
@@ -376,6 +398,21 @@ wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))
     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
@@ -457,11 +494,44 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
                         // this window is entered
                         trackingGlobals->m_currentTargetWindow = win ;
                         trackingGlobals->m_currentTarget = win->GetDropTarget() ;
-                        if ( trackingGlobals->m_currentTarget )
                         {
-                          trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
+                        	wxDragResult result = wxDragNone ;
-                           if ( trackingGlobals->m_currentTarget->OnEnter(
+                        	if ( trackingGlobals->m_currentTarget )
-                                localx , localy , wxDragCopy ) != wxDragNone )
+                        	{
+                            	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 ;

src/mac/cursor.cpp

@@ -18,44 +18,59 @@
 #include "wx/app.h"
 #include "wx/cursor.h"
 #include "wx/icon.h"
+#include "wx/image.h"
+#include "wx/xpmdecod.h"
+
 #include "wx/mac/private.h"
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)
 #endif
 
-const short kwxCursorHandId = 9 ;
+const short kwxCursorBullseye = 10 ;
-const short kwxCursorSizeWEId = 10 ;
+const short kwxCursorBlank = 11 ;
-const short kwxCursorSizeNSId = 11 ;
+const short kwxCursorPencil = 12 ;
-#if !TARGET_CARBON
+const short kwxCursorMagnifier = 13 ;
-Cursor*		MacArrowCursorPtr = &qd.arrow ;
+const short kwxCursorNoEntry = 14 ;
-CursHandle	MacArrowCursor = &MacArrowCursorPtr ;
+const short kwxCursorPaintBrush = 15 ;
-#else
+const short kwxCursorPointRight = 16 ;
-bool		MacArrowInstalled = false ;
+const short kwxCursorPointLeft = 17 ;
-Cursor 		MacArrow ;
+const short kwxCursorQuestionArrow = 18 ;
-Cursor*		MacArrowCursorPtr = &MacArrow ;
+const short kwxCursorRightArrow = 19 ;
-CursHandle	MacArrowCursor = &MacArrowCursorPtr ;
+const short kwxCursorSizeNS = 20 ;
-#endif
+const short kwxCursorSize = 21 ;
-CursHandle	gMacCurrentCursor = NULL ;
+const short kwxCursorSizeNESW = 22 ;
+const short kwxCursorSizeNWSE = 23 ;
+const short kwxCursorRoller = 24 ;
+
+wxCursor    gMacCurrentCursor ;
 
 wxCursorRefData::wxCursorRefData()
 {
-#if TARGET_CARBON
+    m_width = 16; 
-	if ( !MacArrowInstalled )
+    m_height = 16;
-	{
-		MacArrowCursorPtr = GetQDGlobalsArrow( &MacArrow ) ;
-		MacArrowInstalled = true ;
-	}
-#endif
-    m_width = 32; 
-    m_height = 32;
     m_hCursor = NULL ;
+    m_disposeHandle = false ;
+    m_releaseHandle = false ;
+    m_isColorCursor = false ;
+    m_themeCursor = -1 ;
 }
 
 wxCursorRefData::~wxCursorRefData()
 {
-//	if ( m_hCursor && ( m_hCursor != MacArrowCursor ) )
+    if ( m_isColorCursor )
-//		::ReleaseResource( (Handle) m_hCursor ) ;
+    {
+        ::DisposeCCursor( (CCrsrHandle) m_hCursor ) ;
+    }
+    else if ( m_disposeHandle )
+    {
+        ::DisposeHandle( (Handle ) m_hCursor ) ;
+    } 
+    else if ( m_releaseHandle )
+    {
+        // we don't release the resource since it may already
+        // be in use again
+    }
 }
 
 // Cursors
@@ -68,11 +83,262 @@ wxCursor::wxCursor(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSE
 {
 }
 
-wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int hotSpotY)
+wxCursor::wxCursor( const wxImage &image )
+{
+    CreateFromImage( image ) ;
+}
+
+wxCursor::wxCursor(const char **bits) 
+{
+    (void) CreateFromXpm(bits);
+}
+
+wxCursor::wxCursor(char **bits) 
+{
+    (void) CreateFromXpm((const char **)bits);
+}
+
+bool wxCursor::CreateFromXpm(const char **bits)
+{
+    wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid cursor data") )
+    wxXPMDecoder decoder;
+    wxImage img = decoder.ReadData(bits);
+    wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid cursor data") )    
+	CreateFromImage( img ) ;
+    return TRUE;
+}
+
+short GetCTabIndex( CTabHandle colors , RGBColor *col )
+{
+    short retval = 0 ;
+    unsigned long bestdiff = 0xFFFF ;
+    for ( int i = 0 ; i < (**colors).ctSize ; ++i )
+    {
+        unsigned long diff = abs(col->red -  (**colors).ctTable[i].rgb.red ) +
+            abs(col->green -  (**colors).ctTable[i].rgb.green ) +
+            abs(col->blue -  (**colors).ctTable[i].rgb.blue ) ;
+        if ( diff < bestdiff )
+        {
+            bestdiff = diff ;
+            retval = (**colors).ctTable[i].value ;
+        }
+    }
+    return retval ;
+}
+
+void wxCursor::CreateFromImage(const wxImage & image) 
 {
     m_refData = new wxCursorRefData;
 
-    // TODO: create cursor from a file
+    wxImage image16 = image.Scale(16,16) ;
+       unsigned char * rgbBits = image16.GetData();
+ 
+    
+    int w = image16.GetWidth()  ;
+    int h = image16.GetHeight() ;
+    bool bHasMask = image16.HasMask() ;
+
+       int hotSpotX = image16.GetOptionInt(wxCUR_HOTSPOT_X);
+    int hotSpotY = image16.GetOptionInt(wxCUR_HOTSPOT_Y);
+    if (hotSpotX < 0 || hotSpotX >= w)
+            hotSpotX = 0;
+    if (hotSpotY < 0 || hotSpotY >= h)
+            hotSpotY = 0;
+            
+#if 0
+    // monochrome implementation
+    M_CURSORDATA->m_hCursor = NewHandle( sizeof( Cursor ) ) ;
+    M_CURSORDATA->m_disposeHandle = true ;
+    HLock( (Handle) M_CURSORDATA->m_hCursor ) ;
+    CursPtr cp = *(CursHandle)M_CURSORDATA->m_hCursor ;
+    memset( cp->data , 0 , sizeof( Bits16 ) ) ;
+    memset( cp->mask , 0 , sizeof( Bits16 ) ) ;
+    
+    unsigned char mr = image16.GetMaskRed() ;
+    unsigned char mg = image16.GetMaskGreen() ;
+    unsigned char mb = image16.GetMaskBlue() ;
+    for ( int y = 0 ; y < h ; ++y )
+    {
+        short rowbits = 0 ;
+        short maskbits = 0 ;
+        
+        for ( int x = 0 ; x < w ; ++x )
+        {
+            long pos = (y * w + x) * 3;
+
+            unsigned char r = rgbBits[pos] ;
+            unsigned char g = rgbBits[pos+1] ;
+            unsigned char b = rgbBits[pos+2] ;
+            if ( bHasMask && r==mr && g==mg && b==mb )
+            {
+                // masked area, does not appear anywhere
+            }
+            else
+            {
+                if ( (int)r + (int)g + (int)b < 0x0200 )
+                {
+                    rowbits |= ( 1 << (15-x) ) ;
+                }
+                maskbits |= ( 1 << (15-x) ) ;
+            }
+        }
+        cp->data[y] = rowbits ;
+        cp->mask[y] = maskbits ;
+    }
+    if ( !bHasMask )
+    {
+        memcpy( cp->mask , cp->data , sizeof( Bits16) ) ;
+    }
+    cp->hotSpot.h = hotSpotX ;
+    cp->hotSpot.v = hotSpotY ;
+    HUnlock( (Handle) M_CURSORDATA->m_hCursor ) ;
+#else
+    PixMapHandle pm = (PixMapHandle) NewHandleClear( sizeof (PixMap))  ;
+    short extent = 16 ;
+    short bytesPerPixel = 1 ;
+    short depth = 8 ;
+    Rect bounds = { 0 , 0 , extent , extent } ;
+    CCrsrHandle ch = (CCrsrHandle) NewHandleClear ( sizeof( CCrsr ) ) ;
+    CTabHandle newColors = GetCTable( 8 ) ;
+    HandToHand((Handle *) &newColors);
+    // set the values to the indices
+    for ( int i = 0 ; i < (**newColors).ctSize ; ++i )
+    {
+        (**newColors).ctTable[i].value = i ;
+    }
+    HLock( (Handle) ch) ;
+    (**ch).crsrType = 0x8001 ; // color cursors
+    (**ch).crsrMap = pm ; 
+    short bytesPerRow = bytesPerPixel * extent ;
+
+    (**pm).baseAddr = 0; 
+    (**pm).rowBytes = bytesPerRow | 0x8000;
+    (**pm).bounds = bounds;        
+    (**pm).pmVersion = 0;           
+    (**pm).packType = 0;            
+    (**pm).packSize = 0;            
+    (**pm).hRes = 0x00480000; /* 72 DPI default res */
+    (**pm).vRes = 0x00480000; /* 72 DPI default res */
+    (**pm).pixelSize = depth;
+    (**pm).pixelType = 0;
+    (**pm).cmpCount = 1; 
+    (**pm).cmpSize = depth;
+    (**pm).pmTable = newColors;
+
+    (**ch).crsrData = NewHandleClear( extent * bytesPerRow ) ;  
+    (**ch).crsrXData = NULL ;
+    (**ch).crsrXValid = 0;
+    (**ch).crsrXHandle = NULL;
+
+    (**ch).crsrHotSpot.h = hotSpotX ;
+    (**ch).crsrHotSpot.v = hotSpotY ;
+    (**ch).crsrXTable = NULL ; 
+    (**ch).crsrID = GetCTSeed() ;
+    
+    memset( (**ch).crsr1Data  , 0 , sizeof( Bits16 ) ) ;
+    memset( (**ch).crsrMask , 0 , sizeof( Bits16 ) ) ;
+    
+    unsigned char mr = image16.GetMaskRed() ;
+    unsigned char mg = image16.GetMaskGreen() ;
+    unsigned char mb = image16.GetMaskBlue() ;
+    for ( int y = 0 ; y < h ; ++y )
+    {
+        short rowbits = 0 ;
+        short maskbits = 0 ;
+        
+        for ( int x = 0 ; x < w ; ++x )
+        {
+            long pos = (y * w + x) * 3;
+
+            unsigned char r = rgbBits[pos] ;
+            unsigned char g = rgbBits[pos+1] ;
+            unsigned char b = rgbBits[pos+2] ;
+            RGBColor col = { 0xFFFF ,0xFFFF, 0xFFFF } ;
+            
+            if ( bHasMask && r==mr && g==mg && b==mb )
+            {
+                // masked area, does not appear anywhere
+            }
+            else
+            {
+                if ( (int)r + (int)g + (int)b < 0x0200 )
+                {
+                    rowbits |= ( 1 << (15-x) ) ;
+                }
+                maskbits |= ( 1 << (15-x) ) ;
+                
+                col = *((RGBColor*) wxColor( r , g , b ).GetPixel()) ;
+            }
+            *((*(**ch).crsrData) + y * bytesPerRow + x) = 
+                GetCTabIndex( newColors , &col) ;
+        }
+        (**ch).crsr1Data[y] = rowbits ;
+        (**ch).crsrMask[y] = maskbits ;
+    }
+    if ( !bHasMask )
+    {
+        memcpy( (**ch).crsrMask , (**ch).crsr1Data , sizeof( Bits16) ) ;
+    }
+    
+    HUnlock((Handle) ch) ;
+    M_CURSORDATA->m_hCursor = ch ;
+    M_CURSORDATA->m_isColorCursor = true ;
+#endif
+}
+
+wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int hotSpotY)
+{
+    m_refData = new wxCursorRefData;
+    if ( flags == wxBITMAP_TYPE_MACCURSOR_RESOURCE )
+    {
+        Str255 theName ;
+
+    #if TARGET_CARBON
+        c2pstrcpy( (StringPtr) theName , cursor_file ) ;
+    #else
+        strcpy( (char *) theName , cursor_file ) ;
+        c2pstr( (char *) theName ) ;
+    #endif
+        
+        wxStAppResource resload ;
+        Handle resHandle = ::GetNamedResource( 'crsr' , theName ) ;
+        if ( resHandle )
+        {
+            short theId = -1 ;
+            OSType theType ;
+            GetResInfo( resHandle , &theId , &theType , theName ) ;
+            ReleaseResource( resHandle ) ;
+            M_CURSORDATA->m_hCursor = GetCCursor( theId ) ;
+            if ( M_CURSORDATA->m_hCursor )
+                M_CURSORDATA->m_isColorCursor = true ;
+        }
+        else
+        {       
+            Handle resHandle = ::GetNamedResource( 'CURS' , theName ) ;
+            if ( resHandle )
+            {
+                short theId = -1 ;
+                OSType theType ;
+                GetResInfo( resHandle , &theId , &theType , theName ) ;
+                ReleaseResource( resHandle ) ;
+                 M_CURSORDATA->m_hCursor = GetCursor( theId ) ;
+                if ( M_CURSORDATA->m_hCursor )
+                    M_CURSORDATA->m_releaseHandle = true ;
+            }
+        }
+    }
+    else
+    {
+        wxImage image ;
+        image.LoadFile( cursor_file , flags ) ;
+        if( image.Ok() )
+        {
+            image.SetOption(wxCUR_HOTSPOT_X,hotSpotX ) ;
+            image.SetOption(wxCUR_HOTSPOT_Y,hotSpotY ) ;
+            delete m_refData ;
+            CreateFromImage(image) ;
+        }
+    }
 }
 
 // Cursors by stock number
@@ -80,151 +346,155 @@ wxCursor::wxCursor(int cursor_type)
 {
   m_refData = new wxCursorRefData;
   
-  
   switch (cursor_type)
-  {
+    {
+    case wxCURSOR_COPY_ARROW:
+        M_CURSORDATA->m_themeCursor = kThemeCopyArrowCursor ;
+        break;
     case wxCURSOR_WAIT:
-      M_CURSORDATA->m_hCursor = ::GetCursor(watchCursor);
+        M_CURSORDATA->m_themeCursor = kThemeWatchCursor ;
       break;
     case wxCURSOR_IBEAM:
-      M_CURSORDATA->m_hCursor = ::GetCursor(iBeamCursor);
+        M_CURSORDATA->m_themeCursor = kThemeIBeamCursor ;
       break;
     case wxCURSOR_CROSS:
-      M_CURSORDATA->m_hCursor = ::GetCursor(crossCursor);
+        M_CURSORDATA->m_themeCursor = kThemeCrossCursor;
       break;
     case wxCURSOR_SIZENWSE:
       {
         wxStAppResource resload ;
-        M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId);
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNWSE);
       }
       break;
     case wxCURSOR_SIZENESW:
       {
         wxStAppResource resload ;
-        M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId);
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNESW);
       }
       break;
     case wxCURSOR_SIZEWE:
       {
-        wxStAppResource resload ;
+            M_CURSORDATA->m_themeCursor = kThemeResizeLeftRightCursor;
-        M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId);
       }
       break;
     case wxCURSOR_SIZENS:
       {
         wxStAppResource resload ;
-        M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNSId);
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNS);
-      }
-      break;
-    case wxCURSOR_CHAR:
-        {
-          M_CURSORDATA->m_hCursor = MacArrowCursor;
-          break;
         }
+        break;
+    case wxCURSOR_SIZING:
+        {
+            wxStAppResource resload ;
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSize);
+        }
+        break;
     case wxCURSOR_HAND:
         {
-          wxStAppResource resload ;
+            M_CURSORDATA->m_themeCursor = kThemePointingHandCursor;
-          M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
         }
         break;
     case wxCURSOR_BULLSEYE:
         {
           wxStAppResource resload ;
-          M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorBullseye);
         }
         break;
     case wxCURSOR_PENCIL:
         {
           wxStAppResource resload ;
-          M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorPencil);
         }
         break;
     case wxCURSOR_MAGNIFIER:
         {
           wxStAppResource resload ;
-          M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorMagnifier);
         }
         break;
     case wxCURSOR_NO_ENTRY:
         {
           wxStAppResource resload ;
-          M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorNoEntry);
         }
         break;
-    case wxCURSOR_LEFT_BUTTON:
-    {
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
-      break;
-    }
-    case wxCURSOR_RIGHT_BUTTON:
-    {
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
-      break;
-    }
-    case wxCURSOR_MIDDLE_BUTTON:
-    {
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
-      break;
-    }
-    case wxCURSOR_SIZING:
-    {
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
-      break;
-    }
     case wxCURSOR_WATCH:
     {
-      M_CURSORDATA->m_hCursor = ::GetCursor(watchCursor);
+            M_CURSORDATA->m_themeCursor = kThemeWatchCursor;
+            break;
+        }
+    case wxCURSOR_PAINT_BRUSH:
+        {
+            wxStAppResource resload ;
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorPaintBrush);
+            break;
+        }
+    case wxCURSOR_POINT_LEFT:
+        {
+            wxStAppResource resload ;
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorPointLeft);
+            break;
+        }
+    case wxCURSOR_POINT_RIGHT:
+        {
+            wxStAppResource resload ;
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorPointRight);
+            break;
+        }
+    case wxCURSOR_QUESTION_ARROW:
+        {
+            wxStAppResource resload ;
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorQuestionArrow);
+            break;
+        }
+    case wxCURSOR_BLANK:
+        {
+            wxStAppResource resload ;
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorBlank);
+            break;
+        }
+    case wxCURSOR_RIGHT_ARROW:
+        {
+            wxStAppResource resload ;
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorRightArrow);
       break;
     }
     case wxCURSOR_SPRAYCAN:
     {
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
+            wxStAppResource resload ;
-      break;
+            M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorRoller);
-    }
+            break;
-    case wxCURSOR_PAINT_BRUSH:
+        }
-    {
+    case wxCURSOR_CHAR:
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
-      break;
-    }
-    case wxCURSOR_POINT_LEFT:
-    {
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
-      break;
-    }
-    case wxCURSOR_POINT_RIGHT:
-    {
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
-      break;
-    }
-    case wxCURSOR_QUESTION_ARROW:
-    {
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
-      break;
-    }
-    case wxCURSOR_BLANK:
-    {
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
-      break;
-    }
-    default:
     case wxCURSOR_ARROW:
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
+    case wxCURSOR_LEFT_BUTTON:
-      break;
+    case wxCURSOR_RIGHT_BUTTON:
-	}
+    case wxCURSOR_MIDDLE_BUTTON:
+    default:
+        M_CURSORDATA->m_themeCursor = kThemeArrowCursor ;
+        break;
+    }
+    if ( M_CURSORDATA->m_themeCursor == -1 )
+        M_CURSORDATA->m_releaseHandle = true ;
 }
 
 void wxCursor::MacInstall() const 
 {
-	if ( m_refData && M_CURSORDATA->m_hCursor )
+    gMacCurrentCursor = *this ;
-	{
+    if ( m_refData && M_CURSORDATA->m_themeCursor != -1 )
-		CursHandle ch = ((CursHandle)M_CURSORDATA->m_hCursor) ;
+    {
-		::SetCursor(  *ch ) ;
+        SetThemeCursor( M_CURSORDATA->m_themeCursor ) ;
-		gMacCurrentCursor = ch ;
+    }
-	}
+    else if ( m_refData && M_CURSORDATA->m_hCursor )
-	else
+    {
-	{
+        if ( M_CURSORDATA->m_isColorCursor )
-		::SetCursor( *MacArrowCursor ) ;
+            ::SetCCursor( (CCrsrHandle) M_CURSORDATA->m_hCursor ) ;
-		gMacCurrentCursor = NULL ;
+        else
+            ::SetCursor( * (CursHandle) M_CURSORDATA->m_hCursor ) ;
+    }
+    else
+    {
+        SetThemeCursor( kThemeArrowCursor ) ;
 	}
 }
 

src/mac/dnd.cpp

@@ -245,6 +245,28 @@ bool wxDropTarget::GetData()
 //-----------------------------------------------------------------------------
 // drag request
 
+wxDropSource::wxDropSource(wxWindow *win,
+                           const wxCursor &cursorCopy,
+                           const wxCursor &cursorMove,
+                           const wxCursor &cursorStop)
+            : wxDropSourceBase(cursorCopy, cursorMove, cursorStop)
+{
+    wxMacEnsureTrackingHandlersInstalled() ;
+    m_window = win;
+}
+
+wxDropSource::wxDropSource(wxDataObject& data,
+                           wxWindow *win,
+                           const wxCursor &cursorCopy,
+                           const wxCursor &cursorMove,
+                           const wxCursor &cursorStop)
+            : wxDropSourceBase(cursorCopy, cursorMove, cursorStop)
+{
+    wxMacEnsureTrackingHandlersInstalled() ;
+    SetData( data );
+    m_window = win;
+}
+
 wxDropSource::wxDropSource(wxWindow *win,
                            const wxIcon &iconCopy,
                            const wxIcon &iconMove,
@@ -376,6 +398,21 @@ wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))
     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
@@ -457,11 +494,44 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
                         // this window is entered
                         trackingGlobals->m_currentTargetWindow = win ;
                         trackingGlobals->m_currentTarget = win->GetDropTarget() ;
-                        if ( trackingGlobals->m_currentTarget )
                         {
-                          trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
+                        	wxDragResult result = wxDragNone ;
-                           if ( trackingGlobals->m_currentTarget->OnEnter(
+                        	if ( trackingGlobals->m_currentTarget )
-                                localx , localy , wxDragCopy ) != wxDragNone )
+                        	{
+                            	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 ;