Added wxUSE_POCKETPC_UI to distinguish between using

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

diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm
index cf80a9700eea2a2bb804d15d7efbf04bb8af60da..c40f86acae00cbec0113e480857c795ca88904e1 100644 (file)
--- a/src/cocoa/dc.mm
+++ b/src/cocoa/dc.mm
@@ -9,8 +9,11 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/dc.h"
-#include "wx/log.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/dc.h"
+#endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"
 
@@ -478,12 +481,11 @@ void wxDC::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask)
     [transform concat];
     [flipTransform concat];
 
-    NSImage *nsimage = [[NSImage alloc]
-            initWithSize:NSMakeSize(bmp.GetWidth(), bmp.GetHeight())];
-    [nsimage addRepresentation: const_cast<wxBitmap&>(bmp).GetNSBitmapImageRep()];
+    NSImage *nsimage = [bmp.GetNSImage(useMask) retain];
+
     [nsimage drawAtPoint: NSMakePoint(0,0)
         fromRect: NSMakeRect(0.0,0.0,bmp.GetWidth(),bmp.GetHeight())
-        operation: NSCompositeCopy
+        operation: NSCompositeSourceOver
         fraction: 1.0];
         
     [nsimage release];