added hilite change notification

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

diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp
index 5949c6300b088c908ee83c8ab1644783dc1fc883..64dc8053d0a66b3b17c877793bd3a842dfac4f72 100644 (file)
--- a/src/mac/carbon/dataobj.cpp
+++ b/src/mac/carbon/dataobj.cpp
@@ -34,7 +34,7 @@
 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/mac/private.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/mac/private.h"

-#include "Scrap.h"
+#include <Scrap.h>

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


@@ -85,19 +85,21 @@ void wxDataFormat::SetType(  wxDataFormatId  Type )
     else
     {
        wxFAIL_MSG( wxT("invalid dataformat") );
     else
     {
        wxFAIL_MSG( wxT("invalid dataformat") );

-    }
-}

 
 

-wxDataFormatId wxDataFormat::GetType() const
-{
-    return m_type;
+       // this is '????' but it can't be used in the code because ??' is
+       // parsed as a trigraph!
+       m_format = 0x3f3f3f3f;
+    }

 }
 
 wxString wxDataFormat::GetId() const
 {
 }
 
 wxString wxDataFormat::GetId() const
 {

-       char text[5] ;
-       strncpy( text , (char*) m_format , 4 ) ;
-       text[4] = 0 ;
+    // note that m_format is not a pointer to string, it *is* itself a 4
+    // character string
+    char text[5] ;
+    strncpy( text , (char*) &m_format , 4 ) ;
+    text[4] = 0 ;
+

     return wxString::FromAscii( text ) ;
 }
 
     return wxString::FromAscii( text ) ;
 }
 


@@ -107,14 +109,11 @@ void wxDataFormat::SetId(  NativeFormat  format )
 
     if (m_format == kScrapFlavorTypeText)
         m_type = wxDF_TEXT;
 
     if (m_format == kScrapFlavorTypeText)
         m_type = wxDF_TEXT;

-    else
-    if (m_format == kScrapFlavorTypeUnicode )
+    else if (m_format == kScrapFlavorTypeUnicode )

         m_type = wxDF_UNICODETEXT;
         m_type = wxDF_UNICODETEXT;

-    else
-    if (m_format == kScrapFlavorTypePicture)
+    else if (m_format == kScrapFlavorTypePicture)

         m_type = wxDF_BITMAP;
         m_type = wxDF_BITMAP;

-    else
-    if (m_format == kDragFlavorTypeHFS )
+    else if (m_format == kDragFlavorTypeHFS )

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


@@ -122,8 +121,6 @@ void wxDataFormat::SetId(  NativeFormat  format )
 
 void wxDataFormat::SetId( const wxChar* zId )
 {
 
 void wxDataFormat::SetId( const wxChar* zId )
 {

-    wxString                        tmp(zId);
-

     m_type = wxDF_PRIVATE;
     m_format = 0;// TODO: get the format gdk_atom_intern( wxMBSTRINGCAST tmp.mbc_str(), FALSE );
 }
     m_type = wxDF_PRIVATE;
     m_format = 0;// TODO: get the format gdk_atom_intern( wxMBSTRINGCAST tmp.mbc_str(), FALSE );
 }