Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include wx/dynarray.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-04-19 14:18:39 +00:00
parent 991d57f844
commit ad9835c97c
49 changed files with 400 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/mac/classic/timer.cpp
View File

@@ -1,14 +1,21 @@
/////////////////////////////////////////////////////////////////////////////
// Name: timer.cpp
// Name: src/mac/classic/timer.cpp
// Purpose: wxTimer implementation
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// for compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/dynarray.h"
#endif
#include "wx/timer.h"
IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
@@ -20,8 +27,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
#include <Timer.h>
#endif
#include "wx/dynarray.h"
typedef struct MacTimerInfo
{
TMTask m_task;
@@ -38,7 +43,7 @@ static pascal void MacTimerProc( TMTask * t )
}
// we need this array to track timers that are being deleted within the Notify procedure
// adding the timer before the Notify call and checking after whether it still is in there
// adding the timer before the Notify call and checking after whether it still is in there
// as the destructor would have removed it from the array
wxArrayPtrVoid gTimersInProcess ;
@@ -47,27 +52,26 @@ static void wxProcessTimer( unsigned long event , void *data )
{
if ( !data )
return ;
wxTimer* timer = (wxTimer*) data ;
if ( timer->IsOneShot() )
timer->Stop() ;
gTimersInProcess.Add( timer ) ;
timer->Notify();
int index = gTimersInProcess.Index( timer ) ;
if ( index != wxNOT_FOUND )
{
gTimersInProcess.RemoveAt( index ) ;
if ( !timer->IsOneShot() && timer->m_info->m_task.tmAddr )
{
PrimeTime( (QElemPtr) &timer->m_info->m_task , timer->GetInterval() ) ;
}
}
}
@@ -82,7 +86,7 @@ void wxTimer::Init()
m_info->m_timer = this ;
}
bool wxTimer::IsRunning() const
bool wxTimer::IsRunning() const
{
// as the qType may already indicate it is elapsed, but it
// was not handled internally yet
@@ -98,15 +102,15 @@ wxTimer::~wxTimer()
}
int index = gTimersInProcess.Index( this ) ;
if ( index != wxNOT_FOUND )
gTimersInProcess.RemoveAt( index ) ;
gTimersInProcess.RemoveAt( index ) ;
}
bool wxTimer::Start(int milliseconds,bool mode)
{
(void)wxTimerBase::Start(milliseconds, mode);
wxCHECK_MSG( m_milli > 0, FALSE, wxT("invalid value for timer timeout") );
wxCHECK_MSG( m_info->m_task.tmAddr == NULL , FALSE, wxT("attempting to restart a timer") );
wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeout") );
wxCHECK_MSG( m_info->m_task.tmAddr == NULL , false, wxT("attempting to restart a timer") );
#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
m_info->m_task.tmAddr = NewTimerUPP( MacTimerProc ) ;
@@ -119,7 +123,7 @@ bool wxTimer::Start(int milliseconds,bool mode)
m_info->m_timer = this ;
InsXTime((QElemPtr) &m_info->m_task ) ;
PrimeTime( (QElemPtr) &m_info->m_task , m_milli ) ;
return TRUE;
return true;
}
void wxTimer::Stop()
@@ -132,6 +136,3 @@ void wxTimer::Stop()
}
wxMacRemoveAllNotifiersForData( wxMacGetNotifierTable() , this ) ;
}