Fixed conflicts with Robert's similar fixes; fixed toolbar size calculation

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

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 3ff1adf9d1dc7c50ce30dfb3b8e020532e8fed06..b9f1269ec081a7fdb2706d0cb4308e285d7864be 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -110,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