support retina display

[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 caa5efd4cbbff59d3cb56916a12c71b7b4be75f1..cd990764c392db35e6c19651d28a25bebe8f9aa0 100644 (file)
--- a/include/wx/osx/private/timer.h
+++ b/include/wx/osx/private/timer.h
@@ -1,11 +1,10 @@
 /* common warning snippet for all osx direct includes */
 
 #ifndef wxOSX_USE_CARBON
 /* common warning snippet for all osx direct includes */
 
 #ifndef wxOSX_USE_CARBON

-#error "this files should only be included after platform.h was included
+#error "this files should only be included after platform.h was included"

 #endif
 
 #endif
 

-#if wxOSX_USE_COCOA_OR_IPHONE
-    // this should become the future version also for carbon
+#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"
     #include "wx/osx/core/private/timer.h"
 #elif wxOSX_USE_CARBON
     #include "wx/osx/carbon/private/timer.h"