Correct format specifiers used to show wxIPV4address.

[wxWidgets.git] / src / osx / carbon / dcscreen.cpp

diff --git a/src/osx/carbon/dcscreen.cpp b/src/osx/carbon/dcscreen.cpp
index 6bb57f78b340ca1100e5fe4468a5d0f2ce42eeb6..6ce0de678aaba025dd4df57d0a7c263d2438349f 100644 (file)
--- a/src/osx/carbon/dcscreen.cpp
+++ b/src/osx/carbon/dcscreen.cpp
@@ -56,14 +56,18 @@ wxScreenDCImpl::wxScreenDCImpl( wxDC *owner ) :
 
 wxScreenDCImpl::~wxScreenDCImpl()
 {
 
 wxScreenDCImpl::~wxScreenDCImpl()
 {

-    delete m_graphicContext;
-    m_graphicContext = NULL;
+    wxDELETE(m_graphicContext);

 #if wxOSX_USE_COCOA_OR_IPHONE
 #else
     DisposeWindow((WindowRef) m_overlayWindow );
 #endif
 }
 
 #if wxOSX_USE_COCOA_OR_IPHONE
 #else
     DisposeWindow((WindowRef) m_overlayWindow );
 #endif
 }
 

+#if wxOSX_USE_IPHONE
+// Apple has allowed usage of this API as of 15th Dec 2009w
+extern CGImageRef UIGetScreenImage();
+#endif
+

 // TODO Switch to CGWindowListCreateImage for 10.5 and above
 
 wxBitmap wxScreenDCImpl::DoGetAsBitmap(const wxRect *subrect) const
 // TODO Switch to CGWindowListCreateImage for 10.5 and above
 
 wxBitmap wxScreenDCImpl::DoGetAsBitmap(const wxRect *subrect) const


@@ -90,8 +94,12 @@ wxBitmap wxScreenDCImpl::DoGetAsBitmap(const wxRect *subrect) const
     wxASSERT_MSG(image, wxT("wxScreenDC::GetAsBitmap - unable to get screenshot."));
 
     CGContextDrawImage(context, srcRect, image);
     wxASSERT_MSG(image, wxT("wxScreenDC::GetAsBitmap - unable to get screenshot."));
 
     CGContextDrawImage(context, srcRect, image);

+    
+    CGImageRelease(image);

 
     CGContextRestoreGState(context);
 
     CGContextRestoreGState(context);

+#else
+    // TODO implement using UIGetScreenImage, CGImageCreateWithImageInRect, CGContextDrawImage

 #endif
     return bmp;
 }
 #endif
     return bmp;
 }