entryName is a pascal string - need to convert

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

diff --git a/src/mac/carbon/mimetmac.cpp b/src/mac/carbon/mimetmac.cpp
index ff77f1c44153299dad27ad282b331f1a75c06162..5663744e7718bd6480b6a56e4405d91e8e1305bc 100644 (file)
--- a/src/mac/carbon/mimetmac.cpp
+++ b/src/mac/carbon/mimetmac.cpp
@@ -482,6 +482,19 @@ wxString wxFileTypeImpl::GetCommand(const wxString& verb) const
 }
 #endif //!DARWIN
 
 }
 #endif //!DARWIN
 

+bool wxFileTypeImpl::GetDescription(wxString *desc) const
+{
+    wxASSERT_MSG( m_manager != NULL , wxT("Bad wxFileType") );
+    
+    ICMapEntry entry;
+    ICGetMapEntry( (ICInstance) m_manager->m_hIC, 
+                   (Handle) m_manager->m_hDatabase, 
+                   m_lIndex, &entry);
+    
+    *desc = wxMacMakeStringFromPascal(entry.entryName);
+    return true;
+}
+

 bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)
 {
     wxASSERT_MSG( m_manager != NULL , wxT("Bad wxFileType") );
 bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)
 {
     wxASSERT_MSG( m_manager != NULL , wxT("Bad wxFileType") );


@@ -532,19 +545,6 @@ bool wxFileTypeImpl::GetIcon(wxIconLocation *WXUNUSED(icon)) const
     return FALSE;
 }
 
     return FALSE;
 }
 

-bool wxFileTypeImpl::GetDescription(wxString *desc) const
-{
-    wxASSERT_MSG( m_manager != NULL , wxT("Bad wxFileType") );
-    
-    ICMapEntry entry;
-    ICGetMapEntry( (ICInstance) m_manager->m_hIC, 
-                   (Handle) m_manager->m_hDatabase, 
-                   m_lIndex, &entry);
-    
-    *desc = wxString((char*)entry.entryName, wxConvLocal);
-    return true;
-}
-

 size_t wxFileTypeImpl::GetAllCommands(wxArrayString * verbs, wxArrayString * commands,
                    const wxFileType::MessageParameters& params) const
 {
 size_t wxFileTypeImpl::GetAllCommands(wxArrayString * verbs, wxArrayString * commands,
                    const wxFileType::MessageParameters& params) const
 {