adding CoreText implementation

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

diff --git a/src/mac/carbon/listctrl_mac.cpp b/src/mac/carbon/listctrl_mac.cpp
index ddd717dbecdd2d849416697ae082ee30425c7ead..ba97e1840b85134c60673d6670cbfef176436592 100644 (file)
--- a/src/mac/carbon/listctrl_mac.cpp
+++ b/src/mac/carbon/listctrl_mac.cpp
@@ -102,7 +102,7 @@ wxEND_HANDLERS_TABLE()
 wxCONSTRUCTOR_5( wxListCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
 
 /*
- TODO : Expose more information of a list's layout etc. via appropriate objects (à la NotebookPageInfo)
+ TODO : Expose more information of a list's layout etc. via appropriate objects (￠ la NotebookPageInfo)
 */
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
@@ -152,7 +152,7 @@ static pascal OSStatus wxMacListCtrlEventHandler( EventHandlerCallRef handler ,
                     // 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...
                     if (!window->IsVirtual())
-                        window->GetEventHandler()->ProcessEvent( le );
+                        window->HandleWindowEvent( le );
                 }
                 result = CallNextEventHandler(handler, event);
                 break;
@@ -259,11 +259,11 @@ protected:
                                     Rect *maxEditTextRect,
                                     Boolean *shrinkToFit);
 
-    static pascal Boolean  DataBrowserHitTestProc(ControlRef browser,
-                                    DataBrowserItemID itemID,
-                                    DataBrowserPropertyID property,
-                                    const Rect *theRect,
-                                    const Rect *mouseRect) { return true; }
+    static pascal Boolean  DataBrowserHitTestProc(ControlRef WXUNUSED(browser),
+                                    DataBrowserItemID WXUNUSED(itemID),
+                                    DataBrowserPropertyID WXUNUSED(property),
+                                    const Rect *WXUNUSED(theRect),
+                                    const Rect *WXUNUSED(mouseRect)) { return true; }
 
     virtual bool        ConfirmEditText(DataBrowserItemID item,
                                     DataBrowserPropertyID property,
@@ -305,7 +305,7 @@ bool wxMacListCtrlEventDelegate::ProcessEvent( wxEvent& event )
 
     if ( !event.IsKindOf( CLASSINFO( wxCommandEvent ) ) )
     {
-        if (m_list->GetEventHandler()->ProcessEvent( event ))
+        if (m_list->HandleWindowEvent( event ))
             return true;
     }
     return wxEvtHandler::ProcessEvent(event);
@@ -648,7 +648,7 @@ void wxListCtrl::FireMouseEvent(wxEventType eventType, wxPoint position)
         le.m_itemIndex = item;
         le.m_item.m_itemId = item;
         GetItem(le.m_item);
-        GetEventHandler()->ProcessEvent(le);
+        HandleWindowEvent(le);
     }
 }
 
@@ -697,7 +697,7 @@ void wxListCtrl::OnChar(wxKeyEvent& event)
             le.m_itemIndex = m_current;
             le.m_item.m_itemId = m_current;
             GetItem(le.m_item);
-            GetEventHandler()->ProcessEvent(le);
+            HandleWindowEvent(le);
         }
     }
     event.Skip();
@@ -980,13 +980,13 @@ bool wxListCtrl::SetColumn(int col, wxListItem& item)
 
         if (item.GetMask() & wxLIST_MASK_IMAGE && item.GetImage() != -1 )
         {
-            columnDesc.btnContentInfo.contentType = kControlContentIconRef;
             wxImageList* imageList = GetImageList(wxIMAGE_LIST_SMALL);
             if (imageList && imageList->GetImageCount() > 0 )
             {
                 wxBitmap bmp = imageList->GetBitmap( item.GetImage() );
-                IconRef icon = bmp.GetBitmapData()->GetIconRef();
+                IconRef icon = bmp.GetIconRef();
                 columnDesc.btnContentInfo.u.iconRef = icon;
+                columnDesc.btnContentInfo.contentType = kControlContentIconRef;
             }
         }
 
