Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

[wxWidgets.git] / src / cocoa / dcmemory.mm

diff --git a/src/cocoa/dcmemory.mm b/src/cocoa/dcmemory.mm
index 5c74dd212c43557409b9589c48d681a3675877d5..c8f1ff94b4150adefdf0790eb6dfdd18ff50b8a9 100644 (file)
--- a/src/cocoa/dcmemory.mm
+++ b/src/cocoa/dcmemory.mm
@@ -75,7 +75,7 @@ bool wxMemoryDCImpl::CocoaUnlockFocus()
 void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
 {
     wxAutoNSAutoreleasePool pool;
 void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
 {
     wxAutoNSAutoreleasePool pool;

-    if(m_selectedBitmap.Ok())
+    if(m_selectedBitmap.IsOk())

     {
         CocoaTakeFocus();
         wxASSERT(m_cocoaNSImage);
     {
         CocoaTakeFocus();
         wxASSERT(m_cocoaNSImage);


@@ -95,7 +95,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
     [m_cocoaNSImage release];
     m_cocoaNSImage = nil;
     m_selectedBitmap = bitmap;
     [m_cocoaNSImage release];
     m_cocoaNSImage = nil;
     m_selectedBitmap = bitmap;

-    if(m_selectedBitmap.Ok())
+    if(m_selectedBitmap.IsOk())

     {
         // Create an offscreen window of the same size
         m_cocoaNSImage = [[NSImage alloc]
     {
         // Create an offscreen window of the same size
         m_cocoaNSImage = [[NSImage alloc]


@@ -137,7 +137,7 @@ bool wxMemoryDCImpl::CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest,
     wxCoord width, wxCoord height, wxCoord xsrc, wxCoord ysrc,
     int logicalFunc, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask)
 {
     wxCoord width, wxCoord height, wxCoord xsrc, wxCoord ysrc,
     int logicalFunc, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask)
 {

-    if(!m_selectedBitmap.Ok())
+    if(!m_selectedBitmap.IsOk())

         return false;
 
     NSAffineTransform *transform = [NSAffineTransform transform];
         return false;
 
     NSAffineTransform *transform = [NSAffineTransform transform];