fix Borland bug http://news.gmane.org/find-root.php?message_id=%3c43A0B07F.8010204...

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index fa2590f1bfe35ca6712679eb936c7ce6444e45ab..51fe726b1671148be4ab5e72b6601d6555729285 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -1,23 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dcclient.cpp
 // Purpose:     wxClientDC class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dcclient.cpp
 // Purpose:     wxClientDC class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dcclient.h"
-#endif
+#include "wx/wxprec.h"

 
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/region.h"
 #include "wx/window.h"
 
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/region.h"
 #include "wx/window.h"

-#include <math.h>
+#include "wx/toplevel.h"
+#include "wx/settings.h"
+#include "wx/math.h"
+#include "wx/mac/private.h"
+#include "wx/log.h"

 
 //-----------------------------------------------------------------------------
 // constants
 
 //-----------------------------------------------------------------------------
 // constants


@@ -29,85 +31,222 @@
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
 // wxPaintDC
 //-----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
 IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
 IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)

-#endif

 
 /*
  * wxWindowDC
  */
 
 #include "wx/mac/uma.h"
 
 /*
  * wxWindowDC
  */
 
 #include "wx/mac/uma.h"

+#include "wx/notebook.h"
+#include "wx/tabctrl.h"
+    
+
+static wxBrush MacGetBackgroundBrush( wxWindow* window )
+{
+    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 ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ) )
+            {
+                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 ;
+}    

 
 wxWindowDC::wxWindowDC() 
 {
 
 wxWindowDC::wxWindowDC() 
 {

+    m_window = NULL ;

 }
 
 }
 

-wxWindowDC::wxWindowDC(wxWindow *the_canvas) 
+wxWindowDC::wxWindowDC(wxWindow *window) 

 {
 {

-       wxTopLevelWindowMac* rootwindow = the_canvas->MacGetTopLevelWindow() ;
-       WindowRef windowref = rootwindow->MacGetWindowRef() ;
-       
-       int x , y ;
-       x = y = 0 ;
-       the_canvas->MacWindowToRootWindow( &x , &y ) ;
-       m_macLocalOrigin.h = x ;
-       m_macLocalOrigin.v = y ;
-       CopyRgn( the_canvas->MacGetVisibleRegion().GetWXHRGN() , m_macBoundaryClipRgn ) ;
-       OffsetRgn( m_macBoundaryClipRgn , m_macLocalOrigin.h , m_macLocalOrigin.v ) ;
-       CopyRgn( m_macBoundaryClipRgn , m_macCurrentClipRgn ) ;
-       m_macPort = UMAGetWindowPort( windowref ) ;
-       m_minY = m_minX =  0;
-       wxSize size = the_canvas->GetSize() ;
-       m_maxX = size.x  ;
-       m_maxY = size.y ; 
-
-       m_ok = TRUE ;
-  SetBackground(the_canvas->MacGetBackgroundBrush());
+    m_window = window ;
+    wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
+    if (!rootwindow)
+        return;
+
+    WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
+    int x , y ;
+    x = y = 0 ;
+    wxSize size = window->GetSize() ;
+    window->MacWindowToRootWindow( &x , &y ) ;
+    m_macPort = UMAGetWindowPort( windowref ) ;
+    
+#if wxMAC_USE_CORE_GRAPHICS
+    m_macLocalOriginInPort.x = x ;
+    m_macLocalOriginInPort.y = y ;
+
+    if ( window->MacGetCGContextRef() )
+    {
+        m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ;
+        m_graphicContext->SetPen( m_pen ) ;
+        m_graphicContext->SetBrush( m_brush ) ;
+        SetBackground(MacGetBackgroundBrush(window));        
+    }
+    else
+    {
+        // as out of order redraw is not supported under CQ, we have to create a qd port for these
+        // situations
+        m_macLocalOrigin.x = x ;
+        m_macLocalOrigin.y = y ;
+        
+        m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ;
+        m_graphicContext->SetPen( m_pen ) ;
+        m_graphicContext->SetBrush( m_brush ) ;
+        SetBackground(MacGetBackgroundBrush(window));
+    }
+    // there is no out-of-order drawing on OSX
+#else
+    m_macLocalOrigin.x = x ;
+    m_macLocalOrigin.y = y ;
+    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 ) ;
+    SetBackground(MacGetBackgroundBrush(window));
+#endif
+
+    m_ok = true ;
+    SetFont( window->GetFont() ) ;

 }
 
 wxWindowDC::~wxWindowDC()
 {
 }
 
 }
 
 wxWindowDC::~wxWindowDC()
 {
 }
 

