Don't use "Cancel" button in the about dialog of the listctrl sample.

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

diff --git a/include/wx/osx/private/timer.h b/include/wx/osx/private/timer.h
index 024f6d88eead063c87601019afa0af0f1131f84d..cd990764c392db35e6c19651d28a25bebe8f9aa0 100644 (file)
--- a/include/wx/osx/private/timer.h
+++ b/include/wx/osx/private/timer.h
@@ -1,5 +1,11 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/osx/classic/private/timer.h"
-#else
-#include "wx/osx/carbon/private/timer.h"
+/* common warning snippet for all osx direct includes */
+
+#ifndef wxOSX_USE_CARBON
+#error "this files should only be included after platform.h was included"
+#endif
+
+#if 1 // revert to wxOSX_USE_COCOA_OR_IPHONE in case of problems
+    #include "wx/osx/core/private/timer.h"
+#elif wxOSX_USE_CARBON
+    #include "wx/osx/carbon/private/timer.h"

 #endif
 #endif