From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 31 Oct 2006 00:14:50 +0000 (+0000)
Subject: compilation fix after wxMemoryDCBase changes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/64dd1c46975c11ce63fc67918122ba5fab851f28

compilation fix after wxMemoryDCBase changes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/cocoa/dcmemory.mm b/src/cocoa/dcmemory.mm
index bf3920f49e..b6de98c880 100644
--- a/src/cocoa/dcmemory.mm
+++ b/src/cocoa/dcmemory.mm
@@ -30,19 +30,15 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxDC)
 
-wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
+void wxMemoryDC::Init()
 {
     m_cocoaNSImage = NULL;
     m_ok = false;
-
-    if ( bitmap.IsOk() )
-        SelectObject(bitmap);
 }
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
 {
-    m_cocoaNSImage = NULL;
-    m_ok = false;
+    Init();
 }
 
 wxMemoryDC::~wxMemoryDC(void)
@@ -75,7 +71,7 @@ bool wxMemoryDC::CocoaUnlockFocus()
 
 // NOTE: The AppKit is unable to draw onto an NSBitmapImageRep so we must
 // instead copy the data to an offscreen window, then copy it back
-void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
+void wxMemoryDC::DoSelect( const wxBitmap& bitmap )
 {
     wxAutoNSAutoreleasePool pool;
     if(m_selectedBitmap.Ok())