fix wxGTK1 compilation after wxTextEntry DoGetValue() change

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

diff --git a/src/osx/carbon/tooltip.cpp b/src/osx/carbon/tooltip.cpp
index 4252ce410c6f1085ef918285011c650ca0b03c73..92054cbaeeea5b6f63fb8ca7277871e2050e6ce3 100644 (file)
--- a/src/osx/carbon/tooltip.cpp
+++ b/src/osx/carbon/tooltip.cpp
@@ -64,7 +64,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
 wxToolTip::wxToolTip( const wxString &tip )
 {
     m_text = tip;
 wxToolTip::wxToolTip( const wxString &tip )
 {
     m_text = tip;

-    m_window = (wxWindow*) NULL;
+    m_window = NULL;

 }
 
 wxToolTip::~wxToolTip()
 }
 
 wxToolTip::~wxToolTip()


@@ -190,8 +190,7 @@ void wxMacToolTip::Setup( WindowRef win  , const wxString& text , const wxPoint&
     s_ToolTipWindowRef = m_window ;
     m_backpict = NULL ;
 #if wxUSE_TIMER 
     s_ToolTipWindowRef = m_window ;
     m_backpict = NULL ;
 #if wxUSE_TIMER 

-    if ( m_timer )
-        delete m_timer ;
+    delete m_timer ;

 
     m_timer = new wxMacToolTipTimer( this , s_ToolTipDelay ) ;
 #endif // wxUSE_TIMER
 
     m_timer = new wxMacToolTipTimer( this , s_ToolTipDelay ) ;
 #endif // wxUSE_TIMER