check for wxUSE_TIMER in headers, not the files including them

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

diff --git a/include/wx/mac/carbon/evtloop.h b/include/wx/mac/carbon/evtloop.h
index 6d43f1c45bd5ba3baf92af70f9bf2998de950b5b..c13a51836c788246d171bc52d8c55640cbc43680 100644 (file)
--- a/include/wx/mac/carbon/evtloop.h
+++ b/include/wx/mac/carbon/evtloop.h
@@ -27,10 +27,12 @@
 // wxEventLoop
 // ----------------------------------------------------------------------------
 
 // wxEventLoop
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxEventLoop : public wxEventLoopBase
+#if wxMAC_USE_RUN_APP_EVENT_LOOP
+
+class WXDLLEXPORT wxGUIEventLoop : public wxEventLoopBase

 {
 public:
 {
 public:

-    wxEventLoop();
+    wxGUIEventLoop() { m_exitcode = 0; }

 
     // implement base class pure virtuals
     virtual int Run();
 
     // implement base class pure virtuals
     virtual int Run();


@@ -39,14 +41,24 @@ public:
     virtual bool Dispatch();
 
 private:
     virtual bool Dispatch();
 
 private:

-    // the loop exit code

     int m_exitcode;
     int m_exitcode;

+};
+
+#else // manual event loop
+
+class WXDLLEXPORT wxGUIEventLoop : public wxEventLoopManual
+{
+public:
+    wxGUIEventLoop() { }

 
 

-#if !wxMAC_USE_RUN_APP_EVENT_LOOP
-    // should we exit the loop?
-    bool m_shouldExit;
-#endif // !wxMAC_USE_RUN_APP_EVENT_LOOP
+    virtual bool Pending() const;
+    virtual bool Dispatch();
+
+    // implement base class pure virtual
+    virtual void WakeUp();

 };
 
 };
 

+#endif // auto/manual event loop
+

 #endif // _WX_MAC_CARBON_EVTLOOP_H_
 
 #endif // _WX_MAC_CARBON_EVTLOOP_H_