X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..c030b70fc6270c2e44a81f83e69fcc91d2b3c768:/src/gtk/timer.cpp diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp index f87bffa62b..61de7eeb11 100644 --- a/src/gtk/timer.cpp +++ b/src/gtk/timer.cpp @@ -2,9 +2,8 @@ // Name: timer.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,53 +18,50 @@ // wxTimer //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxTimer,wxObject) +IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject) gint timeout_callback( gpointer data ) { wxTimer *timer = (wxTimer*)data; timer->Notify(); - if (timer->OneShot()) timer->Stop(); + + if ( timer->OneShot() ) + timer->Stop(); + return TRUE; -}; +} -wxTimer::wxTimer(void) +wxTimer::wxTimer() { m_tag = -1; m_time = 1000; m_oneShot = FALSE; -}; +} -wxTimer::~wxTimer(void) +wxTimer::~wxTimer() { Stop(); -}; - -int wxTimer::Interval(void) -{ - return m_time; -}; - -bool wxTimer::OneShot(void) -{ - return m_oneShot; -}; +} -void wxTimer::Notify(void) +bool wxTimer::Start( int millisecs, bool oneShot ) { -}; + if ( millisecs != -1 ) + m_time = millisecs; -void wxTimer::Start( int millisecs, bool oneShot ) -{ - if (millisecs != -1) m_time = millisecs; m_oneShot = oneShot; + m_tag = gtk_timeout_add( millisecs, timeout_callback, this ); -}; -void wxTimer::Stop(void) + return TRUE; +} + +void wxTimer::Stop() { - if (m_tag != -1) + if ( m_tag != -1 ) + { gtk_timeout_remove( m_tag ); - m_tag = -1; -}; + + m_tag = -1; + } +}