Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

[wxWidgets.git] / src / unix / timerunx.cpp

diff --git a/src/unix/timerunx.cpp b/src/unix/timerunx.cpp
index bcdebf91679b28944a660b19971a1c642ce61f48..eb2c4e02b150051242a1dd66e7dac64f9ee1e80f 100644 (file)
--- a/src/unix/timerunx.cpp
+++ b/src/unix/timerunx.cpp
@@ -54,7 +54,7 @@ static inline wxString wxUsecClockAsString(wxUsecClock_t usec)
     #if wxUSE_LONGLONG
         return usec.ToString();
     #else // wxUsecClock_t == double
     #if wxUSE_LONGLONG
         return usec.ToString();
     #else // wxUsecClock_t == double

-        return wxString::Format(_T("%.0f"), usec);
+        return wxString::Format(wxT("%.0f"), usec);

     #endif
 }
 
     #endif
 }
 


@@ -86,7 +86,7 @@ void wxTimerScheduler::DoAddTimer(wxTimerSchedule *s)
     for ( node = m_timers.begin(); node != m_timers.end(); ++node )
     {
         wxASSERT_MSG( (*node)->m_timer != s->m_timer,
     for ( node = m_timers.begin(); node != m_timers.end(); ++node )
     {
         wxASSERT_MSG( (*node)->m_timer != s->m_timer,

-                      _T("adding the same timer twice?") );
+                      wxT("adding the same timer twice?") );

 
         if ( (*node)->m_expiration > s->m_expiration )
             break;
 
         if ( (*node)->m_expiration > s->m_expiration )
             break;


@@ -115,7 +115,7 @@ void wxTimerScheduler::RemoveTimer(wxUnixTimerImpl *timer)
         }
     }
 
         }
     }
 

-    wxFAIL_MSG( _T("removing inexistent timer?") );
+    wxFAIL_MSG( wxT("removing inexistent timer?") );

 }
 
 bool wxTimerScheduler::GetNext(wxUsecClock_t *remaining) const
 }
 
 bool wxTimerScheduler::GetNext(wxUsecClock_t *remaining) const


@@ -123,7 +123,7 @@ bool wxTimerScheduler::GetNext(wxUsecClock_t *remaining) const
     if ( m_timers.empty() )
       return false;
 
     if ( m_timers.empty() )
       return false;
 

-    wxCHECK_MSG( remaining, false, _T("NULL pointer") );
+    wxCHECK_MSG( remaining, false, wxT("NULL pointer") );

 
     *remaining = (*m_timers.begin())->m_expiration - wxGetLocalTimeUsec();
     if ( *remaining < 0 )
 
     *remaining = (*m_timers.begin())->m_expiration - wxGetLocalTimeUsec();
     if ( *remaining < 0 )


@@ -241,7 +241,7 @@ bool wxUnixTimerImpl::IsRunning() const
 
 wxUnixTimerImpl::~wxUnixTimerImpl()
 {
 
 wxUnixTimerImpl::~wxUnixTimerImpl()
 {

-    wxASSERT_MSG( !m_isRunning, _T("must have been stopped before") );
+    wxASSERT_MSG( !m_isRunning, wxT("must have been stopped before") );

 }
 
 // ============================================================================
 }
 
 // ============================================================================