wxRichTextCtrl native caret now flashes, for wxMac/Core Graphics mode

[wxWidgets.git] / src / osx / carbon / listctrl_mac.cpp

diff --git a/src/osx/carbon/listctrl_mac.cpp b/src/osx/carbon/listctrl_mac.cpp
index fb89dc344ca029e082afda45e820346fc95f051e..668d141a0af0adcc90ee33c634a6f8e8c1773261 100644 (file)
--- a/src/osx/carbon/listctrl_mac.cpp
+++ b/src/osx/carbon/listctrl_mac.cpp
@@ -148,7 +148,10 @@ static pascal OSStatus wxMacListCtrlEventHandler( EventHandlerCallRef handler ,
                 if (result == kControlButtonPart){
                     DataBrowserPropertyID col;
                     GetDataBrowserSortProperty(controlRef, &col);
-                    int column = col - kMinColumnId;
+                    
+                    DataBrowserTableViewColumnIndex column = 0;
+                    verify_noerr( GetDataBrowserTableViewColumnPosition( controlRef, col, &column ) );
+                    
                     le.m_col = column;
                     // FIXME: we can't use the sort property for virtual listctrls
                     // so we need to find a better way to determine which column was clicked...
@@ -297,6 +300,9 @@ wxMacListCtrlEventDelegate::wxMacListCtrlEventDelegate( wxListCtrl* list, int id
 
 bool wxMacListCtrlEventDelegate::ProcessEvent( wxEvent& event )
 {
+    int id = event.GetId();
+    wxObject* obj = event.GetEventObject();
+    
     // even though we use a generic list ctrl underneath, make sure
     // we present ourselves as wxListCtrl.
     event.SetEventObject( m_list );
@@ -304,10 +310,20 @@ bool wxMacListCtrlEventDelegate::ProcessEvent( wxEvent& event )
 
     if ( !event.IsKindOf( CLASSINFO( wxCommandEvent ) ) )
     {
-        if (m_list->HandleWindowEvent( event ))
+        if (m_list->GetEventHandler()->ProcessEvent( event ))
+        {
+            event.SetId(id);
+            event.SetEventObject(obj);
             return true;
+        }
     }
-    return wxEvtHandler::ProcessEvent(event);
+    // Also try with the original id
+    bool success = wxEvtHandler::ProcessEvent(event);
+    event.SetId(id);
+    event.SetEventObject(obj);
+    if (!success && id != m_id)
+        success = wxEvtHandler::ProcessEvent(event);
+    return success;
 }
 
 //-----------------------------------------------------------------------------
@@ -613,7 +629,8 @@ void wxListCtrl::OnLeftDown(wxMouseEvent& event)
 
 void wxListCtrl::OnDblClick(wxMouseEvent& event)
 {
-    m_current = -1;
+    if ( m_renameTimer->IsRunning() )
+        m_renameTimer->Stop();
     event.Skip();
 }
 
@@ -780,7 +797,7 @@ wxListCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 
     attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
-    attr.font.MacCreateFromThemeFont(kThemeViewsFont);
+    attr.font.CreateSystemFont(wxOSX_SYSTEM_FONT_VIEWS);
 
     return attr;
 }
@@ -945,13 +962,9 @@ bool wxListCtrl::SetColumn(int col, wxListItem& item)
 
     if (m_dbImpl)
     {
+        wxASSERT_MSG( col < (int)m_colsInfo.GetCount(), _T("invalid column index in wxMacListCtrlItem") );
+        
         long mask = item.GetMask();
-        if ( col >= (int)m_colsInfo.GetCount() )
-        {
-            wxListItem* listItem = new wxListItem(item);
-            m_colsInfo.Append( listItem );
-        }
-        else
         {
             wxListItem listItem;
             GetColumn( col, listItem );
@@ -973,7 +986,10 @@ bool wxListCtrl::SetColumn(int col, wxListItem& item)
         // change the appearance in the databrowser.
         DataBrowserListViewHeaderDesc columnDesc;
         columnDesc.version=kDataBrowserListViewLatestHeaderDesc;
-        verify_noerr( m_dbImpl->GetHeaderDesc( kMinColumnId + col, &columnDesc ) );
+
+        DataBrowserTableViewColumnID id = 0;
+        verify_noerr( m_dbImpl->GetColumnIDFromIndex( col, &id ) );
+        verify_noerr( m_dbImpl->GetHeaderDesc( id, &columnDesc ) );
 
         /*
         if (item.GetMask() & wxLIST_MASK_TEXT)
@@ -1003,7 +1019,7 @@ bool wxListCtrl::SetColumn(int col, wxListItem& item)
             }
         }
 
-        verify_noerr( m_dbImpl->SetHeaderDesc( kMinColumnId + col, &columnDesc ) );
+        verify_noerr( m_dbImpl->SetHeaderDesc( id, &columnDesc ) );
 
     }
     return true;
@@ -1126,6 +1142,8 @@ bool wxListCtrl::GetItem(wxListItem& info) const
             if (info.m_itemId >= 0 && info.m_itemId < GetItemCount())
             {
                 m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info);
+                // MacGetColumnInfo returns erroneous information in the state field, so zero it.
+                info.SetState(0);
                 if (info.GetMask() & wxLIST_MASK_STATE)
                 {
                     DataBrowserItemID id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(info.m_itemId);
@@ -1383,6 +1401,15 @@ wxRect wxListCtrl::GetViewRect() const
     return rect;
 }
 
+bool wxListCtrl::GetSubItemRect( long item, long subItem, wxRect& rect, int code ) const
+{
+    if (m_genericImpl)
+        return m_genericImpl->GetSubItemRect(item, subItem, rect, code);
+
+    // TODO: implement for DataBrowser implementation        
+    return false;
+}
+
 // Gets the item rectangle
 bool wxListCtrl::GetItemRect(long item, wxRect& rect, int code) const
 {
@@ -1393,7 +1420,10 @@ bool wxListCtrl::GetItemRect(long item, wxRect& rect, int code) const
     if (m_dbImpl)
     {
         DataBrowserItemID id;
-        DataBrowserPropertyID col = kMinColumnId;
+
+        DataBrowserTableViewColumnID col = 0;
+        verify_noerr( m_dbImpl->GetColumnIDFromIndex( 0, &col ) );
+        
         Rect bounds;
         DataBrowserPropertyPart part = kDataBrowserPropertyEnclosingPart;
         if ( code == wxLIST_RECT_LABEL )
@@ -1640,6 +1670,9 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const
                 if ( !IsVirtual() )
                     id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
 
+                if ( (state & wxLIST_STATE_FOCUSED) && (m_current == line)) 
+                    return line;
+
                 if ( (state == wxLIST_STATE_DONTCARE ) )
                     return line;
 
@@ -1660,6 +1693,9 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const
                 if ( !IsVirtual() )
                     id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
 
+                if ( (state & wxLIST_STATE_FOCUSED) && (m_current == line)) 
+                    return line;
+
                 if ( (state == wxLIST_STATE_DONTCARE ) )
                     return line;
 
@@ -1771,6 +1807,7 @@ bool wxListCtrl::DeleteItem(long item)
 // Deletes all items
 bool wxListCtrl::DeleteAllItems()
 {
+    m_current = -1;
     if (m_genericImpl)
         return m_genericImpl->DeleteAllItems();
 
@@ -1874,7 +1911,11 @@ bool wxListCtrl::EndEditLabel(bool WXUNUSED(cancel))
         return true; // m_genericImpl->EndEditLabel(cancel);
 
     if (m_dbImpl)
-        verify_noerr( SetDataBrowserEditItem(m_dbImpl->GetControlRef(), kDataBrowserNoItem, kMinColumnId) );
+    {
+        DataBrowserTableViewColumnID id = 0;
+        verify_noerr( m_dbImpl->GetColumnIDFromIndex( 0, &id ) );
+        verify_noerr( SetDataBrowserEditItem(m_dbImpl->GetControlRef(), kDataBrowserNoItem, id ) );
+    }
     return true;
 }
 
@@ -2129,6 +2170,9 @@ long wxListCtrl::InsertColumn(long col, wxListItem& item)
                 just = teFlushRight;
         }
         m_dbImpl->InsertColumn(col, type, item.GetText(), just, width);
+        
+        wxListItem* listItem = new wxListItem(item);
+        m_colsInfo.Insert( col, listItem );
         SetColumn(col, item);
 
         // set/remove options based on the wxListCtrl type.
@@ -2184,7 +2228,7 @@ bool wxListCtrl::ScrollList(int dx, int dy)
 }
 
 
-bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
+bool wxListCtrl::SortItems(wxListCtrlCompare fn, wxIntPtr data)
 {
     if (m_genericImpl)
         return m_genericImpl->SortItems(fn, data);
@@ -2659,8 +2703,10 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
     wxString text;
     wxFont font = wxNullFont;
     int imgIndex = -1;
-    short listColumn = property - kMinColumnId;
-
+    
+    DataBrowserTableViewColumnIndex listColumn = 0;
+    GetColumnPosition( property, &listColumn );
+    
     wxListCtrl* list = wxDynamicCast( GetWXPeer() , wxListCtrl );
     wxMacListCtrlItem* lcItem;
     wxColour color = *wxBLACK;
@@ -2671,7 +2717,8 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
         if (!m_isVirtual)
         {
             lcItem = (wxMacListCtrlItem*) itemID;
-            if (lcItem->HasColumnInfo(listColumn)){
+            if (lcItem->HasColumnInfo(listColumn))
+            {
                 wxListItem* item = lcItem->GetColumnInfo(listColumn);
 
                 // we always use the 0 column to get font and text/background colors.
@@ -2829,7 +2876,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
         if (font.Ok())
         {
             info.fontID = kThemeSpecifiedFont;
-            info.font = (CTFontRef) font.MacGetCTFont();
+            info.font = (CTFontRef) font.OSXGetCTFont();
             setup = true;
         }
     }
@@ -2844,7 +2891,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
         {
             info.fontID = font.MacGetThemeFontID();
 
-            ::TextSize( (short)(font.MacGetFontSize()) ) ;
+            ::TextSize( (short)(font.GetPointSize()) ) ;
             ::TextFace( font.MacGetFontStyle() ) ;
         }
     }
@@ -2894,7 +2941,9 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
 {
     wxString text;
     int imgIndex = -1;
-    short listColumn = property - kMinColumnId;
+
+    DataBrowserTableViewColumnIndex listColumn = 0;
+    verify_noerr( GetColumnPosition( property, &listColumn ) );
 
     OSStatus err = errDataBrowserPropertyNotSupported;
     wxListCtrl* list = wxDynamicCast( GetWXPeer() , wxListCtrl );
@@ -2968,7 +3017,8 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
              default:
                 if ( property >= kMinColumnId )
                 {
-                    short listColumn = property - kMinColumnId;
+                    DataBrowserTableViewColumnIndex listColumn = 0;
+                    verify_noerr( GetColumnPosition( property, &listColumn ) );
 
                     // TODO probably send the 'end edit' from here, as we
                     // can then deal with the veto
@@ -3092,7 +3142,8 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
     long itemOrder;
     long otherItemOrder;
 
-    int colId = sortProperty - kMinColumnId;
+    DataBrowserTableViewColumnIndex colId = 0;
+    verify_noerr( GetColumnPosition( sortProperty, &colId ) );
 
     wxListCtrl* list = wxDynamicCast( GetWXPeer() , wxListCtrl );
 
@@ -3162,7 +3213,7 @@ void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsign
     wxASSERT_MSG( dataItem, _T("could not obtain wxMacDataItem for row in MacSetColumnInfo. Is row a valid wxListCtrl row?") );
     if (item)
     {
-        wxMacListCtrlItem* listItem = wx_static_cast(wxMacListCtrlItem*,dataItem);
+        wxMacListCtrlItem* listItem = static_cast<wxMacListCtrlItem *>(dataItem);
         bool hasInfo = listItem->HasColumnInfo( column );
         listItem->SetColumnInfo( column, item );
         listItem->SetOrder(row);
@@ -3176,7 +3227,11 @@ void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsign
         // would be shown. Making sure not to update items until the control is visible
         // seems to fix this issue.
         if (hasInfo && list->IsShown())
-            UpdateItem( wxMacDataBrowserRootContainer, listItem , kMinColumnId + column );
+        {
+            DataBrowserTableViewColumnID id = 0;
+            verify_noerr( GetColumnIDFromIndex( column, &id ) );
+            UpdateItem( wxMacDataBrowserRootContainer, listItem , id );
+        }
     }
 }
 
@@ -3205,7 +3260,7 @@ void wxMacDataBrowserListCtrlControl::MacGetColumnInfo( unsigned int row, unsign
     // CS should this guard against dataItem = 0 ? , as item is not a pointer if (item) is not appropriate
     //if (item)
     {
-        wxMacListCtrlItem* listItem =wx_static_cast(wxMacListCtrlItem*,dataItem);
+        wxMacListCtrlItem* listItem = static_cast<wxMacListCtrlItem *>(dataItem);
 
         if (!listItem->HasColumnInfo( column ))
             return;