X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12cd5f34e72ba5e6e295936d2a74b9080552a331..4b04699b670b4ab4632229fa0264d154acd3bec1:/src/mac/tooltip.cpp?ds=sidebyside

diff --git a/src/mac/tooltip.cpp b/src/mac/tooltip.cpp
index 5ddf8b92e2..6e86ca590c 100644
--- a/src/mac/tooltip.cpp
+++ b/src/mac/tooltip.cpp
@@ -11,7 +11,7 @@
     #pragma implementation "tooltip.h"
 #endif
 
-#include "wx/setup.h"
+#include "wx/defs.h"
 
 #if wxUSE_TOOLTIPS
 
@@ -52,21 +52,20 @@ class wxMacToolTip
 		wxMacToolTipTimer* m_timer ;
 } ;
 
-class wxMacToolTipTimer : wxTimer
+class wxMacToolTipTimer : public wxTimer
 {
 public:
-	wxMacToolTipTimer() {} ;
-	wxMacToolTipTimer(wxMacToolTip* tip, int iMilliseconds) ;
+    wxMacToolTipTimer() {} ;
+    wxMacToolTipTimer(wxMacToolTip* tip, int iMilliseconds) ;
     virtual ~wxMacToolTipTimer() {} ;
-	void Notify()
-	{
-		if ( m_mark == m_tip->GetMark() )
-			m_tip->Draw() ;
-
-	}
+    void Notify()
+    {
+        if ( m_mark == m_tip->GetMark() )
+            m_tip->Draw() ;    
+    }
 protected:
-	wxMacToolTip* 	m_tip;
-	long			m_mark ;
+    wxMacToolTip* 	m_tip;
+    long		m_mark ;
 };
 
 //-----------------------------------------------------------------------------
@@ -225,7 +224,7 @@ void wxMacToolTip::Draw()
 */
 #endif
 	  {
-   		wxMacPortStateHelper help( GetWindowPort( m_window ) );
+   		wxMacPortStateHelper help( (GrafPtr) GetWindowPort( m_window ) );
  
   		m_shown = true ;
 
@@ -333,7 +332,7 @@ void wxMacToolTip::Clear()
 		 
 	if ( m_window == s_ToolTipWindowRef && m_backpict )
 	{
-		wxMacPortStateHelper help( GetWindowPort(m_window) ) ;
+		wxMacPortStateHelper help( (GrafPtr) GetWindowPort(m_window) ) ;
 
 		m_shown = false ;