Fixed GetIcon to keep up with return type change on all other platforms.

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 710a8f89f43c3fb1813dee51d8092b136371d22e..f16d43979d6e71c08b894829ed61bdead9f64344 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -9,17 +9,17 @@
 // 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/toplevel.h"
-#include <math.h>
+#include "wx/settings.h"
+#include "wx/math.h"
 #include "wx/mac/private.h"
+#include "wx/log.h"
 
 //-----------------------------------------------------------------------------
 // constants
@@ -31,11 +31,9 @@
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
 IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
-#endif
 
 /*
  * wxWindowDC
@@ -49,14 +47,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
 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 )
+        while ( parent != NULL )
         {
             if ( parent->GetBackgroundColour() != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
             {
@@ -64,11 +64,13 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
                 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 } ;
@@ -88,16 +90,17 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
             parent = parent->GetParent() ;  
         }
     }
+
     if ( !bkdBrush.Ok() || bkdBrush.GetStyle() == wxTRANSPARENT )
     {
         // if we did not find something, use a default
         bkdBrush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;
     }
-#endif    
+#endif
+
     return bkdBrush ;
 }    
 
-
 wxWindowDC::wxWindowDC() 
 {
     m_window = NULL ;
@@ -107,19 +110,51 @@ wxWindowDC::wxWindowDC(wxWindow *window)
 {
     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 ) ;
+    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 ) ;
+        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().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
+    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 ;
     SetBackground(MacGetBackgroundBrush(window));
+#endif
+
+    SetFont( window->GetFont() ) ;
 }
 
 wxWindowDC::~wxWindowDC()
@@ -148,6 +183,7 @@ wxClientDC::wxClientDC(wxWindow *window)
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     if (!rootwindow)
         return;
+
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
     wxPoint origin = window->GetClientAreaOrigin() ;
     wxSize size = window->GetClientSize() ;
@@ -155,6 +191,31 @@ wxClientDC::wxClientDC(wxWindow *window)
     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
+    {
+        // 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 ) ;
@@ -162,15 +223,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 ) ;
-    m_macPort = UMAGetWindowPort( windowref ) ;
+#endif
 
-    m_ok = TRUE ;
     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
@@ -180,7 +249,6 @@ void wxClientDC::DoGetSize(int *width, int *height) const
     m_window->GetClientSize( width, height );
 }
 
-
 /*
  * wxPaintDC
  */
@@ -201,6 +269,27 @@ wxPaintDC::wxPaintDC(wxWindow *window)
     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 ) ;
@@ -209,10 +298,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 ) ;
-    m_macPort = UMAGetWindowPort( windowref ) ;
-
-    m_ok = TRUE ;
     SetBackground(MacGetBackgroundBrush(window));
+#endif
+
     SetFont( window->GetFont() ) ;
 }
 
@@ -226,5 +314,3 @@ void wxPaintDC::DoGetSize(int *width, int *height) const
 
     m_window->GetClientSize( width, height );
 }
-
-