use generic timer in wxMGL and wxX11

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/timer.h b/include/wx/timer.h
index b5b5cfab04abffd7c631955c57ea8df9bf6588a3..8cf9cbd4821b97d1554b79580e40051a57dba25b 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -107,10 +107,8 @@ protected:
     #include "wx/motif/timer.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/timer.h"
     #include "wx/motif/timer.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/timer.h"

-#elif defined(__WXX11__)
-    #include "wx/x11/timer.h"
-#elif defined(__WXMGL__)
-    #include "wx/mgl/timer.h"
+#elif defined(__WXX11__) || defined(__WXMGL__)
+    #include "wx/generic/timer.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/timer.h"
 #elif defined(__WXPM__)
 #elif defined(__WXMAC__)
     #include "wx/mac/timer.h"
 #elif defined(__WXPM__)