Remove temporary files created by wxFileName unit test case.

[wxWidgets.git] / src / osx / dataview_osx.cpp

diff --git a/src/osx/dataview_osx.cpp b/src/osx/dataview_osx.cpp
index 490f6d9fd71626c9fcb203823739877f8fda21d9..05ad19fcbee1e03fb45b255f550b36e71590bb2c 100644 (file)
--- a/src/osx/dataview_osx.cpp
+++ b/src/osx/dataview_osx.cpp
@@ -20,6 +20,9 @@
     #include "wx/dcclient.h"
     #include "wx/icon.h"
 #endif
     #include "wx/dcclient.h"
     #include "wx/icon.h"
 #endif

+#if wxOSX_USE_CARBON
+#include "wx/osx/carbon/dataview.h"
+#endif

 
 #include "wx/osx/core/dataview.h"
 #include "wx/osx/private.h"
 
 #include "wx/osx/core/dataview.h"
 #include "wx/osx/private.h"


@@ -527,6 +530,11 @@ void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item)
     GetDataViewPeer()->SetCurrentItem(item);
 }
 
     GetDataViewPeer()->SetCurrentItem(item);
 }
 

+wxDataViewColumn *wxDataViewCtrl::GetCurrentColumn() const
+{
+    return GetDataViewPeer()->GetCurrentColumn();
+}
+

 wxRect wxDataViewCtrl::GetItemRect(wxDataViewItem const& item, wxDataViewColumn const* columnPtr) const
 {
   if (item.IsOk() && (columnPtr != NULL))
 wxRect wxDataViewCtrl::GetItemRect(wxDataViewItem const& item, wxDataViewColumn const* columnPtr) const
 {
   if (item.IsOk() && (columnPtr != NULL))


@@ -627,9 +635,9 @@ void wxDataViewCtrl::AddChildren(wxDataViewItem const& parentItem)
   (void) GetModel()->ItemsAdded(parentItem,items);
 }
 
   (void) GetModel()->ItemsAdded(parentItem,items);
 }
 

-void wxDataViewCtrl::StartEditor( const wxDataViewItem & item, unsigned int column )
+void wxDataViewCtrl::EditItem(const wxDataViewItem& item, const wxDataViewColumn *column)

 {
 {

-    GetDataViewPeer()->StartEditor(item, column);
+    GetDataViewPeer()->StartEditor(item, GetColumnPosition(column));

 }
 
 void wxDataViewCtrl::FinishCustomItemEditing()
 }
 
 void wxDataViewCtrl::FinishCustomItemEditing()


@@ -706,12 +714,11 @@ void wxDataViewCtrl::OnMouse(wxMouseEvent& event)
 {
     event.Skip();
 
 {
     event.Skip();
 

+#if wxOSX_USE_CARBON

     if (GetModel() == NULL)
         return;
 
     if (GetModel() == NULL)
         return;
 

-#if 0
-    // Doesn't compile anymore
-    wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));
+    wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(GetPeer()));

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


@@ -736,7 +743,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)


@@ -750,7 +757,6 @@ void wxDataViewCtrl::OnMouse(wxMouseEvent& event)
        }
 
     }
        }
 
     }

-

     SetCursor( *wxSTANDARD_CURSOR );
 #endif
 }
     SetCursor( *wxSTANDARD_CURSOR );
 #endif
 }