added option for getting visible region w/o children clipped

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

diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp
index e81ad045d29757e8b92c9b029d286972643bbaf8..5369a1cf3471f3c88857debb8051484ebac96487 100644 (file)
--- a/src/mac/carbon/dnd.cpp
+++ b/src/mac/carbon/dnd.cpp
@@ -86,7 +86,7 @@ bool wxDropTarget::CurrentDragHasSupportedFormat()
       
       if ( data )
       {
       
       if ( data )
       {

-        int formatcount = data->GetFormatCount() ;
+        size_t formatcount = data->GetFormatCount() ;

         wxDataFormat *array = new wxDataFormat[ formatcount  ];
         data->GetAllFormats( array );
         for (size_t i = 0; !supported && i < formatcount ; i++)
         wxDataFormat *array = new wxDataFormat[ formatcount  ];
         data->GetAllFormats( array );
         for (size_t i = 0; !supported && i < formatcount ; i++)


@@ -142,7 +142,7 @@ bool wxDropTarget::GetData()
       
       if ( data )
       {
       
       if ( data )
       {

-        int formatcount = data->GetFormatCount() ;
+        size_t formatcount = data->GetFormatCount() ;

         wxDataFormat *array = new wxDataFormat[ formatcount  ];
         data->GetAllFormats( array );
         for (size_t i = 0; !transferred && i < formatcount ; i++)
         wxDataFormat *array = new wxDataFormat[ formatcount  ];
         data->GetAllFormats( array );
         for (size_t i = 0; !transferred && i < formatcount ; i++)


@@ -211,7 +211,7 @@ bool wxDropTarget::GetData()
                   {
                     HFSFlavor* theFile = (HFSFlavor*) theData ;
                     wxString name = wxMacFSSpec2MacFilename( &theFile->fileSpec ) ;
                   {
                     HFSFlavor* theFile = (HFSFlavor*) theData ;
                     wxString name = wxMacFSSpec2MacFilename( &theFile->fileSpec ) ;

-                    m_dataObject->SetData( format , name.Length() + 1, name ) ;
+                    ((wxFileDataObject*)m_dataObject)->AddFile( name ) ;

                   }
                   else
                   {
                   }
                   else
                   {


@@ -259,7 +259,7 @@ wxDropSource::~wxDropSource()
 }
 
 
 }
 
 

-wxDragResult wxDropSource::DoDragDrop( bool allowMove )
+wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))

 {
     wxASSERT_MSG( m_data, wxT("Drop source: no data") );
 
 {
     wxASSERT_MSG( m_data, wxT("Drop source: no data") );
 


@@ -272,7 +272,7 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
     OSErr result;
     DragReference theDrag;
     RgnHandle dragRegion;
     OSErr result;
     DragReference theDrag;
     RgnHandle dragRegion;

-    if (result = NewDrag(&theDrag)) 
+    if ((result = NewDrag(&theDrag)))

     {
         return wxDragNone ;
     }
     {
         return wxDragNone ;
     }


@@ -281,7 +281,7 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
     wxDataFormat *formats = new wxDataFormat[formatCount] ;
     m_data->GetAllFormats( formats ) ;
     ItemReference theItem = 1 ;
     wxDataFormat *formats = new wxDataFormat[formatCount] ;
     m_data->GetAllFormats( formats ) ;
     ItemReference theItem = 1 ;

-    for ( int i = 0 ; i < formatCount ; ++i )
+    for ( size_t i = 0 ; i < formatCount ; ++i )

     {
         size_t dataSize = m_data->GetDataSize( formats[i] ) ;
         Ptr dataPtr = new char[dataSize] ;
     {
         size_t dataSize = m_data->GetDataSize( formats[i] ) ;
         Ptr dataPtr = new char[dataSize] ;


@@ -396,7 +396,6 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
     MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*) handlerRefCon;
     Point mouse, localMouse;
     DragAttributes attributes;
     MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*) handlerRefCon;
     Point mouse, localMouse;
     DragAttributes attributes;

-    RgnHandle hiliteRgn;

     GetDragAttributes(theDrag, &attributes);
     wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ; 
     switch(theMessage) 
     GetDragAttributes(theDrag, &attributes);
     wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ; 
     switch(theMessage) 


@@ -491,8 +490,9 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
     return(noErr);
 }
 
     return(noErr);
 }
 

-pascal OSErr wxMacWindowDragReceiveHandler(WindowPtr theWindow, void *handlerRefCon,
-DragReference theDrag)
+pascal OSErr wxMacWindowDragReceiveHandler(WindowPtr theWindow,
+                                           void *handlerRefCon,
+                                           DragReference theDrag)

 { 
     MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*) handlerRefCon;
     if ( trackingGlobals->m_currentTarget )
 { 
     MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*) handlerRefCon;
     if ( trackingGlobals->m_currentTarget )