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 8985e4edc435f3c3054fccd21878b17d89bda9e9..ee44e18330239ec7a8548e5dfa571feffe1a7769 100644 (file)
--- a/src/mac/carbon/dcmemory.cpp
+++ b/src/mac/carbon/dcmemory.cpp
@@ -21,7 +21,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
 

-wxMemoryDC::wxMemoryDC()
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )

 : m_selected()
 {
     m_ok = true;
 : m_selected()
 {
     m_ok = true;


@@ -30,6 +30,9 @@ wxMemoryDC::wxMemoryDC()
     SetPen(*wxBLACK_PEN);
     SetFont(*wxNORMAL_FONT);
     m_ok = false;
     SetPen(*wxBLACK_PEN);
     SetFont(*wxNORMAL_FONT);
     m_ok = false;

+
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);

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


@@ -105,6 +108,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
             m_graphicContext = new wxMacCGContext( bmCtx ) ;
             m_graphicContext->SetPen( m_pen ) ;
             m_graphicContext->SetBrush( m_brush ) ;
             m_graphicContext = new wxMacCGContext( bmCtx ) ;
             m_graphicContext->SetPen( m_pen ) ;
             m_graphicContext->SetBrush( m_brush ) ;

+            m_graphicContext->SetFont( m_font ) ;

         }
         m_ok = (m_graphicContext != NULL) ;
 
         }
         m_ok = (m_graphicContext != NULL) ;