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

1. wxTimer::Start() returns bool in wxGTK too (other minor corrections

Browse Source 
to this class, such as "const" addition, Notify() is = 0 now...)

2. wxGTK::wxTextCtrl::Delete renamed to Clear for consistency

3. wx/wx_prec.h now includes wx/setup.h even if !wxUSE_PRECOMP because
   otherwise (recently added) tests "#if wxUSE_IOSTREAMH" donb't work.

4. Other compilation fixes for wxGTK (now it compiles again)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-10-12 13:09:15 +00:00
parent fbc535ff08
commit 03f38c58fd
23 changed files with 387 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/gtk/timer.cpp
View File

@@ -19,53 +19,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)
bool wxTimer::Start( int millisecs, bool oneShot )
{
return m_time;
}
if ( millisecs != -1 )
m_time = millisecs;
bool wxTimer::OneShot(void)
{
return m_oneShot;
}
void wxTimer::Notify(void)
{
}
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 );
return TRUE;
}
void wxTimer::Stop(void)
void wxTimer::Stop()
{
if (m_tag != -1)
if ( m_tag != -1 )
{
gtk_timeout_remove( m_tag );
m_tag = -1;
m_tag = -1;
}
}