X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9aad97fdccec36de273a39a2b954c7da84e8df70..2ed76cd9b7d5922971093514f585fcaf65ed792c:/src/mac/carbon/tooltip.cpp?ds=sidebyside

diff --git a/src/mac/carbon/tooltip.cpp b/src/mac/carbon/tooltip.cpp
index 6787a92315..5ddf8b92e2 100644
--- a/src/mac/carbon/tooltip.cpp
+++ b/src/mac/carbon/tooltip.cpp
@@ -21,13 +21,14 @@
 #include "wx/tooltip.h"
 #include "wx/timer.h"
 #include "wx/geometry.h"
-#include "wx/mac/aga.h"
 #include "wx/mac/uma.h"
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
+class wxMacToolTipTimer ;
+
 class wxMacToolTip
 {
 	public :
@@ -48,21 +49,21 @@ class wxMacToolTip
 		PicHandle	m_backpict ;
 		bool		m_shown ;
 		long		m_mark ;
+		wxMacToolTipTimer* m_timer ;
 } ;
 
 class wxMacToolTipTimer : wxTimer
 {
 public:
+	wxMacToolTipTimer() {} ;
 	wxMacToolTipTimer(wxMacToolTip* tip, int iMilliseconds) ;
-
+    virtual ~wxMacToolTipTimer() {} ;
 	void Notify()
 	{
 		if ( m_mark == m_tip->GetMark() )
 			m_tip->Draw() ;
 
-		delete this;
 	}
-	
 protected:
 	wxMacToolTip* 	m_tip;
 	long			m_mark ;
@@ -148,7 +149,7 @@ void wxToolTip::RelayEvent( wxWindow *win , wxMouseEvent &event )
 				s_ToolTipArea = wxRect2DInt( event.m_x - 2 , event.m_y - 2 , 4 , 4 ) ;
 				s_LastWindowEntered = win ;
 				
-				WindowRef window = win->GetMacRootWindow() ;
+				WindowRef window = MAC_WXHWND( win->MacGetRootWindow() ) ;
 				int x = event.m_x ;
 				int y = event.m_y ;
 				wxPoint local( x , y ) ;
@@ -179,22 +180,27 @@ wxMacToolTip::wxMacToolTip()
 	m_backpict = NULL ;
 	m_mark = 0 ;
 	m_shown = false ;
+    m_timer = NULL ;
 }
 
 void wxMacToolTip::Setup( WindowRef window  , wxString text , wxPoint localPosition ) 
 {
 	m_mark++ ;
 	Clear() ;
-	m_position = localPosition ; 
+	m_position = localPosition ;
 	m_label = wxMacMakeMacStringFromPC( text ) ;
 	m_window = window ;
 	s_ToolTipWindowRef = window ;
 	m_backpict = NULL ;
-	new wxMacToolTipTimer( this , s_ToolTipDelay ) ;
+	if ( m_timer )
+	    delete m_timer ;
+	m_timer = new wxMacToolTipTimer( this , s_ToolTipDelay ) ;
 }
 
 wxMacToolTip::~wxMacToolTip() 
 {
+    if ( m_timer )
+        delete m_timer ;
 	if ( m_backpict ) 
 		Clear() ;
 }
