made GetColourFromGTKWidget() more general, it is now used for all colours

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

diff --git a/src/motif/timer.cpp b/src/motif/timer.cpp
index 41e30b7ae33314b9c0c2605908c8efd75fbe4c7a..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);
 


@@ -47,9 +51,10 @@ void wxTimerCallback (wxTimer * timer)
   timer->Notify();
 }
 
   timer->Notify();
 }
 

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

 {
     m_id = 0;
 {
     m_id = 0;

+    m_milli = 1000;

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