Show labels for controls in wxOSX/Carbon toolbars.

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

diff --git a/src/osx/carbon/tooltip.cpp b/src/osx/carbon/tooltip.cpp
index f7b4857e9e0256ab76853f1c2f790261356ccac3..0b7630ac79655d2ed8a14207ff22dcefa55f4e60 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()


@@ -159,7 +159,7 @@ void wxToolTip::RemoveToolTips()
 }
 
 // --- mac specific
 }
 
 // --- mac specific

-#if wxUSE_TIMER 
+#if wxUSE_TIMER

 wxMacToolTipTimer::wxMacToolTipTimer( wxMacToolTip *tip , int msec )
 {
     m_tip = tip;
 wxMacToolTipTimer::wxMacToolTipTimer( wxMacToolTip *tip , int msec )
 {
     m_tip = tip;


@@ -172,7 +172,7 @@ wxMacToolTip::wxMacToolTip()
 {
     m_window = NULL ;
     m_backpict = NULL ;
 {
     m_window = NULL ;
     m_backpict = NULL ;

-#if wxUSE_TIMER 
+#if wxUSE_TIMER

     m_timer = NULL ;
 #endif
     m_mark = 0 ;
     m_timer = NULL ;
 #endif
     m_mark = 0 ;


@@ -189,7 +189,7 @@ void wxMacToolTip::Setup( WindowRef win  , const wxString& text , const wxPoint&
     m_window =win;
     s_ToolTipWindowRef = m_window ;
     m_backpict = NULL ;
     m_window =win;
     s_ToolTipWindowRef = m_window ;
     m_backpict = NULL ;

-#if wxUSE_TIMER 
+#if wxUSE_TIMER

     delete m_timer ;
 
     m_timer = new wxMacToolTipTimer( this , s_ToolTipDelay ) ;
     delete m_timer ;
 
     m_timer = new wxMacToolTipTimer( this , s_ToolTipDelay ) ;


@@ -198,7 +198,7 @@ void wxMacToolTip::Setup( WindowRef win  , const wxString& text , const wxPoint&
 
 wxMacToolTip::~wxMacToolTip()
 {
 
 wxMacToolTip::~wxMacToolTip()
 {

-#if wxUSE_TIMER 
+#if wxUSE_TIMER

     if ( m_timer )
     {
         delete m_timer ;
     if ( m_timer )
     {
         delete m_timer ;


@@ -250,7 +250,7 @@ void wxToolTip::NotifyWindowDelete( WXHWND win )
 void wxMacToolTip::Clear()
 {
     m_mark++ ;
 void wxMacToolTip::Clear()
 {
     m_mark++ ;

-#if wxUSE_TIMER 
+#if wxUSE_TIMER

     if ( m_timer )
     {
         delete m_timer ;
     if ( m_timer )
     {
         delete m_timer ;