fix for 10.2 (persistent tooltips ;-)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/tooltip.cpp b/src/mac/carbon/tooltip.cpp
index ba6de8cc8a1c9123730510e71ac752e5eaf7ce68..5f71f00425c6c708e261d04175d1b9c1b8848516 100644 (file)
--- a/src/mac/carbon/tooltip.cpp
+++ b/src/mac/carbon/tooltip.cpp
@@ -290,21 +290,30 @@ void wxMacToolTip::Draw()
                ClipRect( &m_rect ) ;
                BackColor( whiteColor ) ;
                ForeColor(blackColor ) ;
                ClipRect( &m_rect ) ;
                BackColor( whiteColor ) ;
                ForeColor(blackColor ) ;

+                GWorldPtr port ;               
+                NewGWorld( &port , wxDisplayDepth() , &m_rect , NULL , NULL , 0 ) ;
+                CGrafPtr    origPort ;
+                GDHandle    origDevice ;
+    
+                GetGWorld( &origPort , &origDevice ) ;
+                SetGWorld( port , NULL ) ;
+           

                m_backpict = OpenPicture(&m_rect);
 
                CopyBits(GetPortBitMapForCopyBits(GetWindowPort(m_window)), 
                m_backpict = OpenPicture(&m_rect);
 
                CopyBits(GetPortBitMapForCopyBits(GetWindowPort(m_window)), 

-                                  GetPortBitMapForCopyBits(GetWindowPort(m_window)), 
+                                  GetPortBitMapForCopyBits(port), 

                                   &m_rect, 
                                   &m_rect, 
                                   srcCopy, 
                                   NULL);
                                   &m_rect, 
                                   &m_rect, 
                                   srcCopy, 
                                   NULL);

-
-               ClosePicture();
-        PenNormal() ;
+                ClosePicture();
+                SetGWorld( origPort , origDevice ) ;
+               DisposeGWorld( port ) ;
+                PenNormal() ;

 
                RGBColor tooltipbackground = { 0xFFFF , 0xFFFF , 0xC000 } ;
                BackColor( whiteColor ) ;
 
                RGBColor tooltipbackground = { 0xFFFF , 0xFFFF , 0xC000 } ;
                BackColor( whiteColor ) ;

-        RGBForeColor( &tooltipbackground ) ;
+                RGBForeColor( &tooltipbackground ) ;

 
                PaintRect( &m_rect ) ;
                ForeColor(blackColor ) ;
 
                PaintRect( &m_rect ) ;
                ForeColor(blackColor ) ;

diff --git a/src/mac/tooltip.cpp b/src/mac/tooltip.cpp
index ba6de8cc8a1c9123730510e71ac752e5eaf7ce68..5f71f00425c6c708e261d04175d1b9c1b8848516 100644 (file)
--- a/src/mac/tooltip.cpp
+++ b/src/mac/tooltip.cpp
@@ -290,21 +290,30 @@ void wxMacToolTip::Draw()
                ClipRect( &m_rect ) ;
                BackColor( whiteColor ) ;
                ForeColor(blackColor ) ;
                ClipRect( &m_rect ) ;
                BackColor( whiteColor ) ;
                ForeColor(blackColor ) ;

+                GWorldPtr port ;               
+                NewGWorld( &port , wxDisplayDepth() , &m_rect , NULL , NULL , 0 ) ;
+                CGrafPtr    origPort ;
+                GDHandle    origDevice ;
+    
+                GetGWorld( &origPort , &origDevice ) ;
+                SetGWorld( port , NULL ) ;
+           

                m_backpict = OpenPicture(&m_rect);
 
                CopyBits(GetPortBitMapForCopyBits(GetWindowPort(m_window)), 
                m_backpict = OpenPicture(&m_rect);
 
                CopyBits(GetPortBitMapForCopyBits(GetWindowPort(m_window)), 

-                                  GetPortBitMapForCopyBits(GetWindowPort(m_window)), 
+                                  GetPortBitMapForCopyBits(port), 

                                   &m_rect, 
                                   &m_rect, 
                                   srcCopy, 
                                   NULL);
                                   &m_rect, 
                                   &m_rect, 
                                   srcCopy, 
                                   NULL);

-
-               ClosePicture();
-        PenNormal() ;
+                ClosePicture();
+                SetGWorld( origPort , origDevice ) ;
+               DisposeGWorld( port ) ;
+                PenNormal() ;

 
                RGBColor tooltipbackground = { 0xFFFF , 0xFFFF , 0xC000 } ;
                BackColor( whiteColor ) ;
 
                RGBColor tooltipbackground = { 0xFFFF , 0xFFFF , 0xC000 } ;
                BackColor( whiteColor ) ;

-        RGBForeColor( &tooltipbackground ) ;
+                RGBForeColor( &tooltipbackground ) ;

 
                PaintRect( &m_rect ) ;
                ForeColor(blackColor ) ;
 
                PaintRect( &m_rect ) ;
                ForeColor(blackColor ) ;