X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a1e9ff1c33b8c1f3882448deae8d5cfe6c204a2..974a50f1bbd6bcff1666fa492ee9802a6ee5b8da:/src/cocoa/dcmemory.mm

diff --git a/src/cocoa/dcmemory.mm b/src/cocoa/dcmemory.mm
index 0f2f04c365..bf3920f49e 100644
--- a/src/cocoa/dcmemory.mm
+++ b/src/cocoa/dcmemory.mm
@@ -6,10 +6,11 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
-// Licence:   	wxWidgets licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/dcmemory.h"
@@ -29,10 +30,13 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxDC)
 
-wxMemoryDC::wxMemoryDC(void)
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
 {
     m_cocoaNSImage = NULL;
     m_ok = false;
+
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);
 }
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
@@ -103,7 +107,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
             operation: NSCompositeCopy
             fraction: 1.0];
         [m_cocoaNSImage unlockFocus];
-        
+
         [nsimage release];
     }
 }
@@ -149,7 +153,7 @@ bool wxMemoryDC::CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest,
             width, height)
         operation: NSCompositeCopy // FIXME: raster ops
         fraction: 1.0];
-        
+
     [context restoreGraphicsState];
     return false;
 }