moving tlw list up, cleanup

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index affb800da12aaecfffae74e99b32bf13fcc7de5d..4c2c1a8b9fc30574ff05561b3f878bea50431eba 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/mac/carbon/dcclient.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/mac/carbon/dcclient.cpp

-// Purpose:     wxClientDC class
+// Purpose:     wxClientDCImpl class

 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97


@@ -23,316 +23,181 @@
     #include "wx/region.h"
 #endif
 
     #include "wx/region.h"
 #endif
 

+#include "wx/graphics.h"
+#include "wx/rawbmp.h"

 #include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------

-// constants
+// wxWindowDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-//-----------------------------------------------------------------------------
-// wxPaintDC
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
-IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
-IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
-
-/*
- * wxWindowDC
- */
-
-#include "wx/mac/uma.h"
-#include "wx/notebook.h"
-#include "wx/tabctrl.h"
-
+IMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxGCDCImpl)

 
 

-static wxBrush MacGetBackgroundBrush( wxWindow* window )
+wxWindowDCImpl::wxWindowDCImpl( wxDC *owner )
+   : wxGCDCImpl( owner )

 {
 {

-    wxBrush bkdBrush = window->MacGetBackgroundBrush() ;
-
-#if !TARGET_API_MAC_OSX
-    // transparency cannot be handled by the OS when not using composited windows
-    wxWindow* parent = window->GetParent() ;
-
-    // if we have some 'pseudo' transparency
-    if ( ! bkdBrush.Ok() || bkdBrush.GetStyle() == wxTRANSPARENT || window->GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
-    {
-        // walk up until we find something
-        while ( parent != NULL )
-        {
-            if ( parent->GetBackgroundColour() != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
-            {
-                // if we have any other colours in the hierarchy
-                bkdBrush.SetColour( parent->GetBackgroundColour() ) ;
-                break ;
-            }
-
-            if ( parent->IsKindOf( CLASSINFO(wxTopLevelWindow) ) )
-            {
-                bkdBrush = parent->MacGetBackgroundBrush() ;
-                break ;
-            }
-
-            if ( parent->IsKindOf( CLASSINFO( wxNotebook ) )
-#if wxUSE_TAB_DIALOG
-                 || parent->IsKindOf( CLASSINFO( wxTabCtrl ) )
-#endif // wxUSE_TAB_DIALOG
-                )
-            {
-                Rect extent = { 0 , 0 , 0 , 0 } ;
-                int x , y ;
-                x = y = 0 ;
-                wxSize size = parent->GetSize() ;
-                parent->MacClientToRootWindow( &x , &y ) ;
-                extent.left = x ;
-                extent.top = y ;
-                extent.top-- ;
-                extent.right = x + size.x ;
-                extent.bottom = y + size.y ;
-                bkdBrush.MacSetThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ;
-                break ;
-            }
-
-            parent = parent->GetParent() ;
-        }
-    }
-
-    if ( !bkdBrush.Ok() || bkdBrush.GetStyle() == wxTRANSPARENT )
-    {
-        // if we did not find something, use a default
-        bkdBrush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;
-    }
-#endif
-
-    return bkdBrush ;
+    m_release = false;

 }
 
 }
 

-wxWindowDC::wxWindowDC()
+wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window )
+   : wxGCDCImpl( owner )

 {
 {

-    m_window = NULL ;
-}
-
-wxWindowDC::wxWindowDC(wxWindow *window)
-{
-    m_window = window ;
-    wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
+    m_window = window;
+    
+    WindowRef rootwindow = (WindowRef) window->MacGetTopLevelWindowRef() ;

     if (!rootwindow)
         return;
 
     if (!rootwindow)
         return;
 

-    WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
-    int x , y ;
-    x = y = 0 ;
-    window->MacWindowToRootWindow( &x , &y ) ;

     m_ok = true ;
 
     m_ok = true ;
 

-#if wxMAC_USE_CORE_GRAPHICS

     m_window->GetSize( &m_width , &m_height);
     m_window->GetSize( &m_width , &m_height);

-       CGContextRef cg = (CGContextRef) window->MacGetCGContextRef();
-       m_release = false;
+    CGContextRef cg = (CGContextRef) window->MacGetCGContextRef();
+    m_release = false;

     if ( cg == NULL )
     if ( cg == NULL )

-       {
-               SetGraphicsContext( wxGraphicsContext::Create( window ) ) ;
-               SetDeviceOrigin( x, y );
-       }
-       else
-       {
-               CGContextSaveGState( cg );
-               m_release = true ;
-               // make sure the context is having its origin at the wx-window coordinates of the 
-               // view (read at the top of window.cpp about the differences)
-               if ( window->MacGetLeftBorderSize() != 0 || window->MacGetTopBorderSize() != 0 )
-                       CGContextTranslateCTM( cg , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() );
-               
-               SetGraphicsContext( wxGraphicsContext::CreateFromNative( cg ) );
-       }
-       m_graphicContext->SetPen( m_pen ) ;
-       m_graphicContext->SetBrush( m_brush ) ;
-       SetClippingRegion( 0 , 0 , m_width , m_height ) ;
-#else
-       m_macLocalOrigin.x = x ;
-       m_macLocalOrigin.y = y ;
-    m_macPort = UMAGetWindowPort( windowref ) ;
+    {
+        SetGraphicsContext( wxGraphicsContext::Create( window ) ) ;
+    }
+    else
+    {
+        CGContextSaveGState( cg );
+        m_release = true ;
+        // make sure the context is having its origin at the wx-window coordinates of the
+        // view (read at the top of window.cpp about the differences)
+        if ( window->MacGetLeftBorderSize() != 0 || window->MacGetTopBorderSize() != 0 )
+            CGContextTranslateCTM( cg , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() );
+
+        SetGraphicsContext( wxGraphicsContext::CreateFromNative( cg ) );
+    }
+    DoSetClippingRegion( 0 , 0 , m_width , m_height ) ;

 
 

-    CopyRgn( (RgnHandle) window->MacGetVisibleRegion(true).GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
-    OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
-    CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
-#endif
-    SetBackground(MacGetBackgroundBrush(window));
+    SetBackground(wxBrush(window->GetBackgroundColour(),wxSOLID));

 
     SetFont( window->GetFont() ) ;
 }
 
 
     SetFont( window->GetFont() ) ;
 }
 

-wxWindowDC::~wxWindowDC()
+wxWindowDCImpl::~wxWindowDCImpl()

 {
 {

-#if wxMAC_USE_CORE_GRAPHICS
-       if ( m_release && m_graphicContext )
-       {
-               CGContextRef cg = (CGContextRef) m_window->MacGetCGContextRef();
-               CGContextRestoreGState(cg);
-//             CGContextRef cg = (CGContextRef) m_graphicContext->GetNativeContext() ;
-       }
-#endif
+    if ( m_release )
+    {
+        // this must not necessarily be the current context, we must restore the state of the
+        // cg we started with above (before the CGContextTranslateCTM call)
+        CGContextRef cg = (CGContextRef) m_window->MacGetCGContextRef();
+        CGContextRestoreGState(cg);
+    }

 }
 
 }
 

-void wxWindowDC::DoGetSize( int* width, int* height ) const
+void wxWindowDCImpl::DoGetSize( int* width, int* height ) const

 {
 {

-    wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
+    if ( width )
+        *width = m_width;
+    if ( height )
+        *height = m_height;
+}

 
 

-#if wxMAC_USE_CORE_GRAPHICS
-       if ( width )
-               *width = m_width;
-       if ( height )
-               *height = m_height;
+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;
+
+#ifdef __LP64__
+    return wxNullBitmap;

 #else
 #else

-    m_window->GetSize(width, height);
+    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 : (int)rect.size.width;
+    int height = subrect !=  NULL ? subrect->height : (int)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));
+
+    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;

 #endif
 }
 
 /*
 #endif
 }
 
 /*

- * wxClientDC
+ * wxClientDCImpl

  */
 
  */
 

