X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a1e9ff1c33b8c1f3882448deae8d5cfe6c204a2..081fcce3ba1647a7bf739a55a1432ebf3c676128:/src/cocoa/dcmemory.mm diff --git a/src/cocoa/dcmemory.mm b/src/cocoa/dcmemory.mm index 0f2f04c365..b6de98c880 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,7 +30,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxDC) -wxMemoryDC::wxMemoryDC(void) +void wxMemoryDC::Init() { m_cocoaNSImage = NULL; m_ok = false; @@ -37,8 +38,7 @@ wxMemoryDC::wxMemoryDC(void) wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) ) { - m_cocoaNSImage = NULL; - m_ok = false; + Init(); } wxMemoryDC::~wxMemoryDC(void) @@ -71,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()) @@ -103,7 +103,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) operation: NSCompositeCopy fraction: 1.0]; [m_cocoaNSImage unlockFocus]; - + [nsimage release]; } } @@ -149,7 +149,7 @@ bool wxMemoryDC::CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest, width, height) operation: NSCompositeCopy // FIXME: raster ops fraction: 1.0]; - + [context restoreGraphicsState]; return false; }