minor fixes; replace references to Windows95 with references to wxMSW where possible

[wxWidgets.git] / src / osx / cocoa / utils.mm

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index 279adf36fc7684a3160118bd58cf492f6039a08b..ab7f2f4cff67b3bae7a2b2adb4de392d94310afe 100644 (file)
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/mac/cocoa/utils.mm
+// Name:        src/osx/cocoa/utils.mm
 // Purpose:     various cocoa utility functions
 // Author:      Stefan Csomor
 // Modified by:
@@ -30,9 +30,8 @@
 
 #if wxUSE_GUI
 #if wxOSX_USE_COCOA_OR_CARBON
-    #include "wx/osx/uma.h"
     #include <CoreServices/CoreServices.h>
-    #include <Carbon/Carbon.h>
+    #include "wx/osx/dcclient.h"
     #include "wx/osx/private/timer.h"
 #endif
 #endif // wxUSE_GUI
@@ -57,9 +56,20 @@ void wxMacWakeUp()
 }
 
 #endif // wxUSE_BASE
-
+ 
 #if wxUSE_GUI
 
+bool wxApp::DoInitGui()
+{
+    [NSApplication sharedApplication];
+    [NSApp finishLaunching];
+    return true;
+}
+
+void wxApp::DoCleanUp()
+{
+}
+
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {
     NSRect displayRect = [[NSScreen mainScreen] visibleFrame];
@@ -82,7 +92,7 @@ void wxGetMousePosition( int* x, int* y )
 
 wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
 {
-    return new wxCarbonTimerImpl(timer);
+    return new wxOSXTimerImpl(timer);
 }
 
 int gs_wxBusyCursorCount = 0;
@@ -131,6 +141,41 @@ void wxMacLocalToGlobal( WindowRef window , Point*pt )
 {
 }
 
+wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
+{
+    // wxScreenDC is derived from wxWindowDC, so a screen dc will
+    // call this method when a Blit is performed with it as a source.
+    if (!m_window)
+        return wxNullBitmap;
+        
+    wxSize sz = m_window->GetSize();
+    
+    int left = subrect != NULL ? subrect->x : 0 ;
+    int top = subrect != NULL ? subrect->y : 0 ;
+    int width = subrect != NULL ? subrect->width : sz.x;
+    int height = subrect !=  NULL ? subrect->height : sz.y ;
+    
+    NSRect rect = NSMakeRect(left, top, width, height );
+    NSView* view = (NSView*) m_window->GetHandle();
+    [view lockFocus];
+    // we use this method as other methods force a repaint, and this method can be 
+    // called from OnPaint, even with the window's paint dc as source (see wxHTMLWindow)
+    NSBitmapImageRep *rep = [[[NSBitmapImageRep alloc] initWithFocusedViewRect: [view bounds]] retain];
+    [view unlockFocus];
+    
+    CGImageRef cgImageRef = (CGImageRef)[rep CGImage]; 
+
+    wxBitmap bitmap(CGImageGetWidth(cgImageRef)  , CGImageGetHeight(cgImageRef) );
+    CGRect r = CGRectMake( 0 , 0 , CGImageGetWidth(cgImageRef)  , CGImageGetHeight(cgImageRef) );
+    // since our context is upside down we dont use CGContextDrawImage
+    wxMacDrawCGImage( (CGContextRef) bitmap.GetHBITMAP() , &r, cgImageRef ) ;
+    CGImageRelease(cgImageRef);
+    cgImageRef = NULL;
+    [rep release];
+        
+    return bitmap;
+}
+
 #endif // wxUSE_GUI