Added mising AddBitmapList in wxBitmap
Added missing deletion of wxFrame's toolbar Removed a few superfluous ; (sorry) Mentioned dmalloc in INSTALL git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -27,45 +27,45 @@ gint timeout_callback( gpointer data )
|
||||
timer->Notify();
|
||||
if (timer->OneShot()) timer->Stop();
|
||||
return TRUE;
|
||||
};
|
||||
}
|
||||
|
||||
wxTimer::wxTimer(void)
|
||||
{
|
||||
m_tag = -1;
|
||||
m_time = 1000;
|
||||
m_oneShot = FALSE;
|
||||
};
|
||||
}
|
||||
|
||||
wxTimer::~wxTimer(void)
|
||||
{
|
||||
Stop();
|
||||
};
|
||||
}
|
||||
|
||||
int wxTimer::Interval(void)
|
||||
{
|
||||
return m_time;
|
||||
};
|
||||
}
|
||||
|
||||
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 );
|
||||
};
|
||||
}
|
||||
|
||||
void wxTimer::Stop(void)
|
||||
{
|
||||
if (m_tag != -1)
|
||||
gtk_timeout_remove( m_tag );
|
||||
m_tag = -1;
|
||||
};
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user