+void wxWindowDC::DoGetSize( int* width, int* height ) const
+{
+    wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
+
+    m_window->GetSize(width, height);
+}
+

 /*
  * wxClientDC
  */
 
 wxClientDC::wxClientDC()
 {
 /*
  * wxClientDC
  */
 
 wxClientDC::wxClientDC()
 {

+    m_window = NULL ;

 }
 
 wxClientDC::wxClientDC(wxWindow *window)
 {
 }
 
 wxClientDC::wxClientDC(wxWindow *window)
 {

-       wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
-       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_macLocalOrigin.h = x ;
-       m_macLocalOrigin.v = y ;
-       SetRectRgn( m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ;
-       SectRgn( m_macBoundaryClipRgn , window->MacGetVisibleRegion().GetWXHRGN() , m_macBoundaryClipRgn ) ;
-       OffsetRgn( m_macBoundaryClipRgn , -origin.x , -origin.y ) ;
-       OffsetRgn( m_macBoundaryClipRgn , m_macLocalOrigin.h , m_macLocalOrigin.v ) ;
-       CopyRgn( m_macBoundaryClipRgn , m_macCurrentClipRgn ) ;
-       m_macPort = UMAGetWindowPort( windowref ) ;
-       m_minY = m_minX =  0;
-       m_maxX = size.x  ;
-       m_maxY = size.y ; 
-       m_ok = TRUE ;
-  SetBackground(window->MacGetBackgroundBrush());
-       SetFont( window->GetFont() ) ;
+    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 ) ;
+    
+#if wxMAC_USE_CORE_GRAPHICS
+    m_macLocalOriginInPort.x = x ;
+    m_macLocalOriginInPort.y = y ;
+    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
+    {
+        // as out of order redraw is not supported under CQ, we have to create a qd port for these
+        // situations
+        m_macLocalOrigin.x = x ;
+        m_macLocalOrigin.y = y ;
+        m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ;
+        m_graphicContext->SetPen( m_pen ) ;
+        m_graphicContext->SetBrush( m_brush ) ;
+     }
+#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 ) ;
+    OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
+    CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
+#endif
+
+    m_ok = true ;
+    SetBackground(MacGetBackgroundBrush(window));
+    SetFont( window->GetFont() ) ;

 }
 
 wxClientDC::~wxClientDC()
 {
 }
 
 wxClientDC::~wxClientDC()
 {

+#if wxMAC_USE_CORE_GRAPHICS
+/*
+    if ( m_window->MacGetCGContextRef() == 0)
+    {
+        CGContextRef cgContext = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ;
+        CGContextFlush( cgContext ) ;
+    }
+*/
+#endif
+}
+
+void wxClientDC::DoGetSize(int *width, int *height) const
+{
+    wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
+
+    m_window->GetClientSize( width, height );

 }
 
 /*
 }
 
 /*


@@ -116,35 +255,62 @@ wxClientDC::~wxClientDC()
 
 wxPaintDC::wxPaintDC()
 {
 
 wxPaintDC::wxPaintDC()
 {

+    m_window = NULL ;

 }
 
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
 }
 
 wxPaintDC::wxPaintDC(wxWindow *window)
 {

-       wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
-       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_macLocalOrigin.h = x ;
-       m_macLocalOrigin.v = y ;
-       SetRectRgn( m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ;
-       SectRgn( m_macBoundaryClipRgn , window->MacGetVisibleRegion().GetWXHRGN() , m_macBoundaryClipRgn ) ;
-       OffsetRgn( m_macBoundaryClipRgn , -origin.x , -origin.y ) ;
-  SectRgn( m_macBoundaryClipRgn  , window->GetUpdateRegion().GetWXHRGN() , m_macBoundaryClipRgn ) ;
-       OffsetRgn( m_macBoundaryClipRgn , m_macLocalOrigin.h , m_macLocalOrigin.v ) ;
-       CopyRgn( m_macBoundaryClipRgn , m_macCurrentClipRgn ) ;
-       m_macPort = UMAGetWindowPort( windowref ) ;
-       m_minY = m_minX =  0;
-       m_maxX = size.x  ;
-       m_maxY = size.y ; 
-       m_ok = TRUE ;
-  SetBackground(window->MacGetBackgroundBrush());
-       SetFont( window->GetFont() ) ;
+    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 ) ;
+
+#if wxMAC_USE_CORE_GRAPHICS
+    m_macLocalOriginInPort.x = x ;
+    m_macLocalOriginInPort.y = y ;
+    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
+
+    m_ok = true ;
+    SetFont( window->GetFont() ) ;

 }
 
 wxPaintDC::~wxPaintDC()
 {
 }
 }
 
 wxPaintDC::~wxPaintDC()
 {
 }

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