X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de5e599c8a3a6bcfad024e219dc0652c489ff05f..8e79a06be44af981a6dc4a9422585721600957e1:/src/mac/carbon/dnd.cpp

diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp
index 86fbae49bc..0a42702a8f 100644
--- a/src/mac/carbon/dnd.cpp
+++ b/src/mac/carbon/dnd.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        dnd.cpp
+// Name:        src/mac/carbon/dnd.cpp
 // Purpose:     wxDropTarget, wxDropSource implementations
 // Author:      Stefan Csomor
 // Modified by:
@@ -14,10 +14,13 @@
 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/dnd.h"
-#include "wx/window.h"
-#include "wx/toplevel.h"
-#include "wx/app.h"
-#include "wx/gdicmn.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/toplevel.h"
+    #include "wx/gdicmn.h"
+#endif // WX_PRECOMP
+
 #include "wx/mac/private.h"
 
 #ifndef __DARWIN__
@@ -34,8 +37,7 @@ typedef struct
     wxWindow *m_currentTargetWindow;
     wxDropTarget *m_currentTarget;
     wxDropSource *m_currentSource;
-}
-MacTrackingGlobals;
+} MacTrackingGlobals;
 
 MacTrackingGlobals gTrackingGlobals;
 
@@ -109,7 +111,6 @@ bool wxDropTarget::CurrentDragHasSupportedFormat()
     if ( !supported )
     {
         UInt16 items;
-        OSErr result;
         ItemReference theItem;
         FlavorType theType;
         UInt16 flavors = 0;
@@ -123,7 +124,7 @@ bool wxDropTarget::CurrentDragHasSupportedFormat()
 
             for ( UInt16 flavor = 1; flavor <= flavors; ++flavor )
             {
-                result = GetFlavorType( (DragReference)m_currentDrag, theItem, flavor, &theType );
+                GetFlavorType( (DragReference)m_currentDrag, theItem, flavor, &theType );
                 if ( m_dataObject->IsSupportedFormat( wxDataFormat( theType ) ) )
                 {
                     supported = true;
@@ -265,7 +266,7 @@ bool wxDropTarget::GetData()
                                 HFSFlavor* theFile = (HFSFlavor*)theData;
                                 wxString name = wxMacFSSpec2MacFilename( &theFile->fileSpec );
 
-                                if (!name.IsEmpty())
+                                if (!name.empty())
                                     filenamesPassed += name + wxT("\n");
                             }
                             break;
@@ -282,7 +283,7 @@ bool wxDropTarget::GetData()
             }
         }
 
-        if (filenamesPassed.Len() > 0)
+        if (filenamesPassed.length() > 0)
         {
             wxCharBuffer buf = filenamesPassed.fn_str();
             m_dataObject->SetData( wxDataFormat(wxDF_FILENAME), strlen( buf ), (const char*)buf );
@@ -334,11 +335,10 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
     if ((m_data == NULL) || (m_data->GetFormatCount() == 0))
         return (wxDragResult)wxDragNone;
 
-    OSStatus result;
     DragReference theDrag;
     RgnHandle dragRegion;
 
-    if ((result = NewDrag( &theDrag )) != noErr)
+    if (NewDrag( &theDrag ) != noErr)
         return wxDragNone;
 
     // add data to drag
@@ -450,7 +450,7 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
     // only when drag was successfully completed
 
     gTrackingGlobals.m_currentSource = this;
-    result = TrackDrag( theDrag, ev, dragRegion );
+    TrackDrag( theDrag, ev, dragRegion );
     DisposeRgn( dragRegion );
     DisposeDrag( theDrag );
     gTrackingGlobals.m_currentSource = NULL;