compilation fix for wxUSE_TOOLTIPS=0 (i.e. wxUniv)

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

diff --git a/src/x11/timer.cpp b/src/x11/timer.cpp
index 570e4186f97f8fb843a5d017fcb387ee099631e6..c1ceead98a880e86300c4e7a48f58ee62355c60a 100644 (file)
--- a/src/x11/timer.cpp
+++ b/src/x11/timer.cpp
@@ -20,12 +20,12 @@
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif

-#include <Xm/Xm.h>
+

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

-#include "wx/motif/private.h"
+#include "wx/x11/private.h"

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


@@ -40,13 +40,16 @@ void wxTimerCallback (wxTimer * timer)
   if (timer->m_id == 0)
     return;                    // Avoid to process spurious timer events
 
   if (timer->m_id == 0)
     return;                    // Avoid to process spurious timer events
 

+  // TODO
+#if 0

   if (!timer->m_oneShot)
     timer->m_id = XtAppAddTimeOut((XtAppContext) wxTheApp->GetAppContext(),
                                   timer->m_milli,
                                   (XtTimerCallbackProc) wxTimerCallback,
                                   (XtPointer) timer);
   else
   if (!timer->m_oneShot)
     timer->m_id = XtAppAddTimeOut((XtAppContext) wxTheApp->GetAppContext(),
                                   timer->m_milli,
                                   (XtTimerCallbackProc) wxTimerCallback,
                                   (XtPointer) timer);
   else

-    timer->m_id = 0;
+#endif
+      timer->m_id = 0;

 
   timer->Notify();
 }
 
   timer->Notify();
 }


@@ -71,11 +74,13 @@ bool wxTimer::Start(int milliseconds, bool mode)
 
     if (!wxTimerList.Find((long)this))
         wxTimerList.Append((long)this, this);
 
     if (!wxTimerList.Find((long)this))
         wxTimerList.Append((long)this, this);

-
+    // TODO
+#if 0

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

+#endif

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -83,7 +88,10 @@ void wxTimer::Stop()
 {
     if (m_id > 0)
     {
 {
     if (m_id > 0)
     {

+    // TODO
+#if 0

         XtRemoveTimeOut (m_id);
         XtRemoveTimeOut (m_id);

+#endif

         m_id = 0;
     }
     m_milli = 0 ;
         m_id = 0;
     }
     m_milli = 0 ;