X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ecf902bc836f2808444b34eff48cdb12f289460..ddec9f1eeb99ef15f18b0bcb7ff503cca4a2942f:/include/wx/timer.h diff --git a/include/wx/timer.h b/include/wx/timer.h index f17a83a091..3f25d378e9 100644 --- a/include/wx/timer.h +++ b/include/wx/timer.h @@ -1,22 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/timer.h // Purpose: wxTimer, wxStopWatch and global time-related functions -// Author: Julian Smart (wxTimer), Sylvain Bougnoux (wxStopWatch) +// Author: Julian Smart // Modified by: Vadim Zeitlin (wxTimerBase) // Guillermo Rodriguez (global clean up) // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) wxWidgets team +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_TIMER_H_BASE_ #define _WX_TIMER_H_BASE_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "timerbase.h" -#endif - #include "wx/defs.h" #if wxUSE_GUI && wxUSE_TIMER @@ -116,8 +112,10 @@ protected: #include "wx/msw/timer.h" #elif defined(__WXMOTIF__) #include "wx/motif/timer.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/timer.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/timer.h" #elif defined(__WXX11__) || defined(__WXMGL__) #include "wx/generic/timer.h" #elif defined (__WXCOCOA__)