added proper bracketing of QDflushing for carbon only

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

diff --git a/src/mac/tooltip.cpp b/src/mac/tooltip.cpp
index 0655699087460ec06dc90faf3a54a1293a3e84db..0d1e1ce95516f8c2f683f3deda679fe8b640611a 100644 (file)
--- a/src/mac/tooltip.cpp
+++ b/src/mac/tooltip.cpp
@@ -55,15 +55,15 @@ class wxMacToolTip
 class wxMacToolTipTimer : wxTimer
 {
 public:
+       wxMacToolTipTimer() {} ;
        wxMacToolTipTimer(wxMacToolTip* tip, int iMilliseconds) ;
-
+    virtual ~wxMacToolTipTimer() {} ;
        void Notify()
        {
                if ( m_mark == m_tip->GetMark() )
                        m_tip->Draw() ;
 
        }
-       
 protected:
        wxMacToolTip*   m_tip;
        long                    m_mark ;
@@ -187,7 +187,7 @@ void wxMacToolTip::Setup( WindowRef window  , wxString text , wxPoint localPosit
 {
        m_mark++ ;
        Clear() ;
-       m_position = localPosition ; 
+       m_position = localPosition ;
        m_label = wxMacMakeMacStringFromPC( text ) ;
        m_window = window ;
        s_ToolTipWindowRef = window ;
@@ -225,7 +225,7 @@ void wxMacToolTip::Draw()
 */
 #endif
          {
-               wxMacPortStateHelper help( GetWindowPort( m_window ) );
+               wxMacPortStateHelper help( (GrafPtr) GetWindowPort( m_window ) );
  
                m_shown = true ;
 
@@ -323,12 +323,17 @@ void wxToolTip::NotifyWindowDelete( WXHWND 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 )
        {
-               wxMacPortStateHelper help( GetWindowPort(m_window) ) ;
+               wxMacPortStateHelper help( (GrafPtr) GetWindowPort(m_window) ) ;
 
                m_shown = false ;