1945421 applied

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

diff --git a/src/mac/carbon/tooltip.cpp b/src/mac/carbon/tooltip.cpp
index 18c9ca7adaa5cf8575ddf3d14edbe575d3f61ded..957feb0491c6f0194b21f7b18b3ae4b721f0724b 100644 (file)
--- a/src/mac/carbon/tooltip.cpp
+++ b/src/mac/carbon/tooltip.cpp
@@ -27,40 +27,6 @@
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-class wxMacToolTipTimer ;
-
-class wxMacToolTip
-{
-public :
-    wxMacToolTip() ;
-    ~wxMacToolTip() ;
-
-    void Setup( WindowRef window , const wxString& text , const wxPoint& localPosition ) ;
-    void Draw() ;
-    void Clear() ;
-
-    long GetMark()
-    { return m_mark ; }
-
-    bool IsShown()
-    { return m_shown ; }
-
-private :
-    wxString    m_label ;
-    wxPoint m_position ;
-    Rect            m_rect ;
-    WindowRef    m_window ;
-    PicHandle    m_backpict ;
-    bool        m_shown ;
-    long        m_mark ;
-#if wxUSE_TIMER 
-    wxMacToolTipTimer* m_timer ;
-#endif
-#if TARGET_CARBON
-    wxMacCFStringHolder m_helpTextRef ;
-#endif
-} ;
-

 #if wxUSE_TIMER
 class wxMacToolTipTimer : public wxTimer
 {
 #if wxUSE_TIMER
 class wxMacToolTipTimer : public wxTimer
 {


@@ -262,7 +228,7 @@ void wxMacToolTip::Draw()
         wxMacLocalToGlobal( m_window , &p ) ;
         SetRect( &tag.absHotRect , p.h - 2 , p.v - 2 , p.h + 2 , p.v + 2 );
 
         wxMacLocalToGlobal( m_window , &p ) ;
         SetRect( &tag.absHotRect , p.h - 2 , p.v - 2 , p.h + 2 , p.v + 2 );
 

-        m_helpTextRef.Assign( m_label , wxFONTENCODING_DEFAULT ) ;
+        m_helpTextRef = wxCFStringRef( m_label , wxFONTENCODING_DEFAULT ) ;

         tag.content[kHMMinimumContentIndex].contentType = kHMCFStringContent ;
         tag.content[kHMMinimumContentIndex].u.tagCFString = m_helpTextRef ;
         tag.content[kHMMaximumContentIndex].contentType = kHMCFStringContent ;
         tag.content[kHMMinimumContentIndex].contentType = kHMCFStringContent ;
         tag.content[kHMMinimumContentIndex].u.tagCFString = m_helpTextRef ;
         tag.content[kHMMaximumContentIndex].contentType = kHMCFStringContent ;


@@ -292,7 +258,6 @@ void wxMacToolTip::Clear()
         return ;
 
     HMHideTag() ;
         return ;
 
     HMHideTag() ;

-    m_helpTextRef.Release() ;

 }
 
 #endif // wxUSE_TOOLTIPS
 }
 
 #endif // wxUSE_TOOLTIPS