Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/cocoa/trackingrectmanager.h b/include/wx/cocoa/trackingrectmanager.h
index 40fac51aad10b09bdea3af9fb47bb0c3e17169e7..839685812c7c9f67c3fde9a756ee436ea53eb171 100644 (file)
--- a/include/wx/cocoa/trackingrectmanager.h
+++ b/include/wx/cocoa/trackingrectmanager.h
@@ -18,7 +18,7 @@
 
 class wxCocoaTrackingRectManager
 {
 
 class wxCocoaTrackingRectManager
 {

-    DECLARE_NO_COPY_CLASS(wxCocoaTrackingRectManager)
+    wxDECLARE_NO_COPY_CLASS(wxCocoaTrackingRectManager);

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


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

-    int m_trackingRectTag;
+    NSInteger m_trackingRectTag;

     NSRect m_trackingRectInWindowCoordinates;
 private:
     wxCocoaTrackingRectManager();
     NSRect m_trackingRectInWindowCoordinates;
 private:
     wxCocoaTrackingRectManager();