Use "&Help" so wxMac doesn't make an extra help menu

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

diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp
index b384ac7036dc1eeffbcfdff88f3fbfe39fa4016f..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


@@ -86,7 +86,9 @@ void wxDataFormat::SetType(  wxDataFormatId  Type )
     {
        wxFAIL_MSG( wxT("invalid dataformat") );
 
     {
        wxFAIL_MSG( wxT("invalid dataformat") );
 

-       m_format = '????';
+       // this is '????' but it can't be used in the code because ??' is
+       // parsed as a trigraph!
+       m_format = 0x3f3f3f3f;

     }
 }
 
     }
 }