avoid system pop-up menu commands being handled by wxApp, bug was shown in printing...

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

diff --git a/src/mac/carbon/mimetmac.cpp b/src/mac/carbon/mimetmac.cpp
index 5516810999446ec809db52a26c5e0482ea98ce4c..cc471b746b2db7d9e3ee2f5f294449b232b5fa4d 100644 (file)
--- 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"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -58,8 +54,10 @@
 
 // other standard headers
 #include <ctype.h>
 
 // other standard headers
 #include <ctype.h>

-#include <InternetConfig.h> //For mime types

 
 

+#ifndef __DARWIN__
+#include <InternetConfig.h> //For mime types
+#endif

 
 /*   START CODE SAMPLE FROM TECHNOTE 1002 (http://developer.apple.com/technotes/tn/tn1002.html) */
 
 
 /*   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
 #if defined(__DARWIN__)
 
 //on darwin, use launch services

-#include "LaunchServices.h"
+#include <ApplicationServices/ApplicationServices.h>

 
 wxString wxFileTypeImpl::GetCommand(const wxString& verb) const
 {
 
 wxString wxFileTypeImpl::GetCommand(const wxString& verb) const
 {


@@ -906,7 +904,7 @@ public:
     bool Exists(CFTypeRef cftKey) const
     {
         wxASSERT(IsValid());
     bool Exists(CFTypeRef cftKey) const
     {
         wxASSERT(IsValid());

-        return CFDictionaryContainsKey((CFDictionaryRef)m_cfmdRef, cftKey) == true;
+        return CFDictionaryContainsKey((CFDictionaryRef)m_cfmdRef, cftKey);

     }
 
     bool IsOk() const {return m_cfmdRef != NULL; }
     }
 
     bool IsOk() const {return m_cfmdRef != NULL; }


@@ -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(" {");
 
     {
             sMessage << wxT(" {");
 


@@ -1359,9 +1357,9 @@ void wxCFDictionary::MakeValidXML()
                 cfdCurrent.MakeValidXML();
                 Set(pKeys[i], cfdCurrent);
             }
                 cfdCurrent.MakeValidXML();
                 Set(pKeys[i], cfdCurrent);
             }

-            else if( ( CFGetTypeID(cfRef) == CFStringGetTypeID() ||
-                       CFGetTypeID(cfRef) == CFNumberGetTypeID() ||
-                       CFGetTypeID(cfRef) == CFBooleanGetTypeID() ) == false )
+            else if ( CFGetTypeID(cfRef) != CFStringGetTypeID() &&
+                      CFGetTypeID(cfRef) != CFNumberGetTypeID() &&
+                      CFGetTypeID(cfRef) != CFBooleanGetTypeID() )

             {
                 Remove(pKeys[i]);
                 --i;
             {
                 Remove(pKeys[i]);
                 --i;


@@ -1406,9 +1404,9 @@ void wxCFArray::MakeValidXML()
                 cfdCurrent.MakeValidXML();
                 Set(i, cfdCurrent);
             }
                 cfdCurrent.MakeValidXML();
                 Set(i, cfdCurrent);
             }

-            else if( ( CFGetTypeID(cfRef) == CFStringGetTypeID() ||
-                       CFGetTypeID(cfRef) == CFNumberGetTypeID() ||
-                       CFGetTypeID(cfRef) == CFBooleanGetTypeID() ) == false )
+            else if ( CFGetTypeID(cfRef) != CFStringGetTypeID() &&
+                      CFGetTypeID(cfRef) != CFNumberGetTypeID() &&
+                      CFGetTypeID(cfRef) != CFBooleanGetTypeID() )

             {
                 Remove(i);
                 --i;
             {
                 Remove(i);
                 --i;


@@ -2006,4 +2004,4 @@ wxMimeTypesManagerImpl::Unassociate(wxFileType *pFileType)
                             CFWriteStreamClose(cfwsInfo);
 
 */
                             CFWriteStreamClose(cfwsInfo);
 
 */

-#endif //wxUSE_MIMETYPE
\ No newline at end of file
+#endif //wxUSE_MIMETYPE