Fixed [ 1558015 ] No deselection event from wxGenericTreeCtrl::SelectItem()

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

diff --git a/src/mac/carbon/dcmemory.cpp b/src/mac/carbon/dcmemory.cpp
index 9985a00b9efa7286ca9e9496d1757f66c2798819..79ef4ee3ccf5b4a27b1eb9e3d87d2bec5d3249ab 100644 (file)
--- a/src/mac/carbon/dcmemory.cpp
+++ b/src/mac/carbon/dcmemory.cpp
@@ -1,19 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcmemory.cpp
+// Name:        src/mac/carbon/dcmemory.cpp

 // Purpose:     wxMemoryDC class
 // Purpose:     wxMemoryDC class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dcmemory.h"
-#endif
+#include "wx/wxprec.h"

 
 #include "wx/dcmemory.h"
 
 #include "wx/dcmemory.h"

+

 #include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------


@@ -22,77 +21,123 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
 

-wxMemoryDC::wxMemoryDC(void)
+wxMemoryDC::wxMemoryDC()
+: m_selected()

 {
 {

-  m_ok = TRUE;
+    m_ok = true;

     SetBackground(*wxWHITE_BRUSH);
     SetBrush(*wxWHITE_BRUSH);
     SetPen(*wxBLACK_PEN);
     SetBackground(*wxWHITE_BRUSH);
     SetBrush(*wxWHITE_BRUSH);
     SetPen(*wxBLACK_PEN);

-  m_ok = FALSE;
-};
+    SetFont(*wxNORMAL_FONT);
+    m_ok = false;
+}

 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )

+: m_selected()

 {
 {

- m_ok = TRUE;
+    m_ok = true;

     SetBackground(*wxWHITE_BRUSH);
     SetBrush(*wxWHITE_BRUSH);
     SetPen(*wxBLACK_PEN);
     SetBackground(*wxWHITE_BRUSH);
     SetBrush(*wxWHITE_BRUSH);
     SetPen(*wxBLACK_PEN);

-  m_ok = FALSE;
-};
+    SetFont(*wxNORMAL_FONT);
+    m_ok = false;
+}

 
 wxMemoryDC::~wxMemoryDC()
 {
 
 wxMemoryDC::~wxMemoryDC()
 {

-       if ( m_selected.Ok() )
-       {
-               UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
-       }
-};
+    if ( m_selected.Ok() )
+    {
+#if wxMAC_USE_CORE_GRAPHICS
+        m_selected.EndRawAccess() ;
+        CGContextRef bmCtx = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
+        delete m_graphicContext ;
+        m_graphicContext = NULL ;
+        CGContextRelease( bmCtx ) ;
+#else
+// TODO: UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
+#endif
+    }
+}

 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {

-       if ( m_selected.Ok() )
-       {
-               UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
-       }
+    if ( m_selected.Ok() )
+    {
+#if wxMAC_USE_CORE_GRAPHICS
+        m_selected.EndRawAccess() ;
+        CGContextRef bmCtx = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
+        delete m_graphicContext ;
+        m_graphicContext = NULL ;
+        CGContextRelease( bmCtx ) ;
+#else
+// TODO: UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
+#endif
+    }
+

     m_selected = bitmap;
     if (m_selected.Ok())
     {
     m_selected = bitmap;
     if (m_selected.Ok())
     {

-               if ( m_selected.GetHBITMAP() )
-               {
-                       m_macPort = (GrafPtr) m_selected.GetHBITMAP() ;
-                       LockPixels( GetGWorldPixMap(  (CGrafPtr)  m_macPort ) ) ;
-                       wxMask * mask = bitmap.GetMask() ;
-                       if ( mask )
-                       {
-                               m_macMask = mask->GetMaskBitmap() ;
-                       }
-               SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , 0 , 0 , m_selected.GetWidth() , m_selected.GetHeight() ) ;
-               CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
-                       m_ok = TRUE ;
-               }
-               else
-               {
-               m_ok = FALSE;
-               }
-  }
-  else
-  {
-    m_ok = FALSE;
-  }
+#if wxMAC_USE_CORE_GRAPHICS
+        m_selected.UseAlpha() ;
+        void * data = m_selected.BeginRawAccess() ;
+
+        int bitsPerComp = 8 ;
+        int bytesPerPixel = 4 ;
+        int w = bitmap.GetWidth() ;
+        int h = bitmap.GetHeight() ;
+
+        // TODO: should this be kCGImageAlphaPremultiplied[First,Last] ?
+        CGImageAlphaInfo a = kCGImageAlphaNoneSkipFirst ;
+
+        CGColorSpaceRef genericColorSpace  = wxMacGetGenericRGBColorSpace();
+        CGContextRef bmCtx = CGBitmapContextCreate( data , w, h, bitsPerComp , bytesPerPixel * w , genericColorSpace, a );
+        wxASSERT_MSG( bmCtx , wxT("Unable to create bitmap context") ) ;
+
+        if ( bmCtx )
+        {
+            CGContextSetFillColorSpace( bmCtx, genericColorSpace );
+            CGContextSetStrokeColorSpace( bmCtx, genericColorSpace );
+
+            CGContextTranslateCTM( bmCtx , 0 ,  m_selected.GetHeight() ) ;
+            CGContextScaleCTM( bmCtx , 1 , -1 ) ;
+
+            m_graphicContext = new wxMacCGContext( bmCtx ) ;
+            m_graphicContext->SetPen( m_pen ) ;
+            m_graphicContext->SetBrush( m_brush ) ;
+        }
+        m_ok = (m_graphicContext != NULL) ;
+
+#else
+        m_macPort = m_selected.GetHBITMAP( &m_macMask ) ;
+        m_ok = (m_macPort != NULL) ;
+        if (m_ok)
+        {
+            LockPixels( GetGWorldPixMap( (CGrafPtr) m_macPort ) ) ;
+            SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , 0 , 0 , m_selected.GetWidth() , m_selected.GetHeight() ) ;
+            CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
+        }
+#endif
+    }
+    else
+    {
+        m_ok = false;
+    }

 }
 
 void wxMemoryDC::DoGetSize( int *width, int *height ) const
 {
 }
 
 void wxMemoryDC::DoGetSize( int *width, int *height ) const
 {

-  if (m_selected.Ok())
-  {
-    if (width) (*width) = m_selected.GetWidth();
-    if (height) (*height) = m_selected.GetHeight();
-  }
-  else
-  {
-    if (width) (*width) = 0;
-    if (height) (*height) = 0;
-  }
+    if (m_selected.Ok())
+    {
+        if (width)
+            (*width) = m_selected.GetWidth();
+        if (height)
+            (*height) = m_selected.GetHeight();
+    }
+    else
+    {
+        if (width)
+            (*width) = 0;
+        if (height)
+            (*height) = 0;
+    }

 }
 }

-
-