X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d0ee33f5c6908b4ac5e1364381f0ef00942e3936..6e644ef2d35230f9d4a5c0bb89b98edd3e4d6c69:/src/mac/carbon/mimetmac.cpp?ds=sidebyside diff --git a/src/mac/carbon/mimetmac.cpp b/src/mac/carbon/mimetmac.cpp index 0ff7a6c09d..cc471b746b 100644 --- a/src/mac/carbon/mimetmac.cpp +++ b/src/mac/carbon/mimetmac.cpp @@ -26,10 +26,6 @@ // // -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "mimetype.h" -#endif - // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -58,8 +54,10 @@ // other standard headers #include -#include //For mime types +#ifndef __DARWIN__ +#include //For mime types +#endif /* START CODE SAMPLE FROM TECHNOTE 1002 (http://developer.apple.com/technotes/tn/tn1002.html) */ @@ -389,7 +387,7 @@ wxFileTypeImpl::GetPrintCommand(wxString *printCmd, #if defined(__DARWIN__) //on darwin, use launch services -#include "LaunchServices.h" +#include wxString wxFileTypeImpl::GetCommand(const wxString& verb) const { @@ -970,7 +968,7 @@ public: } } - static void PrintOutType(wxString& sMessage, wxString sValue, CFTypeRef cfRef) + static void PrintOutType(wxString& sMessage, const wxString& sValue, CFTypeRef cfRef) { sMessage << wxT(" {");