X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19193a2c85987b595932957e73013e7ea100f0e8..78500b7db1287068a04469e1ce92b4fe99e4e4f0:/src/common/timercmn.cpp

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 7746d40ca7..b9f1269ec0 100644
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -60,6 +60,11 @@
 #  endif
 #endif
 
+#if defined(__MWERKS__) && defined(__WXMSW__)
+#   undef HAVE_FTIME
+#   undef HAVE_GETTIMEOFDAY
+#endif
+
 #include <time.h>
 #ifndef __WXMAC__
     #include <sys/types.h>      // for time_t
@@ -105,6 +110,11 @@
 
 #if wxUSE_GUI && wxUSE_TIMER
 
+wxTimerBase::~wxTimerBase()
+{
+    // this destructor is required for Darwin
+}
+
 void wxTimerBase::Notify()
 {
     // the base class version generates an event if it has owner - which it
@@ -334,7 +344,7 @@ wxLongLong wxGetLocalTimeMillis()
         #pragma message("wxStopWatch will be up to second resolution!")
     #elif defined(__BORLANDC__)
         #pragma message "wxStopWatch will be up to second resolution!"
-    #elif
+    #else
         #warning "wxStopWatch will be up to second resolution!"
     #endif // compiler
 #endif