@@ -1076,6 +1076,10 @@ int wxListCtrl::GetCountPerPage() const
 
     if (m_dbImpl)
     {
+        UInt16 height = 1;
+        m_dbImpl->GetDefaultRowHeight( &height );
+        if (height > 0)
+            return GetClientSize().y / height;
     }
 
     return 1;
@@ -1101,7 +1105,15 @@ bool wxListCtrl::GetItem(wxListItem& info) const
         if (!IsVirtual())
         {
             if (info.m_itemId >= 0 && info.m_itemId < GetItemCount())
+            {
                 m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info);
+                if (info.GetMask() & wxLIST_MASK_STATE)
+                {
+                    DataBrowserItemID id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(info.m_itemId);
+                    if (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), id ))
+                        info.SetState(info.GetState() | wxLIST_STATE_SELECTED);
+                }
+            }
         }
         else
         {
@@ -1326,7 +1338,7 @@ long wxListCtrl::GetItemData(long item) const
 }
 
 // Sets the item data
-bool wxListCtrl::SetItemData(long item, long data)
+bool wxListCtrl::SetItemPtrData(long item, wxUIntPtr data)
 {
     if (m_genericImpl)
         return m_genericImpl->SetItemData(item, data);
@@ -1731,7 +1743,7 @@ bool wxListCtrl::DeleteItem(long item)
         wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ITEM, GetId() );
         event.SetEventObject( this );
         event.m_itemIndex = item;
-        GetEventHandler()->ProcessEvent( event );
+        HandleWindowEvent( event );
 
     }
     return true;
@@ -1748,7 +1760,7 @@ bool wxListCtrl::DeleteAllItems()
         m_dbImpl->MacClear();
         wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, GetId() );
         event.SetEventObject( this );
-        GetEventHandler()->ProcessEvent( event );
+        HandleWindowEvent( event );
     }
     return true;
 }
@@ -1822,7 +1834,7 @@ wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
         le.m_col = 0;
         GetItem( le.m_item );
 
-        if ( GetParent()->GetEventHandler()->ProcessEvent( le ) && !le.IsAllowed() )
+        if ( GetParent()->HandleWindowEvent( le ) && !le.IsAllowed() )
         {
             // vetoed by user code
             return NULL;
@@ -1836,7 +1848,7 @@ wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
 }
 
 // End label editing, optionally cancelling the edit
-bool wxListCtrl::EndEditLabel(bool cancel)
+bool wxListCtrl::EndEditLabel(bool WXUNUSED(cancel))
 {
     // TODO: generic impl. doesn't have this method - is it needed for us?
     if (m_genericImpl)
@@ -2021,7 +2033,7 @@ long wxListCtrl::InsertItem(wxListItem& info)
         wxListEvent event( wxEVT_COMMAND_LIST_INSERT_ITEM, GetId() );
         event.SetEventObject( this );
         event.m_itemIndex = info.m_itemId;
-        GetEventHandler()->ProcessEvent( event );
+        HandleWindowEvent( event );
         return info.m_itemId;
     }
     return -1;
@@ -2188,7 +2200,7 @@ bool wxListCtrl::OnRenameAccept(long itemEdit, const wxString& value)
 
     GetItem( le.m_item );
     le.m_item.m_text = value;
-    return !GetEventHandler()->ProcessEvent( le ) ||
+    return !HandleWindowEvent( le ) ||
                 le.IsAllowed();
 }
 
@@ -2203,7 +2215,7 @@ void wxListCtrl::OnRenameCancelled(long itemEdit)
     le.m_itemIndex = itemEdit;
 
     GetItem( le.m_item );
-    GetEventHandler()->ProcessEvent( le );
+    HandleWindowEvent( le );
 }
 
 // ----------------------------------------------------------------------------
@@ -2352,7 +2364,7 @@ wxMacListCtrlItem::~wxMacListCtrlItem()
 
 void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
     DataBrowserItemNotification message,
