X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7eb67c0012ec1ce0d6faafac1b2bc0eb37c0e891..89e92728495341a97be57248620f5a12c1ccab1e:/src/mac/carbon/tooltip.cpp

diff --git a/src/mac/carbon/tooltip.cpp b/src/mac/carbon/tooltip.cpp
index 64ea19f58c..ba6de8cc8a 100644
--- a/src/mac/carbon/tooltip.cpp
+++ b/src/mac/carbon/tooltip.cpp
@@ -201,10 +201,12 @@ void wxMacToolTip::Setup( WindowRef win  , wxString text , wxPoint localPosition
 
 wxMacToolTip::~wxMacToolTip() 
 {
-    if ( m_timer )
+    if ( m_timer ) {
         delete m_timer ;
-	if ( m_backpict ) 
-		Clear() ;
+        m_timer = NULL;
+    }
+    if ( m_backpict ) 
+        Clear() ;
 }
 
 const short kTipBorder = 2 ;
@@ -228,9 +230,9 @@ void wxMacToolTip::Draw()
 #endif
 	  {
    		wxMacPortStateHelper help( (GrafPtr) GetWindowPort( m_window ) );
- 
+#if TARGET_CARBON	
   		bool useDrawThemeText =  ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
-  		
+#endif		
   		m_shown = true ;
 
         FontFamilyID fontId ;
@@ -280,8 +282,10 @@ void wxMacToolTip::Draw()
   		m_rect.left = m_position.x + kTipOffset;
   		m_rect.top = m_position.y + kTipOffset;
   		m_rect.right = m_rect.left + width + 2 * kTipBorder;
+#if TARGET_CARBON	
   		if ( useDrawThemeText )
   		    m_rect.right += kTipBorder ;
+#endif
   		m_rect.bottom = m_rect.top + height + 2 * kTipBorder;
   		ClipRect( &m_rect ) ;
   		BackColor( whiteColor ) ;
@@ -316,6 +320,7 @@ void wxMacToolTip::Draw()
   		{
   			if( text[i] == 13 || text[i] == 10)
   			{
+#if TARGET_CARBON
             	if ( useDrawThemeText )
             	{
     	            Rect frame ;
@@ -335,6 +340,7 @@ void wxMacToolTip::Draw()
    				    height += lineh ;
                }
                 else
+#endif
                 {
   				    ::DrawText( text , laststop , i - laststop ) ;
   				    height += lineh ;
@@ -344,6 +350,7 @@ void wxMacToolTip::Draw()
   			}
   			i++ ;
   		}
+#if TARGET_CARBON
         if ( useDrawThemeText )
         {
             Rect frame ;
@@ -362,6 +369,7 @@ void wxMacToolTip::Draw()
             CFRelease( mString ) ;
         }
         else
+#endif
         {
   		    ::DrawText( text , laststop , i - laststop ) ;
   		}