]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix editing support.
authorKevin Ollivier <kevino@theolliviers.com>
Sat, 30 Sep 2006 04:25:03 +0000 (04:25 +0000)
committerKevin Ollivier <kevino@theolliviers.com>
Sat, 30 Sep 2006 04:25:03 +0000 (04:25 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mac/carbon/listctrl_mac.cpp

index 8c714894650fdb071b5e03044c63ecad703a594e..6e5848c6a460c66d89d74b51796255a3e7eab840 100644 (file)
@@ -1525,12 +1525,13 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
 
     OSStatus err = errDataBrowserPropertyNotSupported;
     wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
+    wxMacListCtrlItem* lcItem;
 
     if (listColumn >= 0)
     {
         if (!m_isVirtual)
         {
-            wxMacListCtrlItem* lcItem = (wxMacListCtrlItem*) itemID;
+            lcItem = (wxMacListCtrlItem*) itemID;
             if (lcItem->HasColumnInfo(listColumn)){
                 wxListItem* item = lcItem->GetColumnInfo(listColumn);
                 if (item->GetMask() & wxLIST_MASK_TEXT)
@@ -1599,7 +1600,13 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
                     CFStringRef sr ;
                     verify_noerr( GetDataBrowserItemDataText( itemData , &sr ) ) ;
                     wxMacCFStringHolder cfStr(sr) ;;
-                    list->SetItem( (long)itemData , listColumn, cfStr.AsString() ) ;
+                    if (m_isVirtual)
+                        list->SetItem( (long)itemData-1 , listColumn, cfStr.AsString() ) ;
+                    else
+                    {
+                        if (lcItem)
+                            lcItem->SetColumnTextValue( listColumn, cfStr.AsString() );
+                    }
                     err = noErr ;                        
                 }
                 break;