guarding agains NULL

[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 60f5704574a06b7a9057ff99f51f689f5b1356c8..8a80fef3fa12cc207ea302cb6c47df96f82de84c 100644 (file)
--- a/include/wx/osx/carbon/evtloop.h
+++ b/include/wx/osx/carbon/evtloop.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/evtloop.h
+// Name:        wx/osx/carbon/evtloop.h
 // Purpose:     declaration of wxEventLoop for wxMac
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -12,18 +12,24 @@
 #ifndef _WX_MAC_CARBON_EVTLOOP_H_
 #define _WX_MAC_CARBON_EVTLOOP_H_
 
-class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopManual
+struct OpaqueEventRef;
+typedef OpaqueEventRef *EventRef;
+
+class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxCFEventLoop
 {
 public:
     wxGUIEventLoop();
 
-    virtual bool Pending() const;
-    virtual bool Dispatch();
-
-    // implement base class pure virtual
     virtual void WakeUp();
-private:
-    double      m_sleepTime;
+
+protected:
+    virtual int DoDispatchTimeout(unsigned long timeout);
+
+    virtual void DoRun();
+
+    virtual void DoStop();
+
+    virtual CFRunLoopRef CFGetCurrentRunLoop() const;
 };
 
 #endif // _WX_MAC_CARBON_EVTLOOP_H_