wxMessageBox off the main thread lost result code.

[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..6d96389ce80fa01ea13daf28b4ad162111a3004c 100644 (file)
--- a/include/wx/generic/private/timer.h
+++ b/include/wx/generic/private/timer.h
@@ -2,15 +2,15 @@
 // Name:        wx/generic/private/timer.h
 // Purpose:     Generic implementation of wxTimer class
 // Author:      Vaclav Slavik
 // Name:        wx/generic/private/timer.h
 // Purpose:     Generic implementation of wxTimer class
 // Author:      Vaclav Slavik

-// Id:          $Id$

 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) Vaclav Slavik
 // 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 +19,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 +40,6 @@ private:
     wxTimerDesc *m_desc;
 };
 
     wxTimerDesc *m_desc;
 };
 

+#endif // wxUSE_TIMER
+

 #endif // _WX_GENERIC_PRIVATE_TIMER_H_
 #endif // _WX_GENERIC_PRIVATE_TIMER_H_