Some fixes for wxURLDataObject when wxUSE_UNICODE==1

[wxWidgets.git] / src / common / timercmn.cpp

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 7746d40ca743c75651a0061c68f67095d5c51122..b9f1269ec081a7fdb2706d0cb4308e285d7864be 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -60,6 +60,11 @@
 #  endif
 #endif
 
 #  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
 #include <time.h>
 #ifndef __WXMAC__
     #include <sys/types.h>      // for time_t


@@ -105,6 +110,11 @@
 
 #if wxUSE_GUI && wxUSE_TIMER
 
 
 #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
 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!"
         #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
         #warning "wxStopWatch will be up to second resolution!"
     #endif // compiler
 #endif