more combobox appearance fixes

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

diff --git a/src/motif/timer.cpp b/src/motif/timer.cpp
index 69b4917557fadf688f2e92eae9a35941d9cb00b1..570e4186f97f8fb843a5d017fcb387ee099631e6 100644 (file)
--- a/src/motif/timer.cpp
+++ b/src/motif/timer.cpp
@@ -17,13 +17,17 @@
 #include "wx/app.h"
 #include "wx/list.h"
 
 #include "wx/app.h"
 #include "wx/list.h"
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Xm.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)

-#endif

 
 static wxList wxTimerList(wxKEY_INTEGER);
 
 
 static wxList wxTimerList(wxKEY_INTEGER);
 


@@ -37,24 +41,25 @@ void wxTimerCallback (wxTimer * timer)
     return;                    // Avoid to process spurious timer events
 
   if (!timer->m_oneShot)
     return;                    // Avoid to process spurious timer events
 
   if (!timer->m_oneShot)

-    timer->m_id = XtAppAddTimeOut ((XtAppContext) wxTheApp->GetAppContext(), timer->m_milli,
-                 (XtTimerCallbackProc) wxTimerCallback, (XtPointer) timer);
+    timer->m_id = XtAppAddTimeOut((XtAppContext) wxTheApp->GetAppContext(),
+                                  timer->m_milli,
+                                  (XtTimerCallbackProc) wxTimerCallback,
+                                  (XtPointer) timer);

   else
     timer->m_id = 0;
   else
     timer->m_id = 0;

-  timer->Notify ();
+
+  timer->Notify();

 }
 
 }
 

-wxTimer::wxTimer()
+void wxTimer::Init()

 {
     m_id = 0;
 {
     m_id = 0;

-    m_milli = 0 ;
-    m_id = 0;
-    m_oneShot = FALSE;
+    m_milli = 1000;

 }
 
 wxTimer::~wxTimer()
 {
 }
 
 wxTimer::~wxTimer()
 {

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

     wxTimerList.DeleteObject(this);
 }
 
     wxTimerList.DeleteObject(this);
 }
 


@@ -62,20 +67,15 @@ bool wxTimer::Start(int milliseconds, bool mode)
 {
     Stop();
 
 {
     Stop();
 

-    m_oneShot = mode;
-    if (milliseconds < 0)
-        milliseconds = m_lastMilli;
-
-    if (milliseconds <= 0)
-        return FALSE;
-
-    m_lastMilli = m_milli = milliseconds;
+    (void)wxTimerBase::Start(milliseconds, mode);

 
     if (!wxTimerList.Find((long)this))
         wxTimerList.Append((long)this, this);
 
 
     if (!wxTimerList.Find((long)this))
         wxTimerList.Append((long)this, this);
 

-    m_id = XtAppAddTimeOut ((XtAppContext) wxTheApp->GetAppContext(), milliseconds,
-                  (XtTimerCallbackProc) wxTimerCallback, (XtPointer) this);
+    m_id = XtAppAddTimeOut((XtAppContext) wxTheApp->GetAppContext(),
+                            m_milli,
+                            (XtTimerCallbackProc) wxTimerCallback,
+                            (XtPointer) this);

     return TRUE;
 }
 
     return TRUE;
 }