-wxClientDC::wxClientDC()
+IMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl)
+
+wxClientDCImpl::wxClientDCImpl( wxDC *owner )
+ : wxWindowDCImpl( owner )

 {
 {

-    m_window = NULL ;

 }
 
 }
 

-#if wxMAC_USE_CORE_GRAPHICS
-wxClientDC::wxClientDC(wxWindow *window) :
-       wxWindowDC( window )
+wxClientDCImpl::wxClientDCImpl( wxDC *owner, wxWindow *window ) :
+    wxWindowDCImpl( owner, window )

 {
 {

+    wxCHECK_RET( window, _T("invalid window in wxClientDCImpl") );

     wxPoint origin = window->GetClientAreaOrigin() ;
     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);
     m_window->GetClientSize( &m_width , &m_height);

-       SetDeviceOrigin( origin.x, origin.y );
-       SetClippingRegion( 0 , 0 , m_width , m_height ) ;
+    SetDeviceOrigin( origin.x, origin.y );
+    DoSetClippingRegion( 0 , 0 , m_width , m_height ) ;

 }
 }

-#else
-wxClientDC::wxClientDC(wxWindow *window)
-{
-    m_window = window ;
-    wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
-    if (!rootwindow)
-        return;
-
-    WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
-    wxPoint origin = window->GetClientAreaOrigin() ;
-    wxSize size = window->GetClientSize() ;
-    int x , y ;
-    x = origin.x ;
-    y = origin.y ;
-    window->MacWindowToRootWindow( &x , &y ) ;
-    m_macPort = UMAGetWindowPort( windowref ) ;
-    m_ok = true ;
-
-    m_macLocalOrigin.x = x ;
-    m_macLocalOrigin.y = y ;
-    SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ;
-    SectRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) window->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
-    OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , -origin.x , -origin.y ) ;
-    OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
-    CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;

 
 

