projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove instances where wxGenericImageList is included directly.
[wxWidgets.git]
/
src
/
cocoa
/
dcmemory.mm
diff --git
a/src/cocoa/dcmemory.mm
b/src/cocoa/dcmemory.mm
index 0f2f04c365e862307df8a0f9e2c9396cc0b6fc1b..218fb4ff8eedccfb39f61e9f409530de46d6ebe8 100644
(file)
--- 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
// Created: 2003/03/16
// RCS-ID: $Id$
// Copyright: (c) 2002 David Elliott
-// Licence: wxWidgets licence
+// Licence:
wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
+
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/dcmemory.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/dcmemory.h"
@@
-103,7
+104,7
@@
void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
operation: NSCompositeCopy
fraction: 1.0];
[m_cocoaNSImage unlockFocus];
operation: NSCompositeCopy
fraction: 1.0];
[m_cocoaNSImage unlockFocus];
-
+
[nsimage release];
}
}
[nsimage release];
}
}
@@
-149,7
+150,7
@@
bool wxMemoryDC::CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest,
width, height)
operation: NSCompositeCopy // FIXME: raster ops
fraction: 1.0];
width, height)
operation: NSCompositeCopy // FIXME: raster ops
fraction: 1.0];
-
+
[context restoreGraphicsState];
return false;
}
[context restoreGraphicsState];
return false;
}