VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

[wxWidgets.git] / src / gtk / timer.cpp

diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index ac5b34cb14df7cb5eed87dbedf88566b9880d989..ca8a477d356b1f20e3c3d7fb1859a5ea1c0167a0 100644 (file)
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -85,7 +85,7 @@ static gint timeout_callback( gpointer data )
     GDK_THREADS_LEAVE ();
 #endif
 
     GDK_THREADS_LEAVE ();
 #endif
 

-    if (timer->OneShot())
+    if ( timer->IsOneShot() )

         return FALSE;
 
     return TRUE;
         return FALSE;
 
     return TRUE;


@@ -94,25 +94,20 @@ static gint timeout_callback( gpointer data )
 wxTimer::wxTimer()
 {
     m_tag = -1;
 wxTimer::wxTimer()
 {
     m_tag = -1;

-    m_time = 1000;
+    m_milli = 1000;

     m_oneShot = FALSE;
 }
 
 wxTimer::~wxTimer()
 {
     m_oneShot = FALSE;
 }
 
 wxTimer::~wxTimer()
 {

-    Stop();
+    wxTimer::Stop();

 }
 
 bool wxTimer::Start( int millisecs, bool oneShot )
 {
 }
 
 bool wxTimer::Start( int millisecs, bool oneShot )
 {

-    if (millisecs != -1)
-    {
-        m_time = millisecs;
-    }
-
-    m_oneShot = oneShot;
+    (void)wxTimerBase::Start(millisecs, oneShot);

 
 

-    m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
+    m_tag = gtk_timeout_add( m_milli, timeout_callback, this );

 
     return TRUE;
 }
 
     return TRUE;
 }