slowly approaching dcscreen...

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index ac107c5cdfbcbb7a013de47f86b3e4f39cb398f3..f256b6b4ee6a01993c2fa8c718cc30ea9aed8a9e 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/settings.h"
 #include "wx/math.h"
 #include "wx/mac/private.h"

+#include "wx/log.h"

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


@@ -118,7 +119,25 @@ wxWindowDC::wxWindowDC(wxWindow *window)
         SetBackground(MacGetBackgroundBrush(window));
     }
     else
         SetBackground(MacGetBackgroundBrush(window));
     }
     else

-        m_graphicContext = NULL ;
+    {
+        // 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() ;
     // there is no out-of-order drawing on OSX
 #else
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;


@@ -172,13 +191,13 @@ wxClientDC::wxClientDC(wxWindow *window)
     }
     else
     {
     }
     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() ;
         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 ;
         int x , y ;
         x = origin.x ;
         y = origin.y ;


@@ -191,9 +210,7 @@ wxClientDC::wxClientDC(wxWindow *window)
         m_graphicContext->SetPen( m_pen ) ;
         m_graphicContext->SetBrush( m_brush ) ;
         SetBackground(MacGetBackgroundBrush(window));
         m_graphicContext->SetPen( m_pen ) ;
         m_graphicContext->SetBrush( m_brush ) ;
         SetBackground(MacGetBackgroundBrush(window));

-        m_ok = TRUE ;
-    */
-    }
+     }

     m_ok = TRUE ;    
 #else
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     m_ok = TRUE ;    
 #else
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;