-    DataBrowserItemDataRef itemData ) const
+    DataBrowserItemDataRef WXUNUSED(itemData) ) const
 {
 
     wxMacDataBrowserListCtrlControl *lb = wxDynamicCast(owner, wxMacDataBrowserListCtrlControl);
@@ -2498,9 +2510,7 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer
 
     if ( style & wxLC_VRULES )
     {
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
         verify_noerr( DataBrowserChangeAttributes(m_controlRef, kDataBrowserAttributeListViewDrawColumnDividers, kDataBrowserAttributeNone) );
-#endif
     }
 
     verify_noerr( SetHiliteStyle(kDataBrowserTableViewFillHilite ) );
@@ -2526,11 +2536,11 @@ pascal Boolean wxMacDataBrowserListCtrlControl::DataBrowserEditTextProc(
 }
 
 bool wxMacDataBrowserListCtrlControl::ConfirmEditText(
-        DataBrowserItemID itemID,
-        DataBrowserPropertyID property,
-        CFStringRef theString,
-        Rect *maxEditTextRect,
-        Boolean *shrinkToFit)
+        DataBrowserItemID WXUNUSED(itemID),
+        DataBrowserPropertyID WXUNUSED(property),
+        CFStringRef WXUNUSED(theString),
+        Rect *WXUNUSED(maxEditTextRect),
+        Boolean *WXUNUSED(shrinkToFit))
 {
     return false;
 }
@@ -2589,7 +2599,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
         DataBrowserItemID itemID,
         DataBrowserPropertyID property,
         DataBrowserItemState itemState,
