renamed RGBColor setter to avoid former overload being an override

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 9e35a5d561c26f27f93a0dfa030d47f2a1bb9be6..24e5d95e30e9234b734082559f5b3dc67c3dc2da 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -1,21 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcclient.cpp
+// Name:        src/mac/carbon/dcclient.cpp

 // Purpose:     wxClientDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxClientDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dcclient.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #include "wx/dcclient.h"
 #include "wx/wxprec.h"
 
 #include "wx/dcclient.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+

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


@@ -34,11 +35,9 @@
 // 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
 
 /*
  * wxWindowDC


@@ -47,19 +46,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
 #include "wx/mac/uma.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/mac/uma.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"

-    
+

 
 static wxBrush MacGetBackgroundBrush( wxWindow* window )
 {
     wxBrush bkdBrush = window->MacGetBackgroundBrush() ;
 
 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 !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
     // 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 )
+        while ( parent != NULL )

         {
             if ( parent->GetBackgroundColour() != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
             {
         {
             if ( parent->GetBackgroundColour() != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
             {


@@ -67,11 +68,13 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
                 bkdBrush.SetColour( parent->GetBackgroundColour() ) ;
                 break ;
             }
                 bkdBrush.SetColour( parent->GetBackgroundColour() ) ;
                 break ;
             }

+

             if ( parent->IsKindOf( CLASSINFO(wxTopLevelWindow) ) )
             {
                 bkdBrush = parent->MacGetBackgroundBrush() ;
                 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 } ;
             if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ) )
             {
                 Rect extent = { 0 , 0 , 0 , 0 } ;


@@ -84,45 +87,76 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
                 extent.top-- ;
                 extent.right = x + size.x ;
                 extent.bottom = y + size.y ;
                 extent.top-- ;
                 extent.right = x + size.x ;
                 extent.bottom = y + size.y ;

-                bkdBrush.MacSetThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ; 
+                bkdBrush.MacSetThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ;

                 break ;
             }
                 break ;
             }

-            
-            parent = parent->GetParent() ;  
+
+            parent = parent->GetParent() ;

         }
     }
         }
     }

+

     if ( !bkdBrush.Ok() || bkdBrush.GetStyle() == wxTRANSPARENT )
     {
         // if we did not find something, use a default
         bkdBrush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;
     }
     if ( !bkdBrush.Ok() || bkdBrush.GetStyle() == wxTRANSPARENT )
     {
         // if we did not find something, use a default
         bkdBrush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;
     }

-#endif    
-    return bkdBrush ;
-}    
+#endif

 
 

+    return bkdBrush ;
+}

 
 

-wxWindowDC::wxWindowDC() 
+wxWindowDC::wxWindowDC()

 {
     m_window = NULL ;
 }
 
 {
     m_window = NULL ;
 }
 

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

 {
     m_window = window ;
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
 {
     m_window = window ;
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;

+    if (!rootwindow)
+        return;
+

     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;

-    

     int x , y ;
     x = y = 0 ;
     int x , y ;
     x = y = 0 ;

+    wxSize size = window->GetSize() ;

     window->MacWindowToRootWindow( &x , &y ) ;
     window->MacWindowToRootWindow( &x , &y ) ;

+    m_macPort = UMAGetWindowPort( windowref ) ;
+    m_ok = true ;
+
+#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 ) ;
+    }
+    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 ) ;
+    }
+    // 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 ) ;
     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 ) ;

-    m_macPort = UMAGetWindowPort( windowref ) ;
-    m_ok = TRUE ;
+#endif

     SetBackground(MacGetBackgroundBrush(window));
     SetBackground(MacGetBackgroundBrush(window));

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

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


@@ -151,6 +185,7 @@ wxClientDC::wxClientDC(wxWindow *window)
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     if (!rootwindow)
         return;
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     if (!rootwindow)
         return;

+

     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
     wxPoint origin = window->GetClientAreaOrigin() ;
     wxSize size = window->GetClientSize() ;
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
     wxPoint origin = window->GetClientAreaOrigin() ;
     wxSize size = window->GetClientSize() ;


@@ -158,6 +193,30 @@ wxClientDC::wxClientDC(wxWindow *window)
     x = origin.x ;
     y = origin.y ;
     window->MacWindowToRootWindow( &x , &y ) ;
     x = origin.x ;
     y = origin.y ;
     window->MacWindowToRootWindow( &x , &y ) ;

+    m_macPort = UMAGetWindowPort( windowref ) ;
+    m_ok = true ;
+
+#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 ) ;
+    }
+    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 ) ;
     m_macLocalOrigin.x = x ;
     m_macLocalOrigin.y = y ;
     SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ;


@@ -165,15 +224,23 @@ wxClientDC::wxClientDC(wxWindow *window)
     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 ) ;
     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 ) ;

-    m_macPort = UMAGetWindowPort( windowref ) ;
+#endif

 
 

-    m_ok = TRUE ;

     SetBackground(MacGetBackgroundBrush(window));
     SetFont( window->GetFont() ) ;
 }
 
 wxClientDC::~wxClientDC()
 {
     SetBackground(MacGetBackgroundBrush(window));
     SetFont( window->GetFont() ) ;
 }
 
 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
 }
 
 void wxClientDC::DoGetSize(int *width, int *height) const


@@ -183,7 +250,6 @@ void wxClientDC::DoGetSize(int *width, int *height) const
     m_window->GetClientSize( width, height );
 }
 
     m_window->GetClientSize( width, height );
 }
 

-

 /*
  * wxPaintDC
  */
 /*
  * wxPaintDC
  */


@@ -204,6 +270,27 @@ wxPaintDC::wxPaintDC(wxWindow *window)
     x = origin.x ;
     y = origin.y ;
     window->MacWindowToRootWindow( &x , &y ) ;
     x = origin.x ;
     y = origin.y ;
     window->MacWindowToRootWindow( &x , &y ) ;

+    m_macPort = UMAGetWindowPort( windowref ) ;
+    m_ok = true ;
+
+#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 ) ;
     m_macLocalOrigin.x = x ;
     m_macLocalOrigin.y = y ;
     SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ;


@@ -212,10 +299,9 @@ wxPaintDC::wxPaintDC(wxWindow *window)
     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 ) ;
     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 ) ;

-    m_macPort = UMAGetWindowPort( windowref ) ;
-
-    m_ok = TRUE ;

     SetBackground(MacGetBackgroundBrush(window));
     SetBackground(MacGetBackgroundBrush(window));

+#endif
+

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


@@ -229,5 +315,3 @@ void wxPaintDC::DoGetSize(int *width, int *height) const
 
     m_window->GetClientSize( width, height );
 }
 
     m_window->GetClientSize( width, height );
 }

-
-