gcc signed/unsigned comparison fix

[wxWidgets.git] / src / mac / carbon / dcclient.cpp

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 73d0d4d301c058a9fe96fcc60c3be923f48412ff..bd03115cb5b455720e7972f23b328349a52c0d3e 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -24,6 +24,7 @@
 #endif
 
 #include "wx/graphics.h"
+#include "wx/rawbmp.h"
 #include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------
@@ -120,9 +121,6 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     if (!rootwindow)
         return;
 
-    int x , y ;
-    x = y = 0 ;
-    window->MacWindowToRootWindow( &x , &y ) ;
     m_ok = true ;
 
 #if wxMAC_USE_CORE_GRAPHICS
@@ -132,7 +130,6 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     if ( cg == NULL )
     {
         SetGraphicsContext( wxGraphicsContext::Create( window ) ) ;
-        SetDeviceOrigin( x, y );
     }
     else
     {
@@ -149,6 +146,9 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     m_graphicContext->SetBrush( m_brush ) ;
     SetClippingRegion( 0 , 0 , m_width , m_height ) ;
 #else
+    int x , y ;
+    x = y = 0 ;
+    window->MacWindowToRootWindow( &x , &y ) ;
     m_macLocalOrigin.x = x ;
     m_macLocalOrigin.y = y ;
     m_macPort = UMAGetWindowPort( (WindowRef) rootwindow->MacGetWindowRef() ) ;
@@ -187,6 +187,57 @@ void wxWindowDC::DoGetSize( int* width, int* height ) const
 #endif
 }
 
+wxBitmap wxWindowDC::DoGetAsBitmap(const wxRect *subrect) const
+{
+    ControlRef handle = (ControlRef) m_window->GetHandle(); 
+    if ( !handle )
+        return wxNullBitmap;
+
+    HIRect rect;    
+    CGImageRef image;
+    CGContextRef context;
+    void* data;
+     
+    size_t bytesPerRow;
+    
+    HIViewCreateOffscreenImage( handle, 0, &rect, &image);
+    
+    
+    int width = subrect != NULL ? subrect->width : rect.size.width;
+    int height = subrect !=  NULL ? subrect->height : rect.size.height ; 
+    
+    bytesPerRow = ( ( width * 8 * 4 + 7 ) / 8 );
+
+    data = calloc( 1, bytesPerRow * height );
+    context = CGBitmapContextCreate( data, width, height, 8, bytesPerRow, CGColorSpaceCreateDeviceRGB(), kCGImageAlphaPremultipliedFirst );
+    
+    if ( subrect )
+        rect = CGRectOffset( rect, -subrect->x, -subrect->y ) ;
+    CGContextDrawImage( context, rect, image );
+
+    unsigned char* buffer = (unsigned char*) data;          
+    wxBitmap bmp = wxBitmap(width, height, 32);
+    wxAlphaPixelData pixData(bmp, wxPoint(0,0), wxSize(width, height));
+    
+    pixData.UseAlpha();
+    wxAlphaPixelData::Iterator p(pixData);
+    for (int y=0; y<height; y++) {
+        wxAlphaPixelData::Iterator rowStart = p;
+        for (int x=0; x<width; x++) {
+            unsigned char a = buffer[3];
+            p.Red()   = a; buffer++;
+            p.Green() = a; buffer++;
+            p.Blue()  = a; buffer++;
+            p.Alpha() = a; buffer++;
+            ++p; 
+        }
+        p = rowStart;
+        p.OffsetY(pixData, 1);
+    }
+    
+    return bmp;
+}
+
 /*
  * wxClientDC
  */
@@ -201,11 +252,6 @@ wxClientDC::wxClientDC(wxWindow *window) :
     wxWindowDC( window )
 {
     wxPoint origin = window->GetClientAreaOrigin() ;
-    wxSize size = window->GetClientSize() ;
-    int x , y ;
-    x = origin.x ;
-    y = origin.y ;
-    window->MacWindowToRootWindow( &x , &y ) ;
     m_window->GetClientSize( &m_width , &m_height);
     SetDeviceOrigin( origin.x, origin.y );
     SetClippingRegion( 0 , 0 , m_width , m_height ) ;
@@ -268,11 +314,6 @@ wxPaintDC::wxPaintDC(wxWindow *window) :
     wxWindowDC( window )
 {
     wxPoint origin = window->GetClientAreaOrigin() ;
-    wxSize size = window->GetClientSize() ;
-    int x , y ;
-    x = origin.x ;
-    y = origin.y ;
-    window->MacWindowToRootWindow( &x , &y ) ;
     m_window->GetClientSize( &m_width , &m_height);
     SetDeviceOrigin( origin.x, origin.y );
     SetClippingRegion( 0 , 0 , m_width , m_height ) ;