removed WXK_SPACE as duplicating the selection event, added theme text drawing patch

[wxWidgets.git] / src / mac / tooltip.cpp

diff --git a/src/mac/tooltip.cpp b/src/mac/tooltip.cpp
index 64ea19f58cbf29f9077e9716ae5a89f361e5bb92..ba6de8cc8a1c9123730510e71ac752e5eaf7ce68 100644 (file)
--- a/src/mac/tooltip.cpp
+++ b/src/mac/tooltip.cpp
@@ -201,10 +201,12 @@ void wxMacToolTip::Setup( WindowRef win  , wxString text , wxPoint localPosition
 
 wxMacToolTip::~wxMacToolTip() 
 {
 
 wxMacToolTip::~wxMacToolTip() 
 {

-    if ( m_timer )
+    if ( m_timer ) {

         delete m_timer ;
         delete m_timer ;

-       if ( m_backpict ) 
-               Clear() ;
+        m_timer = NULL;
+    }
+    if ( m_backpict ) 
+        Clear() ;

 }
 
 const short kTipBorder = 2 ;
 }
 
 const short kTipBorder = 2 ;


@@ -228,9 +230,9 @@ void wxMacToolTip::Draw()
 #endif
          {
                wxMacPortStateHelper help( (GrafPtr) GetWindowPort( m_window ) );
 #endif
          {
                wxMacPortStateHelper help( (GrafPtr) GetWindowPort( m_window ) );

- 
+#if TARGET_CARBON      

                bool useDrawThemeText =  ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
                bool useDrawThemeText =  ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;

-               
+#endif         

                m_shown = true ;
 
         FontFamilyID fontId ;
                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;
                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 ;
                if ( useDrawThemeText )
                    m_rect.right += kTipBorder ;

+#endif

                m_rect.bottom = m_rect.top + height + 2 * kTipBorder;
                ClipRect( &m_rect ) ;
                BackColor( whiteColor ) ;
                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( text[i] == 13 || text[i] == 10)
                        {

+#if TARGET_CARBON

                if ( useDrawThemeText )
                {
                    Rect frame ;
                if ( useDrawThemeText )
                {
                    Rect frame ;


@@ -335,6 +340,7 @@ void wxMacToolTip::Draw()
                                    height += lineh ;
                }
                 else
                                    height += lineh ;
                }
                 else

+#endif

                 {
                                    ::DrawText( text , laststop , i - laststop ) ;
                                    height += lineh ;
                 {
                                    ::DrawText( text , laststop , i - laststop ) ;
                                    height += lineh ;


@@ -344,6 +350,7 @@ void wxMacToolTip::Draw()
                        }
                        i++ ;
                }
                        }
                        i++ ;
                }

+#if TARGET_CARBON

         if ( useDrawThemeText )
         {
             Rect frame ;
         if ( useDrawThemeText )
         {
             Rect frame ;


@@ -362,6 +369,7 @@ void wxMacToolTip::Draw()
             CFRelease( mString ) ;
         }
         else
             CFRelease( mString ) ;
         }
         else

+#endif

         {
                    ::DrawText( text , laststop , i - laststop ) ;
                }
         {
                    ::DrawText( text , laststop , i - laststop ) ;
                }