fixed MouseUp handling when window was captured

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

diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp
index 67f938b414edce2d0a2b403b55adb0c43627ab05..bffbbe55e9a450f6a9e66fa0bda252b10b1f9153 100644 (file)
--- a/src/mac/carbon/dataobj.cpp
+++ b/src/mac/carbon/dataobj.cpp
@@ -33,6 +33,7 @@
 #include "wx/dataobj.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/dataobj.h"
 #include "wx/mstream.h"
 #include "wx/image.h"

+#include "wx/mac/private.h"

 
 // ----------------------------------------------------------------------------
 // functions
 
 // ----------------------------------------------------------------------------
 // functions


@@ -77,7 +78,7 @@ void wxDataFormat::SetType(  wxDataFormatId  Type )
     else if (m_type == wxDF_BITMAP || m_type == wxDF_METAFILE )
         m_format = 'PICT';
     else if (m_type == wxDF_FILENAME)
     else if (m_type == wxDF_BITMAP || m_type == wxDF_METAFILE )
         m_format = 'PICT';
     else if (m_type == wxDF_FILENAME)

-        m_format = 'SPEC';
+        m_format = kDragFlavorTypeHFS ;

     else
     {
        wxFAIL_MSG( wxT("invalid dataformat") );
     else
     {
        wxFAIL_MSG( wxT("invalid dataformat") );


@@ -105,7 +106,7 @@ void wxDataFormat::SetId(  NativeFormat  format )
     if (m_format == 'PICT')
         m_type = wxDF_BITMAP;
     else
     if (m_format == 'PICT')
         m_type = wxDF_BITMAP;
     else

-    if (m_format == 'SPEC')
+    if (m_format == kDragFlavorTypeHFS )

         m_type = wxDF_FILENAME;
     else
         m_type = wxDF_PRIVATE;
         m_type = wxDF_FILENAME;
     else
         m_type = wxDF_PRIVATE;


@@ -198,7 +199,7 @@ bool wxFileDataObject::SetData(
 , const void*                       pBuf
 )
 {
 , const void*                       pBuf
 )
 {

-    /* TODO */
+    m_filenames.Empty();

 
     wxString                        sFile( (const char *)pBuf);  /* char, not wxChar */
 
 
     wxString                        sFile( (const char *)pBuf);  /* char, not wxChar */