Fixed GetIcon to keep up with return type change on all other platforms.

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

diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp
index d02ba3a18b0b1085aeea32552d3073accab11a3d..49e61ac1098cf923c48dc6286110201c4ecbebb4 100644 (file)
--- a/src/mac/carbon/dnd.cpp
+++ b/src/mac/carbon/dnd.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dnd.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #if wxUSE_DRAG_AND_DROP
 #include "wx/wxprec.h"
 
 #if wxUSE_DRAG_AND_DROP


@@ -497,20 +493,20 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
 
 
             
 
 
             

-//            if (attributes & kDragHasLeftSenderWindow) 

             {
             {

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

                 wxWindow *win = NULL ;
                 ControlPartCode controlPart ;
                 ControlRef control = wxMacFindControlUnderMouse( toplevel , localMouse ,
                     theWindow , &controlPart ) ;
                 if ( control )
                     win = wxFindControlFromMacControl( control ) ;
                 wxWindow *win = NULL ;
                 ControlPartCode 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 ;
                 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 )
                 if ( win )
                     win->MacRootWindowToWindow( &localx , &localy ) ;
                 if ( win != trackingGlobals->m_currentTargetWindow )


@@ -601,8 +597,7 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
                   }
                 }
                 
                   }
                 }
                 

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

             break;
         case kDragTrackingLeaveWindow:
             if (trackingGlobals->m_currentTarget) 
             break;
         case kDragTrackingLeaveWindow:
             if (trackingGlobals->m_currentTarget)