@@ -209,98 +215,104 @@ void wxMacToolTip::Draw()
 		
 	if ( m_window == s_ToolTipWindowRef )
 	{
-		#if TARGET_CARBON
-		AGAPortHelper help( GetWindowPort( m_window ) );
-		#else
-		AGAPortHelper help( ( m_window ) );
-		#endif
-		m_shown = true ;
-
-		SetOrigin( 0 , 0 ) ;
-		TextFont( kFontIDGeneva ) ;
-		TextSize( 10 ) ;
-		TextFace( 0 ) ;
-		FontInfo fontInfo;
-		::GetFontInfo(&fontInfo);
-		short lineh = fontInfo.ascent + fontInfo.descent + fontInfo.leading;
-		short height = 0 ;
-	//	short width = TextWidth( m_label , 0 ,m_label.Length() ) ;
-		
-		int i = 0 ;
-		int length = m_label.Length() ;
-		int width = 0 ;
-		int thiswidth = 0 ;
-		int laststop = 0 ;
-		const char *text = m_label ;
-		while( i < length )
-		{
-			if( text[i] == 13 || text[i] == 10)
-			{
-				thiswidth = ::TextWidth( text , laststop , i - laststop ) ;
-				if ( thiswidth > width )
-					width = thiswidth ;
-					
-				height += lineh ;
-				laststop = i+1 ;
-			}
-			i++ ;
-		}
-		if ( i - laststop > 0 )
-		{
-			thiswidth = ::TextWidth( text , laststop , i - laststop ) ;
-			if ( thiswidth > width )
-				width = thiswidth ;
-			height += lineh ;
-		}
-
-
-		m_rect.left = m_position.x + kTipOffset;
-		m_rect.top = m_position.y + kTipOffset;
-		m_rect.right = m_rect.left + width + 2 * kTipBorder;
-		m_rect.bottom = m_rect.top + height + 2 * kTipBorder;
-		ClipRect( &m_rect ) ;
-		BackColor( whiteColor ) ;
-		ForeColor(blackColor ) ;
-		m_backpict = OpenPicture(&m_rect);
-
-		CopyBits(GetPortBitMapForCopyBits(GetWindowPort(m_window)), 
-				   GetPortBitMapForCopyBits(GetWindowPort(m_window)), 
-				   &m_rect, 
-				   &m_rect, 
-				   srcCopy, 
-				   NULL);
-
-		ClosePicture();
-		RGBColor yellow = { 0xFFFF  , 0xFFFF , (153<<8)+153 } ;
-		RGBBackColor( &yellow ) ;
-		EraseRect( &m_rect ) ;
-		FrameRect( &m_rect ) ;
-		BackColor( whiteColor ) ;
-		ForeColor(blackColor ) ;
-		::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder);
-
-		i = 0 ;
-		laststop = 0 ;
-		height = 0 ;
-		while( i < length )
-		{
-			if( text[i] == 13 || text[i] == 10)
-			{
-				::DrawText( text , laststop , i - laststop ) ;
-				height += lineh ;
-				::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder + height );
-				laststop = i+1 ;
-			}
-			i++ ;
-		}
-					
-		::DrawText( text , laststop , i - laststop ) ;
-		::TextMode( srcOr ) ;		
-	//	DrawText( m_label , 0 , m_label.Length() ) ;
+#if TARGET_CARBON
+/*
+	  if ( HMDisplayTag != (void*) kUnresolvedCFragSymbolAddress )
+	  {
+	    HMDisplayTag( 
+	  }
+	  else
+*/
+#endif
+	  {
+   		wxMacPortStateHelper help( GetWindowPort( m_window ) );
+ 
+  		m_shown = true ;
+
+  		TextFont( kFontIDGeneva ) ;
+  		TextSize( 10 ) ;
+  		TextFace( 0 ) ;
+  		FontInfo fontInfo;
+  		::GetFontInfo(&fontInfo);
+  		short lineh = fontInfo.ascent + fontInfo.descent + fontInfo.leading;
+  		short height = 0 ;
+  	//	short width = TextWidth( m_label , 0 ,m_label.Length() ) ;
+  		
+  		int i = 0 ;
+  		int length = m_label.Length() ;
+  		int width = 0 ;
+  		int thiswidth = 0 ;
+  		int laststop = 0 ;
+  		const char *text = m_label ;
+  		while( i < length )
+  		{
+  			if( text[i] == 13 || text[i] == 10)
+  			{
+  				thiswidth = ::TextWidth( text , laststop , i - laststop ) ;
+  				if ( thiswidth > width )
+  					width = thiswidth ;
+  					
+  				height += lineh ;
+  				laststop = i+1 ;
+  			}
+  			i++ ;
+  		}
+  		if ( i - laststop > 0 )
+  		{
+  			thiswidth = ::TextWidth( text , laststop , i - laststop ) ;
+  			if ( thiswidth > width )
+  				width = thiswidth ;
+  			height += lineh ;
+  		}
+
+
+  		m_rect.left = m_position.x + kTipOffset;
+  		m_rect.top = m_position.y + kTipOffset;
+  		m_rect.right = m_rect.left + width + 2 * kTipBorder;
+  		m_rect.bottom = m_rect.top + height + 2 * kTipBorder;
+  		ClipRect( &m_rect ) ;
+  		BackColor( whiteColor ) ;
+  		ForeColor(blackColor ) ;
+  		m_backpict = OpenPicture(&m_rect);
+
+  		CopyBits(GetPortBitMapForCopyBits(GetWindowPort(m_window)), 
+  				   GetPortBitMapForCopyBits(GetWindowPort(m_window)), 
+  				   &m_rect, 
+  				   &m_rect, 
+  				   srcCopy, 
+  				   NULL);
+
+  		ClosePicture();
+      PenNormal() ;
+  		SetThemeBackground(kThemeBrushNotificationWindowBackground,32,true) ;
+  		SetThemeTextColor(kThemeTextColorNotification,32,true) ;
+  		EraseRect( &m_rect ) ;
+  		FrameRect( &m_rect ) ;
+  		::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder);
+
+  		i = 0 ;
+  		laststop = 0 ;
+  		height = 0 ;
+  		while( i < length )
+  		{
+  			if( text[i] == 13 || text[i] == 10)
+  			{
+  				::DrawText( text , laststop , i - laststop ) ;
+  				height += lineh ;
+  				::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder + height );
+  				laststop = i+1 ;
+  			}
+  			i++ ;
+  		}
+  					
+  		::DrawText( text , laststop , i - laststop ) ;
+  		::TextMode( srcOr ) ;		
+  	//	DrawText( m_label , 0 , m_label.Length() ) ;
+  	}
 	}
 }
 
-void wxToolTip::NotifyWindowDelete( WindowRef win ) 
+void wxToolTip::NotifyWindowDelete( WXHWND win ) 
 {
 	if ( win == s_ToolTipWindowRef )
 	{
@@ -311,19 +323,20 @@ void wxToolTip::NotifyWindowDelete( WindowRef win )
 void wxMacToolTip::Clear()
 {
 	m_mark++ ;
+	if ( m_timer )
+	{
+	    delete m_timer ;
+	    m_timer = NULL ;
+	}
 	if ( !m_shown )
 		return ;
 		 
 	if ( m_window == s_ToolTipWindowRef && m_backpict )
 	{
-		#if TARGET_CARBON
-		AGAPortHelper help( GetWindowPort(m_window) ) ;
-		#else
-		AGAPortHelper help( (m_window) ) ;
-		#endif
+		wxMacPortStateHelper help( GetWindowPort(m_window) ) ;
+
 		m_shown = false ;
 
-		SetOrigin( 0 , 0 ) ;
 		BackColor( whiteColor ) ;
 		ForeColor(blackColor ) ;
 		DrawPicture(m_backpict, &m_rect);