GetId was accessing the m_format var incorrectly

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp
index 5949c6300b088c908ee83c8ab1644783dc1fc883..ed8f00717d1517453f057cf6a3ac756aeea04a9e 100644 (file)
--- a/src/mac/carbon/dataobj.cpp
+++ b/src/mac/carbon/dataobj.cpp
@@ -84,6 +84,7 @@ void wxDataFormat::SetType(  wxDataFormatId  Type )
         m_format = kDragFlavorTypeHFS ;
     else
     {
         m_format = kDragFlavorTypeHFS ;
     else
     {

+        m_format = '????' ;

        wxFAIL_MSG( wxT("invalid dataformat") );
     }
 }
        wxFAIL_MSG( wxT("invalid dataformat") );
     }
 }


@@ -96,7 +97,7 @@ wxDataFormatId wxDataFormat::GetType() const
 wxString wxDataFormat::GetId() const
 {
        char text[5] ;
 wxString wxDataFormat::GetId() const
 {
        char text[5] ;

-       strncpy( text , (char*) m_format , 4 ) ;
+       strncpy( text , (char*) &m_format , 4 ) ;

        text[4] = 0 ;
     return wxString::FromAscii( text ) ;
 }
        text[4] = 0 ;
     return wxString::FromAscii( text ) ;
 }

diff --git a/src/mac/dataobj.cpp b/src/mac/dataobj.cpp
index 5949c6300b088c908ee83c8ab1644783dc1fc883..ed8f00717d1517453f057cf6a3ac756aeea04a9e 100644 (file)
--- a/src/mac/dataobj.cpp
+++ b/src/mac/dataobj.cpp
@@ -84,6 +84,7 @@ void wxDataFormat::SetType(  wxDataFormatId  Type )
         m_format = kDragFlavorTypeHFS ;
     else
     {
         m_format = kDragFlavorTypeHFS ;
     else
     {

+        m_format = '????' ;

        wxFAIL_MSG( wxT("invalid dataformat") );
     }
 }
        wxFAIL_MSG( wxT("invalid dataformat") );
     }
 }


@@ -96,7 +97,7 @@ wxDataFormatId wxDataFormat::GetType() const
 wxString wxDataFormat::GetId() const
 {
        char text[5] ;
 wxString wxDataFormat::GetId() const
 {
        char text[5] ;

-       strncpy( text , (char*) m_format , 4 ) ;
+       strncpy( text , (char*) &m_format , 4 ) ;

        text[4] = 0 ;
     return wxString::FromAscii( text ) ;
 }
        text[4] = 0 ;
     return wxString::FromAscii( text ) ;
 }