Header changes (gtk.h etc no longer included in defs.h

but in *.cpp to speed up compilation (?) )


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-01-02 19:13:25 +00:00
parent 9a29912f60
commit 83624f7960
104 changed files with 1648 additions and 2454 deletions

View File

@@ -14,6 +14,8 @@
#include "wx/timer.h"
#include "gtk/gtk.h"
//-----------------------------------------------------------------------------
// wxTimer
//-----------------------------------------------------------------------------
@@ -22,46 +24,49 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
gint timeout_callback( gpointer data )
{
wxTimer *timer = (wxTimer*)data;
timer->Notify();
wxTimer *timer = (wxTimer*)data;
timer->Notify();
if ( timer->OneShot() )
timer->Stop();
if (timer->OneShot())
{
timer->Stop();
}
return TRUE;
return TRUE;
}
wxTimer::wxTimer()
{
m_tag = -1;
m_time = 1000;
m_oneShot = FALSE;
m_tag = -1;
m_time = 1000;
m_oneShot = FALSE;
}
wxTimer::~wxTimer()
{
Stop();
Stop();
}
bool wxTimer::Start( int millisecs, bool oneShot )
{
if ( millisecs != -1 )
m_time = millisecs;
if (millisecs != -1)
{
m_time = millisecs;
}
m_oneShot = oneShot;
m_oneShot = oneShot;
m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
return TRUE;
return TRUE;
}
void wxTimer::Stop()
{
if ( m_tag != -1 )
{
gtk_timeout_remove( m_tag );
m_tag = -1;
}
if (m_tag != -1)
{
gtk_timeout_remove( m_tag );
m_tag = -1;
}
}