Updated list of subprojects.

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

diff --git a/src/mac/carbon/dcmemory.cpp b/src/mac/carbon/dcmemory.cpp
index a1f563080a0b2020c3545744bd954a725691fbd2..ee44e18330239ec7a8548e5dfa571feffe1a7769 100644 (file)
--- a/src/mac/carbon/dcmemory.cpp
+++ b/src/mac/carbon/dcmemory.cpp
@@ -1,21 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcmemory.cpp
+// Name:        src/mac/carbon/dcmemory.cpp
 // Purpose:     wxMemoryDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dcmemory.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #include "wx/dcmemory.h"
+
 #include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------
@@ -24,27 +21,30 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
 
-wxMemoryDC::wxMemoryDC(void)
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
 : m_selected()
 {
-    m_ok = TRUE;
+    m_ok = true;
     SetBackground(*wxWHITE_BRUSH);
     SetBrush(*wxWHITE_BRUSH);
     SetPen(*wxBLACK_PEN);
-    SetFont(*wxNORMAL_FONT) ;
-    m_ok = FALSE;
-};
+    SetFont(*wxNORMAL_FONT);
+    m_ok = false;
+
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);
+}
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
 : m_selected()
 {
-    m_ok = TRUE;
+    m_ok = true;
     SetBackground(*wxWHITE_BRUSH);
     SetBrush(*wxWHITE_BRUSH);
     SetPen(*wxBLACK_PEN);
-    SetFont(*wxNORMAL_FONT) ;
-    m_ok = FALSE;
-};
+    SetFont(*wxNORMAL_FONT);
+    m_ok = false;
+}
 
 wxMemoryDC::~wxMemoryDC()
 {
@@ -57,10 +57,10 @@ wxMemoryDC::~wxMemoryDC()
         m_graphicContext = NULL ;
         CGContextRelease( bmCtx ) ;
 #else
-// TODO        UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
+// TODO: UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
 #endif
     }
-};
+}
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
@@ -73,61 +73,59 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
         m_graphicContext = NULL ;
         CGContextRelease( bmCtx ) ;
 #else
-// TODO        UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
+// TODO: UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
 #endif
     }
+
     m_selected = bitmap;
     if (m_selected.Ok())
     {
 #if wxMAC_USE_CORE_GRAPHICS
-        m_selected.UseAlpha() ;
+        if ( m_selected.GetDepth() != 1 )
+            m_selected.UseAlpha() ;
         void * data = m_selected.BeginRawAccess() ;
 
         int bitsPerComp = 8 ;
         int bytesPerPixel = 4 ;
         int w = bitmap.GetWidth() ;
         int h = bitmap.GetHeight() ;
-        CGImageAlphaInfo a = kCGImageAlphaNoneSkipFirst ; 
+
+        // TODO: should this be kCGImageAlphaPremultiplied[First,Last] ?
+        CGImageAlphaInfo a = kCGImageAlphaNoneSkipFirst ;
+
         CGColorSpaceRef genericColorSpace  = wxMacGetGenericRGBColorSpace();
-        CGContextRef bmCtx = CGBitmapContextCreate(data , w, h, bitsPerComp , bytesPerPixel * w , genericColorSpace, a);
+        CGContextRef bmCtx = CGBitmapContextCreate( data , w, h, bitsPerComp , bytesPerPixel * w , genericColorSpace, a );
         wxASSERT_MSG( bmCtx , wxT("Unable to create bitmap context") ) ;
 
-        CGContextSetFillColorSpace(bmCtx, genericColorSpace); 
-        CGContextSetStrokeColorSpace(bmCtx, genericColorSpace); 
-
-        if( bmCtx )
+        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 = new wxMacCGContext( bmCtx ) ;
             m_graphicContext->SetPen( m_pen ) ;
-            m_graphicContext->SetBrush( m_brush ) ;     
+            m_graphicContext->SetBrush( m_brush ) ;
+            m_graphicContext->SetFont( m_font ) ;
         }
-        m_ok = (m_graphicContext != NULL) ;  
+        m_ok = (m_graphicContext != NULL) ;
+
 #else
-        if ( ( m_macPort = m_selected.GetHBITMAP( &m_macMask ) ) != NULL )
+        m_macPort = m_selected.GetHBITMAP( &m_macMask ) ;
+        m_ok = (m_macPort != NULL) ;
+        if (m_ok)
         {
-            LockPixels( GetGWorldPixMap(  (CGrafPtr)  m_macPort ) ) ;
-            /*
-            wxMask * mask = bitmap.GetMask() ;
-            if ( mask )
-            {
-                m_macMask = mask->GetHBITMAP() ;
-            }
-            */
+            LockPixels( GetGWorldPixMap( (CGrafPtr) m_macPort ) ) ;
             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;
+            CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
         }
 #endif
     }
     else
     {
-        m_ok = FALSE;
+        m_ok = false;
     }
 }
 
@@ -135,14 +133,16 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const
 {
     if (m_selected.Ok())
     {
-        if (width) (*width) = m_selected.GetWidth();
-        if (height) (*height) = m_selected.GetHeight();
+        if (width)
+            (*width) = m_selected.GetWidth();
+        if (height)
+            (*height) = m_selected.GetHeight();
     }
     else
     {
-        if (width) (*width) = 0;
-        if (height) (*height) = 0;
+        if (width)
+            (*width) = 0;
+        if (height)
+            (*height) = 0;
     }
 }
-
-