Increase interoperability between wxPoint and wxRealPoint introducing constructors...

[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 d704a9c50ca4b284ede5c64e002fb41eddf9e49c..94dc0fa5ef84c845a55ff6dd473c89bfc5af5978 100644 (file)
--- a/include/wx/osx/carbon/evtloop.h
+++ b/include/wx/osx/carbon/evtloop.h
@@ -12,27 +12,22 @@
 #ifndef _WX_MAC_CARBON_EVTLOOP_H_
 #define _WX_MAC_CARBON_EVTLOOP_H_
 
-class OpaqueEventRef;
+struct OpaqueEventRef;
 typedef OpaqueEventRef *EventRef;
 
-class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopManual
+class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxCFEventLoop
 {
 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();
-    virtual bool YieldFor(long eventsToProcess);
+    virtual void DoRun();
+    
+    virtual void DoStop();
 
-private:
-    // dispatch an event and release it
-    void DispatchAndReleaseEvent(EventRef event);
-
-    double      m_sleepTime;
+    virtual CFRunLoopRef CFGetCurrentRunLoop() const;
 };
 
 #endif // _WX_MAC_CARBON_EVTLOOP_H_