Patch by David Brinegar to fix menubar updating after modal dialog shown

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 2d75ff390e174e56c7d30550518a8168cde05c7c..ac107c5cdfbcbb7a013de47f86b3e4f39cb398f3 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -9,16 +9,19 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "dcclient.h"
 #endif
 
 #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 "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/mac/private.h"
 
 //-----------------------------------------------------------------------------


@@ -106,9 +109,20 @@ wxWindowDC::wxWindowDC()
 wxWindowDC::wxWindowDC(wxWindow *window) 
 {
     m_window = window ;
 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
+        m_graphicContext = NULL ;
+    // there is no out-of-order drawing on OSX
+#else

     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;

-    

     int x , y ;
     x = y = 0 ;
     window->MacWindowToRootWindow( &x , &y ) ;
     int x , y ;
     x = y = 0 ;
     window->MacWindowToRootWindow( &x , &y ) ;


@@ -118,8 +132,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 ) ;
     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
+    m_ok = TRUE ;
+    SetFont( window->GetFont() ) ;

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


@@ -145,6 +161,41 @@ wxClientDC::wxClientDC()
 wxClientDC::wxClientDC(wxWindow *window)
 {
     m_window = window ;
 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 ) ;
+        SetBackground(MacGetBackgroundBrush(window));
+    }
+    else
+    {
+    /*
+        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_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));
+        m_ok = TRUE ;
+    */
+    }
+    m_ok = TRUE ;    
+#else

     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     if (!rootwindow)
         return;
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     if (!rootwindow)
         return;


@@ -163,8 +214,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 ) ;
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;

-

     m_ok = TRUE ;
     m_ok = TRUE ;

+#endif

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


@@ -193,6 +244,23 @@ wxPaintDC::wxPaintDC()
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
     m_window = window ;
 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() ;
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
     wxPoint origin = window->GetClientAreaOrigin() ;


@@ -210,9 +278,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 ) ;
     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));

+    m_ok = TRUE ;
+#endif

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