24x24 bitmaps and separator for flat style added

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 1d9ee2a5f4da40b511ab964abe9015e3b9ab1028..389da1fc6fd069aeb95e0ddf5d20069a08871164 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -23,6 +23,7 @@
 #include "wx/settings.h"
 #include "wx/math.h"
 #include "wx/mac/private.h"
+#include "wx/log.h"
 
 //-----------------------------------------------------------------------------
 // constants
@@ -109,9 +110,38 @@ wxWindowDC::wxWindowDC()
 wxWindowDC::wxWindowDC(wxWindow *window) 
 {
     m_window = window ;
+#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 ) ;
+        SetBackground(MacGetBackgroundBrush(window));        
+    }
+    else
+    {
+        // as out of order redraw is not supported under CQ, we have to create a qd port for these
+        // situations
+        wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
+        if (!rootwindow)
+            return;
+        WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
+        int x , y ;
+        x = y = 0 ;
+        window->MacWindowToRootWindow( &x , &y ) ;
+        m_macLocalOrigin.x = x ;
+        m_macLocalOrigin.y = y ;
+        CGrafPtr port = UMAGetWindowPort( windowref ) ;
+        
+        m_graphicContext = new wxMacCGContext( port ) ;
+        m_graphicContext->SetPen( m_pen ) ;
+        m_graphicContext->SetBrush( m_brush ) ;
+        SetBackground(MacGetBackgroundBrush(window));
+    }
+    // there is no out-of-order drawing on OSX
+#else
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
-    
     int x , y ;
     x = y = 0 ;
     window->MacWindowToRootWindow( &x , &y ) ;
@@ -121,9 +151,10 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
-    m_ok = TRUE ;
-    MacSetupGraphicContext() ;
     SetBackground(MacGetBackgroundBrush(window));
+#endif
+    m_ok = TRUE ;
+    SetFont( window->GetFont() ) ;
 }
 
 wxWindowDC::~wxWindowDC()
@@ -149,6 +180,41 @@ wxClientDC::wxClientDC()
 wxClientDC::wxClientDC(wxWindow *window)
 {
     m_window = window ;
+#if wxMAC_USE_CORE_GRAPHICS
+    m_graphicContext = NULL ;
+    if ( window->MacGetCGContextRef() )
+    {
+        m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ;
+        m_graphicContext->SetPen( m_pen ) ;
+        m_graphicContext->SetBrush( m_brush ) ;
+        wxSize size = window->GetClientSize() ;
+        m_ok = TRUE ;    
+        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
+        wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
+        if (!rootwindow)
+            return;
+        WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
+        wxPoint origin = window->GetClientAreaOrigin() ;
+        int x , y ;
+        x = origin.x ;
+        y = origin.y ;
+        window->MacWindowToRootWindow( &x , &y ) ;
+        m_macLocalOrigin.x = x ;
+        m_macLocalOrigin.y = y ;
+        CGrafPtr port = UMAGetWindowPort( windowref ) ;
+        
+        m_graphicContext = new wxMacCGContext( port ) ;
+        m_graphicContext->SetPen( m_pen ) ;
+        m_graphicContext->SetBrush( m_brush ) ;
+        m_ok = TRUE ;    
+     }
+#else
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     if (!rootwindow)
         return;
@@ -167,9 +233,8 @@ wxClientDC::wxClientDC(wxWindow *window)
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
-
     m_ok = TRUE ;
-    MacSetupGraphicContext() ;
+#endif
     SetBackground(MacGetBackgroundBrush(window));
     SetFont( window->GetFont() ) ;
 }
@@ -198,6 +263,23 @@ wxPaintDC::wxPaintDC()
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
     m_window = window ;
+#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 ) ;
+        SetBackground(MacGetBackgroundBrush(window));
+        m_ok = TRUE ;
+    }
+    else
+    {
+        wxLogDebug(wxT("You cannot create a wxPaintDC outside an OS-draw event") ) ;
+        m_graphicContext = NULL ;
+        m_ok = TRUE ;
+    }
+    // there is no out-of-order drawing on OSX
+#else
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
     wxPoint origin = window->GetClientAreaOrigin() ;
@@ -215,10 +297,9 @@ wxPaintDC::wxPaintDC(wxWindow *window)
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
-
-    m_ok = TRUE ;
-    MacSetupGraphicContext() ;
     SetBackground(MacGetBackgroundBrush(window));
+    m_ok = TRUE ;
+#endif
     SetFont( window->GetFont() ) ;
 }