Fix crash in wxColour ctor from NSColor in wxOSX/Cocoa.

[wxWidgets.git] / src / osx / core / dcmemory.cpp

diff --git a/src/osx/core/dcmemory.cpp b/src/osx/core/dcmemory.cpp
index a21782eaaebcc43bf21e9f5a89d0c64de19f3d01..96103953771716ad82b93c6079865ff0b1c22e26 100644 (file)
--- a/src/osx/core/dcmemory.cpp
+++ b/src/osx/core/dcmemory.cpp
@@ -58,8 +58,7 @@ wxMemoryDCImpl::~wxMemoryDCImpl()
     if ( m_selected.Ok() )
     {
         m_selected.EndRawAccess() ;
-        delete m_graphicContext ;
-        m_graphicContext = NULL ;
+        wxDELETE(m_graphicContext);
     }
 }
 
@@ -68,8 +67,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
     if ( m_selected.Ok() )
     {
         m_selected.EndRawAccess() ;
-        delete m_graphicContext ;
-        m_graphicContext = NULL ;
+        wxDELETE(m_graphicContext);
     }
 
     m_selected = bitmap;
@@ -78,8 +76,8 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
         if ( m_selected.GetDepth() != 1 )
             m_selected.UseAlpha() ;
         m_selected.BeginRawAccess() ;
-               m_width = bitmap.GetWidth();
-               m_height = bitmap.GetHeight();
+        m_width = bitmap.GetWidth();
+        m_height = bitmap.GetHeight();
         CGColorSpaceRef genericColorSpace  = wxMacGetGenericRGBColorSpace();
         CGContextRef bmCtx = (CGContextRef) m_selected.GetHBITMAP();
 
@@ -87,7 +85,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
         {
             CGContextSetFillColorSpace( bmCtx, genericColorSpace );
             CGContextSetStrokeColorSpace( bmCtx, genericColorSpace );
-                       SetGraphicsContext( wxGraphicsContext::CreateFromNative( bmCtx ) );
+            SetGraphicsContext( wxGraphicsContext::CreateFromNative( bmCtx ) );
         }
         m_ok = (m_graphicContext != NULL) ;
     }