Compilation fix for wxCarbon after the last commit.

Apply corrected version of the patch for Carbon.

See #13661.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/dataview_osx.cpp b/src/osx/dataview_osx.cpp
index bc82df964aef8e814cfa4a259608a93a8bcef526..2886e1793497dd6aea41d7155c358b3fffc60965 100644 (file)
--- a/src/osx/dataview_osx.cpp
+++ b/src/osx/dataview_osx.cpp
@@ -713,7 +713,7 @@ void wxDataViewCtrl::OnMouse(wxMouseEvent& event)
     if (GetModel() == NULL)
         return;
 
     if (GetModel() == NULL)
         return;
 

-    wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));
+    wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(GetPeer()));

 
     int NoOfChildren;
     wxDataViewItemArray items;
 
     int NoOfChildren;
     wxDataViewItemArray items;


@@ -738,7 +738,7 @@ void wxDataViewCtrl::OnMouse(wxMouseEvent& event)
 
            Rect itemrect;
            ::GetDataBrowserItemPartBounds( MacDataViewListCtrlPtr->GetControlRef(),
 
            Rect itemrect;
            ::GetDataBrowserItemPartBounds( MacDataViewListCtrlPtr->GetControlRef(),

-              reinterpret_cast<DataBrowserItemID>(firstChild.GetID()), column->GetPropertyID(),
+              reinterpret_cast<DataBrowserItemID>(firstChild.GetID()), column->GetNativeData()->GetPropertyID(),

               kDataBrowserPropertyEnclosingPart, &itemrect );
 
            if (abs( event.GetX() - itemrect.right) < 3)
               kDataBrowserPropertyEnclosingPart, &itemrect );
 
            if (abs( event.GetX() - itemrect.right) < 3)