X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6809556cfd702f2df901df261d959acb8376498..327940530ced978fa9cdef134a3a52ec8c1ee476:/src/mac/carbon/dc.cpp?ds=inline

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index 53ab8a3f7f..c0f44cf484 100644
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -79,8 +79,7 @@ public :
     wxMacFastPortSetter( const wxDC *dc ) 
     {
 	    wxASSERT( dc->Ok() ) ;
-	    GetPort( &m_oldPort ) ;
-	    SetPort( (GrafPtr) dc->m_macPort ) ;
+	    m_swapped = QDSwapPort( (GrafPtr) dc->m_macPort , &m_oldPort ) ;
 	    m_clipRgn = NewRgn() ;
 	    GetClip( m_clipRgn ) ;
 	    m_dc = dc ;
@@ -88,13 +87,15 @@ public :
     }
     ~wxMacFastPortSetter()
     {
-        SetPort( (GrafPtr) m_dc->m_macPort ) ;
+        // SetPort( (GrafPtr) m_dc->m_macPort ) ;
         SetClip( m_clipRgn ) ;
-	    SetPort( m_oldPort ) ;
+        if ( m_swapped )
+	        SetPort( m_oldPort ) ;
 	    m_dc->MacCleanupPort( NULL ) ;
 	    DisposeRgn( m_clipRgn ) ;
     }
 private :
+    bool m_swapped ;
     RgnHandle m_clipRgn ;
     GrafPtr m_oldPort ;
     const wxDC*   m_dc ;
@@ -107,6 +108,7 @@ typedef wxMacPortSetter wxMacFastPortSetter ;
 wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) :
     wxMacPortSaver( (GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) )
 {
+    m_newPort =(GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) ;
     m_formerClip = NewRgn() ;
     m_newClip = NewRgn() ;
     GetClip( m_formerClip ) ;
@@ -126,11 +128,26 @@ wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) :
 
 wxMacWindowClipper::~wxMacWindowClipper() 
 {
+    SetPort( m_newPort ) ;
     SetClip( m_formerClip ) ;
     DisposeRgn( m_newClip ) ;
     DisposeRgn( m_formerClip ) ;
 }
 
+wxMacWindowStateSaver::wxMacWindowStateSaver( const wxWindow* win ) :
+    wxMacWindowClipper( win )
+{
+    // the port is already set at this point
+    m_newPort =(GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) ;
+    GetThemeDrawingState( &m_themeDrawingState ) ;
+}
+
+wxMacWindowStateSaver::~wxMacWindowStateSaver() 
+{
+    SetPort( m_newPort ) ;
+    SetThemeDrawingState( m_themeDrawingState , true ) ;
+}
+
 //-----------------------------------------------------------------------------
 // Local functions
 //-----------------------------------------------------------------------------