Don't interpret '&' specially in wxTextWrapper.

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

diff --git a/include/wx/osx/evtloop.h b/include/wx/osx/evtloop.h
index 4e45db718cdb3689f6888cdb68a0b32f48f6bcc5..00a5258fce51629aab1f046caa781e04b00d6db7 100644 (file)
--- a/include/wx/osx/evtloop.h
+++ b/include/wx/osx/evtloop.h
@@ -53,9 +53,14 @@ public:
       AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags);
 #endif // wxUSE_EVENTLOOP_SOURCE
 
       AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags);
 #endif // wxUSE_EVENTLOOP_SOURCE
 

-    void ObserverCallBack(CFRunLoopObserverRef observer, int activity);

 
 protected:
 
 protected:

+    void CommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity);
+    void DefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity);
+
+    static void OSXCommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info);
+    static void OSXDefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info);
+

     // get the currently executing CFRunLoop
     virtual CFRunLoopRef CFGetCurrentRunLoop() const;
 
     // get the currently executing CFRunLoop
     virtual CFRunLoopRef CFGetCurrentRunLoop() const;
 


@@ -74,8 +79,11 @@ protected:
     // cfrunloop
     CFRunLoopRef m_runLoop;
 
     // cfrunloop
     CFRunLoopRef m_runLoop;
 

-    // runloop observer
-    CFRunLoopObserverRef m_runLoopObserver;
+    // common modes runloop observer
+    CFRunLoopObserverRef m_commonModeRunLoopObserver;
+
+    // default mode runloop observer
+    CFRunLoopObserverRef m_defaultModeRunLoopObserver;

 
 private:
     // process all already pending events and dispatch a new one (blocking
 
 private:
     // process all already pending events and dispatch a new one (blocking