check for wxUSE_TIMER in headers, not the files including them

[wxWidgets.git] / include / wx / mac / carbon / apptrait.h

diff --git a/include/wx/mac/carbon/apptrait.h b/include/wx/mac/carbon/apptrait.h
index a2b4ed00c0e0f9e09c9fc2d825177198b9e72d60..1b4d2ee9ef3fe0ac4b24da10d253f0049a1971d8 100644 (file)
--- a/include/wx/mac/carbon/apptrait.h
+++ b/include/wx/mac/carbon/apptrait.h
@@ -19,6 +19,10 @@
 class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:
 class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:

+    // no timer support in wxBase yet
+#if wxUSE_TIMER
+    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) { return NULL; };
+#endif

     // other miscellaneous helpers
     // ---------------------------
 
     // other miscellaneous helpers
     // ---------------------------
 


@@ -30,6 +34,9 @@ public:
 class WXDLLEXPORT wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:
 class WXDLLEXPORT wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:

+#if wxUSE_TIMER
+    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
+#endif

     // other miscellaneous helpers
     // ---------------------------
 
     // other miscellaneous helpers
     // ---------------------------