When wxPGProperty is un-attached from wxPropertyGrid, keep its 'default' cell referen...

[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..9db46aa1dabe2ef17825fc1b400381c93b81fff6 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:
 // Purpose:     declaration of wxEventLoop for wxMac
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -12,26 +12,22 @@
 #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();
+    virtual void DoRun();

 
 

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

 
 

-    double      m_sleepTime;
+    virtual CFRunLoopRef CFGetCurrentRunLoop() const;

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