Explicit casting/instantiation to resolve ambiguous overload.

[wxWidgets.git] / include / wx / timer.h

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 609cc33ace3daff794af8353eb35bf305a50e41e..4cf5c35b26226ea09768193bd3b8497152f7d118 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -1,13 +1,19 @@
-#ifndef __TIMERH_BASE__
-#define __TIMERH_BASE__
+#ifndef _WX_TIMER_H_BASE_
+#define _WX_TIMER_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/timer.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/timer.h"
+#include "wx/motif/timer.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/timer.h"
+#elif defined(__WXQT__)
+#include "wx/qt/timer.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/timer.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/timer.h"
 #endif
 
 #endif
-    // __TIMERH_BASE__
+    // _WX_TIMER_H_BASE_