no changes, just remove #if'd out code

[wxWidgets.git] / include / wx / cocoa / trackingrectmanager.h

diff --git a/include/wx/cocoa/trackingrectmanager.h b/include/wx/cocoa/trackingrectmanager.h
index 3712b0d87a46e0323bed50494f87ba9e2b191fd9..839685812c7c9f67c3fde9a756ee436ea53eb171 100644 (file)
--- a/include/wx/cocoa/trackingrectmanager.h
+++ b/include/wx/cocoa/trackingrectmanager.h
@@ -14,13 +14,16 @@
 
 #include <CoreFoundation/CFRunLoop.h>
 
 
 #include <CoreFoundation/CFRunLoop.h>
 

+#define wxTRACE_COCOA_TrackingRect wxT("COCOA_TrackingRect")
+

 class wxCocoaTrackingRectManager
 {
 class wxCocoaTrackingRectManager
 {

-    DECLARE_NO_COPY_CLASS(wxCocoaTrackingRectManager)
+    wxDECLARE_NO_COPY_CLASS(wxCocoaTrackingRectManager);

 public:
     wxCocoaTrackingRectManager(wxWindow *window);
     void ClearTrackingRect();
     void BuildTrackingRect();
 public:
     wxCocoaTrackingRectManager(wxWindow *window);
     void ClearTrackingRect();
     void BuildTrackingRect();

+    void RebuildTrackingRectIfNeeded();

     void RebuildTrackingRect();
     bool IsOwnerOfEvent(NSEvent *anEvent);
     ~wxCocoaTrackingRectManager();
     void RebuildTrackingRect();
     bool IsOwnerOfEvent(NSEvent *anEvent);
     ~wxCocoaTrackingRectManager();


@@ -29,8 +32,8 @@ public:
 protected:
     wxWindow *m_window;
     bool m_isTrackingRectActive;
 protected:
     wxWindow *m_window;
     bool m_isTrackingRectActive;

-    int m_trackingRectTag;
-    CFRunLoopObserverRef m_runLoopObserver;
+    NSInteger m_trackingRectTag;
+    NSRect m_trackingRectInWindowCoordinates;

 private:
     wxCocoaTrackingRectManager();
 };
 private:
     wxCocoaTrackingRectManager();
 };