Removed mor (egcs) warnings Updated version to 2.0.1 in version.h Several corrections for strict compilers OpenGL updates new wxApp::InitVisual() for overriding in order to set non-default visual (unportable, of course) Added makefiles for DialogEd and Tex2Rtf made wxGTK compile with Tex2Rtf Added BEGIN_DRAG event to tree ctrl Added missing #include to lexel.l (unistd.h) (MSW?) new wxGTK.spec turned one or two more #ifdef into #if git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
118 lines
2.0 KiB
C++
118 lines
2.0 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: timer.cpp
|
|
// Purpose:
|
|
// Author: Robert Roebling
|
|
// Id: $Id$
|
|
// Copyright: (c) 1998 Robert Roebling
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
#ifdef __GNUG__
|
|
#pragma implementation "timer.h"
|
|
#endif
|
|
|
|
#include "wx/timer.h"
|
|
|
|
#include "gtk/gtk.h"
|
|
/*
|
|
#include "glib.h"
|
|
*/
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// global functions
|
|
//-----------------------------------------------------------------------------
|
|
|
|
/*
|
|
static GTimer *g_timer = (GTimer*) NULL;
|
|
|
|
void wxStartTimer()
|
|
{
|
|
if (g_timer)
|
|
{
|
|
g_timer_rest( g_timer );
|
|
}
|
|
else
|
|
{
|
|
g_timer = g_timer_new();
|
|
g_timer_start( g_timer );
|
|
}
|
|
}
|
|
|
|
long wxGetElapsedTime( bool resetTimer )
|
|
{
|
|
gulong res = 0;
|
|
if (g_timer)
|
|
{
|
|
g_timer_elapsed( g_timer, &res );
|
|
if (resetTimer) g_timer_reset( g_timer );
|
|
}
|
|
|
|
return res;
|
|
}
|
|
|
|
bool wxGetLocalTime( long *timeZone, int *dstObserved )
|
|
{
|
|
}
|
|
|
|
long wxGetCurrentTime()
|
|
{
|
|
}
|
|
*/
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxTimer
|
|
//-----------------------------------------------------------------------------
|
|
|
|
IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
|
|
|
|
gint timeout_callback( gpointer data )
|
|
{
|
|
wxTimer *timer = (wxTimer*)data;
|
|
timer->Notify();
|
|
|
|
if (timer->OneShot())
|
|
{
|
|
timer->Stop();
|
|
}
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
wxTimer::wxTimer()
|
|
{
|
|
m_tag = -1;
|
|
m_time = 1000;
|
|
m_oneShot = FALSE;
|
|
}
|
|
|
|
wxTimer::~wxTimer()
|
|
{
|
|
Stop();
|
|
}
|
|
|
|
bool wxTimer::Start( int millisecs, bool oneShot )
|
|
{
|
|
if (millisecs != -1)
|
|
{
|
|
m_time = millisecs;
|
|
}
|
|
|
|
m_oneShot = oneShot;
|
|
|
|
m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
void wxTimer::Stop()
|
|
{
|
|
if (m_tag != -1)
|
|
{
|
|
gtk_timeout_remove( m_tag );
|
|
m_tag = -1;
|
|
}
|
|
}
|
|
|