-        const Rect *itemRect,
+        const Rect *WXUNUSED(itemRect),
         SInt16 gdDepth,
         Boolean colorDevice)
 {
@@ -2719,13 +2729,13 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
     {
 
         if (color.Ok())
-            labelColor = MAC_WXCOLORREF( color.GetPixel() );
+            color.GetRGBColor(&labelColor);
         else if (list->GetTextColour().Ok())
-            labelColor = MAC_WXCOLORREF( list->GetTextColour().GetPixel() );
+            list->GetTextColour().GetRGBColor(&labelColor);
 
         if (bgColor.Ok())
         {
-            backgroundColor = MAC_WXCOLORREF( bgColor.GetPixel() );
+            bgColor.GetRGBColor(&backgroundColor);
             CGContextSaveGState(context);
 
             CGContextSetRGBFillColor(context, (float)backgroundColor.red / (float)USHRT_MAX,
@@ -2744,7 +2754,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
         wxImageList* imageList = list->GetImageList(wxIMAGE_LIST_SMALL);
         if (imageList && imageList->GetImageCount() > 0){
             wxBitmap bmp = imageList->GetBitmap(imgIndex);
-            IconRef icon = bmp.GetBitmapData()->GetIconRef();
+            IconRef icon = bmp.GetIconRef();
 
             CGContextSaveGState(context);
             CGContextTranslateCTM(context, 0,iconCGRect.origin.y + CGRectGetMaxY(iconCGRect));
@@ -2758,19 +2768,29 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
     }
 
     HIThemeTextHorizontalFlush hFlush = kHIThemeTextHorizontalFlushLeft;
-    UInt16 fontID = kThemeViewsFont;
+    HIThemeTextInfo info;
+
+#ifdef __LP64__
+    info.version = kHIThemeTextInfoVersionOne;
+    info.fontID = kThemeViewsFont;
+    if (font.Ok())
+    {
+        info.fontID = kThemeSpecifiedFont;
+        info.font = (CTFontRef) font.MacGetCTFont();
+    }
+#else
+    info.version = kHIThemeTextInfoVersionZero;
+    info.fontID = kThemeViewsFont;
 
     if (font.Ok())
     {
         if (font.GetFamily() != wxFONTFAMILY_DEFAULT)
-            fontID = font.MacGetThemeFontID();
+            info.fontID = font.MacGetThemeFontID();
 
-// FIXME: replace these with CG or ATSUI calls so we can remove this #ifndef.
-#ifndef __LP64__
         ::TextSize( (short)(font.MacGetFontSize()) ) ;
         ::TextFace( font.MacGetFontStyle() ) ;
-#endif
     }
+#endif
 
     wxListItem item;
     list->GetColumn(listColumn, item);
@@ -2787,10 +2807,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
         }
     }
 
-    HIThemeTextInfo info;
-    info.version = kHIThemeTextInfoVersionZero;
     info.state = active ? kThemeStateActive : kThemeStateInactive;
-    info.fontID = fontID;
     info.horizontalFlushness = hFlush;
     info.verticalFlushness = kHIThemeTextVerticalFlushCenter;
     info.options = kHIThemeTextBoxOptionNone;
@@ -2806,8 +2823,10 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
 
     CGContextRestoreGState(context);
 
+#ifndef __LP64__
     if (savedState != NULL)
         SetThemeDrawingState(savedState, true);
+#endif
 }
 
 OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemID,
@@ -2855,13 +2874,19 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
                 if ( list && list->HasFlag( wxLC_EDIT_LABELS ) )
                 {
                     verify_noerr(SetDataBrowserItemDataBooleanValue( itemData, true ));
+                    err = noErr ;
                 }
                 break ;
             default :
                 if ( property >= kMinColumnId )
                 {
-                    wxMacCFStringHolder cfStr(text);
-                    verify_noerr( ::SetDataBrowserItemDataText( itemData, cfStr) );
+                    wxMacCFStringHolder cfStr;
+
+                    if (!text.IsEmpty()){
+                        cfStr.Assign( text, wxLocale::GetSystemEncoding() );
+                        err = ::SetDataBrowserItemDataText( itemData, cfStr );
+                        err = noErr;
+                    }
 
 
 
@@ -2870,7 +2895,7 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
                         wxImageList* imageList = list->GetImageList(wxIMAGE_LIST_SMALL);
                         if (imageList && imageList->GetImageCount() > 0){
                             wxBitmap bmp = imageList->GetBitmap(imgIndex);
-                            IconRef icon = bmp.GetBitmapData()->GetIconRef();
+                            IconRef icon = bmp.GetIconRef();
                             ::SetDataBrowserItemDataIcon(itemData, icon);
                         }
                     }
@@ -2911,7 +2936,7 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
 
 void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
     DataBrowserItemNotification message,
-    DataBrowserItemDataRef itemData )
+    DataBrowserItemDataRef WXUNUSED(itemData) )
 {
     // we want to depend on as little as possible to make sure tear-down of controls is safe
     if ( message == kDataBrowserItemRemoved)
@@ -2932,7 +2957,6 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
         bool trigger = false;
 
         wxListEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() );
-        bool isSingle = (list->GetWindowStyle() & wxLC_SINGLE_SEL) != 0;
 
         event.SetEventObject( list );
         if ( !list->IsVirtual() )
@@ -2952,8 +2976,9 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
         {
             case kDataBrowserItemDeselected:
                 event.SetEventType(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
-                if ( !isSingle )
-                    trigger = !IsSelectionSuppressed();
+                // as the generic implementation is also triggering this
+                // event for single selection, we do the same (different than listbox)
+                trigger = !IsSelectionSuppressed();
                 break;
 
             case kDataBrowserItemSelected:
@@ -3097,7 +3122,7 @@ void wxMacDataBrowserListCtrlControl::UpdateState(wxMacDataItem* dataItem, wxLis
     bool isSelectedState = (listItem->GetState() == wxLIST_STATE_SELECTED);
 
     // toggle the selection state if wxListInfo state and actual state don't match.
-    if ( isSelected != isSelectedState )
+    if ( listItem->GetMask() & wxLIST_MASK_STATE && isSelected != isSelectedState )
     {
         DataBrowserSetOption options = kDataBrowserItemsAdd;
         if (!isSelectedState)