projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
made GetType() inline
[wxWidgets.git]
/
include
/
wx
/
timer.h
diff --git
a/include/wx/timer.h
b/include/wx/timer.h
index 57dd27b15a3502bc568a9f184b4c5f9561ac55b7..33042164ed0b1ffb25581e7bd945d6ed3aed8cb2 100644
(file)
--- a/
include/wx/timer.h
+++ b/
include/wx/timer.h
@@
-117,7
+117,7
@@
protected:
#include "wx/motif/timer.h"
#elif defined(__WXGTK__)
#include "wx/gtk/timer.h"
#include "wx/motif/timer.h"
#elif defined(__WXGTK__)
#include "wx/gtk/timer.h"
-#elif defined(__WXX11__) || defined(__WXMGL__)
+#elif defined(__WXX11__) || defined(__WXMGL__)
|| defined(__WXCOCOA__)
#include "wx/generic/timer.h"
#elif defined(__WXMAC__)
#include "wx/mac/timer.h"
#include "wx/generic/timer.h"
#elif defined(__WXMAC__)
#include "wx/mac/timer.h"