Fix compilation of wx/debug.h when it's the first wx header to be included.

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

diff --git a/include/wx/osx/carbon/evtloop.h b/include/wx/osx/carbon/evtloop.h
index b55112994f35784a4d4a09d85033b8d6b6bc3e8c..3ebda2efa8e0851d146de1738ed83ae634a3010f 100644 (file)
--- a/include/wx/osx/carbon/evtloop.h
+++ b/include/wx/osx/carbon/evtloop.h
@@ -12,26 +12,20 @@
 #ifndef _WX_MAC_CARBON_EVTLOOP_H_
 #define _WX_MAC_CARBON_EVTLOOP_H_
 
 #ifndef _WX_MAC_CARBON_EVTLOOP_H_
 #define _WX_MAC_CARBON_EVTLOOP_H_
 

-class OpaqueEventRef;
+struct OpaqueEventRef;

 typedef OpaqueEventRef *EventRef;
 
 typedef OpaqueEventRef *EventRef;
 

-class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopManual
+class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxCFEventLoop

 {
 public:
     wxGUIEventLoop();
 
 {
 public:
     wxGUIEventLoop();
 

-    // implement/override base class pure virtual
-    virtual bool Pending() const;
-    virtual bool Dispatch();
-    virtual int DispatchTimeout(unsigned long timeout);
+protected:
+    virtual int DoDispatchTimeout(unsigned long timeout);

 
 

-    virtual void WakeUp();
-
-private:
-    // dispatch an event and release it
-    void DispatchAndReleaseEvent(EventRef event);
-
-    double      m_sleepTime;
+    virtual void DoRun();
+    
+    virtual void DoStop();

 };
 
 #endif // _WX_MAC_CARBON_EVTLOOP_H_
 };
 
 #endif // _WX_MAC_CARBON_EVTLOOP_H_