don't give error messages if ws2_32.dll is not available in wxGetHostName()

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

diff --git a/src/cocoa/dcmemory.mm b/src/cocoa/dcmemory.mm
index aead8b59e10eee62161882c26719f514787f848f..3e8d16339cd3224ecee54e3cbede9bae7c16be93 100644 (file)
--- a/src/cocoa/dcmemory.mm
+++ b/src/cocoa/dcmemory.mm
@@ -9,8 +9,11 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/dcmemory.h"
-#include "wx/log.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/dcmemory.h"
+#endif //WX_PRECOMP

 
 #import <AppKit/NSImage.h>
 #import <AppKit/NSAffineTransform.h>
 
 #import <AppKit/NSImage.h>
 #import <AppKit/NSAffineTransform.h>


@@ -86,10 +89,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
                     m_selectedBitmap.GetHeight())];
 
         // Now copy the data
                     m_selectedBitmap.GetHeight())];
 
         // Now copy the data

-        NSImage *nsimage = [[NSImage alloc]
-                initWithSize:NSMakeSize(m_selectedBitmap.GetWidth(),
-                    m_selectedBitmap.GetHeight())];
-        [nsimage addRepresentation: const_cast<wxBitmap&>(m_selectedBitmap).GetNSBitmapImageRep()];
+        NSImage *nsimage = [m_selectedBitmap.GetNSImage(false) retain];

         [m_cocoaNSImage lockFocus];
         [nsimage drawAtPoint: NSMakePoint(0,0)
             fromRect: NSMakeRect(0.0,0.0,m_selectedBitmap.GetWidth(),m_selectedBitmap.GetHeight())
         [m_cocoaNSImage lockFocus];
         [nsimage drawAtPoint: NSMakePoint(0,0)
             fromRect: NSMakeRect(0.0,0.0,m_selectedBitmap.GetWidth(),m_selectedBitmap.GetHeight())


@@ -135,7 +135,7 @@ bool wxMemoryDC::CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest,
     [transform concat];
     [flipTransform concat];
 
     [transform concat];
     [flipTransform concat];
 

-    wxLogDebug("[m_cocoaNSImage isFlipped]=%d", [m_cocoaNSImage isFlipped]);
+    wxLogDebug(wxT("[m_cocoaNSImage isFlipped]=%d"), [m_cocoaNSImage isFlipped]);

     [m_cocoaNSImage drawAtPoint: NSMakePoint(0,0)
         fromRect: NSMakeRect(xsrc,
             m_selectedBitmap.GetHeight()-height-ysrc,
     [m_cocoaNSImage drawAtPoint: NSMakePoint(0,0)
         fromRect: NSMakeRect(xsrc,
             m_selectedBitmap.GetHeight()-height-ysrc,