Patch by David Brinegar to fix menubar updating after modal dialog shown

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

diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index 594fe43af521d1ef1aa85c16369595d50d35ed88..354e4e5b1f471455b334026bce0fb9c4a9595752 100644 (file)
--- a/src/mac/carbon/metafile.cpp
+++ b/src/mac/carbon/metafile.cpp
@@ -9,7 +9,7 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "metafile.h"
 #endif
 
@@ -20,10 +20,6 @@
 #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#include "wx/setup.h"
-#endif
-
 #if wxUSE_METAFILE
 
 #ifndef WX_PRECOMP
@@ -125,9 +121,12 @@ bool wxMetaFile::Play(wxDC *dc)
         return FALSE;
         
     {
+#if wxMAC_USE_CORE_GRAPHICS
+#else
         wxMacPortSetter helper( dc ) ;
         PicHandle pict = (PicHandle) GetHMETAFILE() ;
         DrawPicture( pict , &(**pict).picFrame ) ;
+#endif
     }
     return TRUE;
 }
@@ -162,15 +161,17 @@ wxMetaFileDC::wxMetaFileDC(const wxString& filename ,
     wxASSERT_MSG( filename.IsEmpty() , _T("no file based metafile support yet")) ;
     
     m_metaFile = new wxMetaFile(filename) ;
+#if wxMAC_USE_CORE_GRAPHICS
+#else
     Rect r={0,0,height,width} ;
     
     RectRgn( (RgnHandle) m_macBoundaryClipRgn , &r ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
 
-    m_metaFile->SetHMETAFILE( OpenPicture( &r ) ) ;
+    m_metaFile->SetHMETAFILE( (WXHMETAFILE) OpenPicture( &r ) ) ;
     ::GetPort( (GrafPtr*) &m_macPort ) ;    
     m_ok = TRUE ;
-    
+#endif
     SetMapMode(wxMM_TEXT); 
 }
 
@@ -211,7 +212,7 @@ bool wxMetafileDataObject::SetData(size_t len, const void *buf)
     Handle handle = NewHandle( len ) ;
     SetHandleSize( handle , len ) ;
     memcpy( *handle , buf , len ) ;
-    m_metafile.SetHMETAFILE( handle ) ;
+    m_metafile.SetHMETAFILE( (WXHMETAFILE) handle ) ;
     return true ;
 }
 #endif