-    SetBackground(MacGetBackgroundBrush(window));
-    SetFont( window->GetFont() ) ;
-}
-#endif
-
-wxClientDC::~wxClientDC()
+wxClientDCImpl::~wxClientDCImpl()

 {
 }
 
 {
 }
 

-#if !wxMAC_USE_CORE_GRAPHICS
-void wxClientDC::DoGetSize(int *width, int *height) const
-{
-    wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
-
-    m_window->GetClientSize( width, height );
-}
-#endif
-

 /*
 /*

- * wxPaintDC
+ * wxPaintDCImpl

  */
 
  */
 

-wxPaintDC::wxPaintDC()
+IMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxWindowDCImpl)
+
+wxPaintDCImpl::wxPaintDCImpl( wxDC *owner )
+ : wxWindowDCImpl( owner )

 {
 {

-    m_window = NULL ;

 }
 
 }
 

-#if wxMAC_USE_CORE_GRAPHICS
-wxPaintDC::wxPaintDC(wxWindow *window) :
-       wxWindowDC( window )
+wxPaintDCImpl::wxPaintDCImpl( wxDC *owner, wxWindow *window ) :
+    wxWindowDCImpl( owner, window )

 {
     wxPoint origin = window->GetClientAreaOrigin() ;
 {
     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);
     m_window->GetClientSize( &m_width , &m_height);

-       SetDeviceOrigin( origin.x, origin.y );
-       SetClippingRegion( 0 , 0 , m_width , m_height ) ;
-}
-#else
-wxPaintDC::wxPaintDC(wxWindow *window)
-{
-    m_window = window ;
-    wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
-    WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
-    wxPoint origin = window->GetClientAreaOrigin() ;
-    wxSize size = window->GetClientSize() ;
-    int x , y ;
-    x = origin.x ;
-    y = origin.y ;
-    window->MacWindowToRootWindow( &x , &y ) ;
-    m_macPort = UMAGetWindowPort( windowref ) ;
-    m_ok = true ;
-
-#if wxMAC_USE_CORE_GRAPHICS
-    if ( window->MacGetCGContextRef() )
-    {
-        m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ;
-        m_graphicContext->SetPen( m_pen ) ;
-        m_graphicContext->SetBrush( m_brush ) ;
-        SetClippingRegion( 0 , 0 , size.x , size.y ) ;
-        SetBackground(MacGetBackgroundBrush(window));
-    }
-    else
-    {
-        wxLogDebug(wxT("You cannot create a wxPaintDC outside an OS-draw event") ) ;
-        m_graphicContext = NULL ;
-    }
-    // there is no out-of-order drawing on OSX
-#else
-    m_macLocalOrigin.x = x ;
-    m_macLocalOrigin.y = y ;
-    SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ;
-    SectRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) window->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
-    OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , -origin.x , -origin.y ) ;
-    SectRgn( (RgnHandle) m_macBoundaryClipRgn  , (RgnHandle) window->GetUpdateRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
-    OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
-    CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
-    SetBackground(MacGetBackgroundBrush(window));
-#endif
-
-    SetFont( window->GetFont() ) ;
+    SetDeviceOrigin( origin.x, origin.y );
+    DoSetClippingRegion( 0 , 0 , m_width , m_height ) ;

 }
 }

-#endif

 
 

-wxPaintDC::~wxPaintDC()
+wxPaintDCImpl::~wxPaintDCImpl()

 {
 }
 {
 }

-
-#if !wxMAC_USE_CORE_GRAPHICS
-void wxPaintDC::DoGetSize(int *width, int *height) const
-{
-    wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
-
-    m_window->GetClientSize( width, height );
-}
-#endif