Cast for argument to delete[] - VC6 doesn't want to delete a const pointer

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

diff --git a/include/wx/generic/private/timer.h b/include/wx/generic/private/timer.h
index 9db8f4148906853b7b336e4928d683b05072167f..6613e284485102021732c9fbd40aeb9c08efc1da 100644 (file)
--- a/include/wx/generic/private/timer.h
+++ b/include/wx/generic/private/timer.h
@@ -7,10 +7,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef _WX_GENERIC_PRIVATE_TIMER_H_
 #define _WX_GENERIC_PRIVATE_TIMER_H_
 
 #ifndef _WX_GENERIC_PRIVATE_TIMER_H_
 #define _WX_GENERIC_PRIVATE_TIMER_H_
 

+#if wxUSE_TIMER
+

 #include "wx/private/timer.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/private/timer.h"
 
 //-----------------------------------------------------------------------------


@@ -19,7 +20,7 @@
 
 class wxTimerDesc;
 
 
 class wxTimerDesc;
 

-class WXDLLEXPORT wxGenericTimerImpl : public wxTimerImpl
+class WXDLLIMPEXP_BASE wxGenericTimerImpl : public wxTimerImpl

 {
 public:
     wxGenericTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { Init(); }
 {
 public:
     wxGenericTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { Init(); }


@@ -40,4 +41,6 @@ private:
     wxTimerDesc *m_desc;
 };
 
     wxTimerDesc *m_desc;
 };
 

+#endif // wxUSE_TIMER
+

 #endif // _WX_GENERIC_PRIVATE_TIMER_H_
 #endif // _WX_GENERIC_PRIVATE_TIMER_H_