Casting grouping (Get/SetNativeContext), fixes 10.2 compilation

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

diff --git a/src/mac/carbon/dcmemory.cpp b/src/mac/carbon/dcmemory.cpp
index 8e979247a9460c751d0b133ebda6b310cd834f4a..a1f563080a0b2020c3545744bd954a725691fbd2 100644 (file)
--- a/src/mac/carbon/dcmemory.cpp
+++ b/src/mac/carbon/dcmemory.cpp
@@ -52,7 +52,7 @@ wxMemoryDC::~wxMemoryDC()
     {
 #if wxMAC_USE_CORE_GRAPHICS
         m_selected.EndRawAccess() ;
     {
 #if wxMAC_USE_CORE_GRAPHICS
         m_selected.EndRawAccess() ;

-        CGContextRef bmCtx = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ;
+        CGContextRef bmCtx = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;

         delete m_graphicContext ;
         m_graphicContext = NULL ;
         CGContextRelease( bmCtx ) ;
         delete m_graphicContext ;
         m_graphicContext = NULL ;
         CGContextRelease( bmCtx ) ;


@@ -68,7 +68,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
     {
 #if wxMAC_USE_CORE_GRAPHICS
         m_selected.EndRawAccess() ;
     {
 #if wxMAC_USE_CORE_GRAPHICS
         m_selected.EndRawAccess() ;

-        CGContextRef bmCtx = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ;
+        CGContextRef bmCtx = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;

         delete m_graphicContext ;
         m_graphicContext = NULL ;
         CGContextRelease( bmCtx ) ;
         delete m_graphicContext ;
         m_graphicContext = NULL ;
         CGContextRelease( bmCtx ) ;

diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp
index 5a286051450abf743c3e570f097633f527951c0a..49b5ba7b2f0aa701b5f0865116c59f5a9f4b0be3 100644 (file)
--- a/src/mac/carbon/dcprint.cpp
+++ b/src/mac/carbon/dcprint.cpp
@@ -361,7 +361,7 @@ wxPrinterDC::~wxPrinterDC(void)
 #if wxMAC_USE_CORE_GRAPHICS
 void wxPrinterDC::MacSetCGContext( void * cg ) 
 {
 #if wxMAC_USE_CORE_GRAPHICS
 void wxPrinterDC::MacSetCGContext( void * cg ) 
 {

-    (wxMacCGContext*)(m_graphicContext)->SetNativeContext( (CGContextRef) cg ) ;
+    ((wxMacCGContext*)(m_graphicContext))->SetNativeContext( (CGContextRef) cg ) ;

     m_graphicContext->SetPen( m_pen ) ;
     m_graphicContext->SetBrush( m_brush ) ;
 }
     m_graphicContext->SetPen( m_pen ) ;
     m_graphicContext->SetBrush( m_brush ) ;
 }

diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index 5367d10d040b4eb8c45224307827c1ae2401f0ee..04c45ae760ccc944be706035c5598dc638357654 100644 (file)
--- a/src/mac/carbon/metafile.cpp
+++ b/src/mac/carbon/metafile.cpp
@@ -168,7 +168,7 @@ bool wxMetaFile::Play(wxDC *dc)
     {
 #if wxMAC_USE_CORE_GRAPHICS
         QDPictRef cgPictRef = M_METAFILEDATA->m_qdPictRef ;
     {
 #if wxMAC_USE_CORE_GRAPHICS
         QDPictRef cgPictRef = M_METAFILEDATA->m_qdPictRef ;

-        CGContextRef cg = (wxMacCGContext*)(dc->GetGraphicContext())->GetNativeContext() ;
+        CGContextRef cg = ((wxMacCGContext*)(dc->GetGraphicContext()))->GetNativeContext() ;

         CGRect bounds = QDPictGetBounds( cgPictRef ) ;
 
         CGContextSaveGState(cg);    
         CGRect bounds = QDPictGetBounds( cgPictRef ) ;
 
         CGContextSaveGState(cg);