fixed gcc warning about size_t/src/common/dbgrid.cppi printf format spec mismatch

[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 b3ed2a593dc9b4f986337ec665669ed88ebe2c39..285376b8d9e5e8acd00660227aefb56d926a5b1c 100644 (file)
--- a/src/mac/carbon/listctrl_mac.cpp
+++ b/src/mac/carbon/listctrl_mac.cpp
@@ -149,7 +149,10 @@ static pascal OSStatus wxMacListCtrlEventHandler( EventHandlerCallRef handler ,
                     GetDataBrowserSortProperty(controlRef, &col);
                     int column = col - kMinColumnId;
                     le.m_col = column;
                     GetDataBrowserSortProperty(controlRef, &col);
                     int column = col - kMinColumnId;
                     le.m_col = column;

-                    window->GetEventHandler()->ProcessEvent( le );
+                    // 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 );

                 }
                 result = CallNextEventHandler(handler, event);
                 break;
                 }
                 result = CallNextEventHandler(handler, event);
                 break;


@@ -805,7 +808,6 @@ bool wxListCtrl::GetColumn(int col, wxListItem& item) const
 
     if (m_dbImpl)
     {
 
     if (m_dbImpl)
     {

-

         wxColumnList::compatibility_iterator node = m_colsInfo.Item( col );
         wxASSERT_MSG( node, _T("invalid column index in wxMacListCtrlItem") );
         wxListItem* column = node->GetData();
         wxColumnList::compatibility_iterator node = m_colsInfo.Item( col );
         wxASSERT_MSG( node, _T("invalid column index in wxMacListCtrlItem") );
         wxListItem* column = node->GetData();


@@ -1008,6 +1010,12 @@ bool wxListCtrl::GetItem(wxListItem& info) const
         {
             info.SetText( OnGetItemText(info.m_itemId, info.m_col) );
             info.SetImage( OnGetItemColumnImage(info.m_itemId, info.m_col) );
         {
             info.SetText( OnGetItemText(info.m_itemId, info.m_col) );
             info.SetImage( OnGetItemColumnImage(info.m_itemId, info.m_col) );

+            if (info.GetMask() & wxLIST_MASK_STATE)
+            {
+                if (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), info.m_itemId+1 )) 
+                    info.SetState(info.GetState() | wxLIST_STATE_SELECTED);
+            }
+            

             wxListItemAttr* attrs = OnGetItemAttr( info.m_itemId );
             if (attrs)
             {
             wxListItemAttr* attrs = OnGetItemAttr( info.m_itemId );
             if (attrs)
             {


@@ -1058,16 +1066,32 @@ int wxListCtrl::GetItemState(long item, long stateMask) const
     if (m_genericImpl)
         return m_genericImpl->GetItemState(item, stateMask);
 
     if (m_genericImpl)
         return m_genericImpl->GetItemState(item, stateMask);
 

-    wxListItem info;
+    if (m_dbImpl)
+    {
+        if ( HasFlag(wxLC_VIRTUAL) )
+        {
+            if (stateMask == wxLIST_STATE_SELECTED)
+            { 
+                if (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), item+1 )) 
+                    return wxLIST_STATE_SELECTED;
+                else
+                    return 0; 
+            }
+        }
+        else
+        {
+            wxListItem info;

 
 

-    info.m_mask = wxLIST_MASK_STATE;
-    info.m_stateMask = stateMask;
-    info.m_itemId = item;
+            info.m_mask = wxLIST_MASK_STATE;
+            info.m_stateMask = stateMask;
+            info.m_itemId = item;

 
 

-    if (!GetItem(info))
-        return 0;
+            if (!GetItem(info))
+                return 0;

 
 

-    return info.m_state;
+            return info.m_state;
+        }
+    }

 }
 
 // Sets the item state
 }
 
 // Sets the item state


@@ -1075,13 +1099,52 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
 {
     if (m_genericImpl)
         return m_genericImpl->SetItemState(item, state, stateMask);
 {
     if (m_genericImpl)
         return m_genericImpl->SetItemState(item, state, stateMask);

-
-    wxListItem info;
-    info.m_itemId = item;
-    info.m_mask = wxLIST_MASK_STATE;
-    info.m_stateMask = stateMask;
-    info.m_state = state;
-    return SetItem(info);
+        
+    if (m_dbImpl)
+    {
+        DataBrowserSetOption option = kDataBrowserItemsAdd;
+        if ( stateMask == wxLIST_STATE_SELECTED && state == 0 )
+            option = kDataBrowserItemsRemove;
+    
+        if (item == -1)
+        {
+            if ( HasFlag(wxLC_VIRTUAL) )
+            {
+                wxMacDataItemBrowserSelectionSuppressor suppressor(m_dbImpl);
+                m_dbImpl->SetSelectedAllItems(option);
+            }
+            else
+            {
+                for(int i = 0; i < GetItemCount();i++)
+                {
+                    wxListItem info;
+                    info.m_itemId = i;
+                    info.m_mask = wxLIST_MASK_STATE;
+                    info.m_stateMask = stateMask;
+                    info.m_state = state;
+                    SetItem(info);
+                }
+            }
+        }
+        else
+        {
+            if ( HasFlag(wxLC_VIRTUAL) )
+            {
+                long itemID = item+1;
+                SetDataBrowserSelectedItems(m_dbImpl->GetControlRef(), 1, (DataBrowserItemID*)&itemID, option);
+            }
+            else
+            {
+                wxListItem info;
+                info.m_itemId = item;
+                info.m_mask = wxLIST_MASK_STATE;
+                info.m_stateMask = stateMask;
+                info.m_state = state;
+                return SetItem(info);
+            }
+        }
+    }
+    return true;

 }
 
 // Sets the item image
 }
 
 // Sets the item image


@@ -1401,6 +1464,14 @@ long wxListCtrl::GetTopItem() const
     if (m_genericImpl)
         return m_genericImpl->GetTopItem();
 
     if (m_genericImpl)
         return m_genericImpl->GetTopItem();
 

+    if (m_dbImpl)
+    {
+        int flags = 0;
+        long item = HitTest( wxPoint(1, 1), flags);
+        if (flags == wxLIST_HITTEST_ONITEM)
+            return item;
+    }
+

     return 0;
 }
 
     return 0;
 }
 


@@ -1556,7 +1627,7 @@ bool wxListCtrl::DeleteAllColumns()
         m_dbImpl->GetColumnCount(&cols);
         for (UInt32 col = 0; col < cols; col++)
         {
         m_dbImpl->GetColumnCount(&cols);
         for (UInt32 col = 0; col < cols; col++)
         {

-                DeleteColumn(col);
+                DeleteColumn(0);

         }
     }
 
         }
     }
 


@@ -1660,7 +1731,31 @@ long wxListCtrl::FindItem(long start, const wxString& str, bool partial)
     if (m_genericImpl)
         return m_genericImpl->FindItem(start, str, partial);
 
     if (m_genericImpl)
         return m_genericImpl->FindItem(start, str, partial);
 

-    return -1;
+    wxString str_upper = str.Upper();
+
+    long idx = start;
+    if (idx < 0)
+        idx = 0;
+    long count = GetItemCount();
+
+    while (idx < count)
+    {
+        wxString line_upper = GetItemText(idx).Upper();
+        if (!partial)
+        {
+            if (line_upper == str_upper )
+                return idx;
+        }
+        else
+        {
+            if (line_upper.find(str_upper) == 0)
+                return idx;
+        }
+        
+        idx++;
+    };
+
+    return wxNOT_FOUND;

 }
 
 // Find an item whose data matches this data, starting from the item after 'start'
 }
 
 // Find an item whose data matches this data, starting from the item after 'start'


@@ -1670,7 +1765,9 @@ long wxListCtrl::FindItem(long start, long data)
     if (m_genericImpl)
         return m_genericImpl->FindItem(start, data);
 
     if (m_genericImpl)
         return m_genericImpl->FindItem(start, data);
 

-    long  idx = start + 1;
+    long idx = start;
+    if (idx < 0)
+        idx = 0;

     long count = GetItemCount();
 
     while (idx < count)
     long count = GetItemCount();
 
     while (idx < count)


@@ -1680,7 +1777,7 @@ long wxListCtrl::FindItem(long start, long data)
         idx++;
     };
 
         idx++;
     };
 

-    return -1;
+    return wxNOT_FOUND;

 }
 
 // Find an item nearest this position in the specified direction, starting from
 }
 
 // Find an item nearest this position in the specified direction, starting from


@@ -1747,6 +1844,23 @@ wxListCtrl::HitTest(const wxPoint& point, int& flags, long *ptrSubItem) const
     return -1;
 }
 
     return -1;
 }
 

+int wxListCtrl::GetScrollPos(int orient) const
+{
+    if (m_genericImpl)
+        return m_genericImpl->GetScrollPos(orient);
+        
+    if (m_dbImpl)
+    {
+        UInt32 offsetX, offsetY;
+        m_dbImpl->GetScrollPosition( &offsetY, &offsetX );
+        if ( orient == wxHORIZONTAL )
+           return offsetX;
+        else
+           return offsetY;
+    }
+
+    return 0;
+}

 
 // Inserts an item, returning the index of the new item if successful,
 // -1 otherwise.
 
 // Inserts an item, returning the index of the new item if successful,
 // -1 otherwise.


@@ -1757,7 +1871,7 @@ long wxListCtrl::InsertItem(wxListItem& info)
     if (m_genericImpl)
         return m_genericImpl->InsertItem(info);
 
     if (m_genericImpl)
         return m_genericImpl->InsertItem(info);
 

-    if (m_dbImpl)
+    if (m_dbImpl && !IsVirtual())

     {
         int count = GetItemCount();
 
     {
         int count = GetItemCount();
 


@@ -1769,9 +1883,9 @@ long wxListCtrl::InsertItem(wxListItem& info)
         event.SetEventObject( this );
         event.m_itemIndex = info.m_itemId;
         GetEventHandler()->ProcessEvent( event );
         event.SetEventObject( this );
         event.m_itemIndex = info.m_itemId;
         GetEventHandler()->ProcessEvent( event );

+        return info.m_itemId;

     }
     }

-
-    return info.m_itemId;
+    return -1;

 }
 
 long wxListCtrl::InsertItem(long index, const wxString& label)
 }
 
 long wxListCtrl::InsertItem(long index, const wxString& label)


@@ -2000,6 +2114,10 @@ void wxListCtrl::SetItemCount(long count)
         // we need to temporarily disable the new item creation notification
         // procedure to speed things up
         // FIXME: Even this doesn't seem to help much...
         // we need to temporarily disable the new item creation notification
         // procedure to speed things up
         // FIXME: Even this doesn't seem to help much...

+        
+        // FIXME: Find a more efficient way to do this.
+        m_dbImpl->MacClear();
+        

         DataBrowserCallbacks callbacks;
         DataBrowserItemNotificationUPP itemUPP;
         GetDataBrowserCallbacks(m_dbImpl->GetControlRef(), &callbacks);
         DataBrowserCallbacks callbacks;
         DataBrowserItemNotificationUPP itemUPP;
         GetDataBrowserCallbacks(m_dbImpl->GetControlRef(), &callbacks);


@@ -2045,6 +2163,28 @@ void wxListCtrl::RefreshItems(long itemFrom, long itemTo)
     RefreshRect(rect);
 }
 
     RefreshRect(rect);
 }
 

+void wxListCtrl::SetDropTarget( wxDropTarget *dropTarget )
+{
+#if wxUSE_DRAG_AND_DROP
+    if (m_genericImpl)
+        m_genericImpl->SetDropTarget( dropTarget );
+        
+    if (m_dbImpl)
+        wxWindow::SetDropTarget( dropTarget );
+#endif
+}
+
+wxDropTarget *wxListCtrl::GetDropTarget() const
+{
+#if wxUSE_DRAG_AND_DROP
+    if (m_genericImpl)
+        return m_genericImpl->GetDropTarget();
+        
+    if (m_dbImpl)
+        return wxWindow::GetDropTarget();
+#endif
+    return NULL;
+}

 
 // wxMac internal data structures
 
 
 // wxMac internal data structures
 


@@ -2365,6 +2505,14 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
     ThemeDrawingState savedState = NULL;
     CGContextRef context = (CGContextRef)list->MacGetDrawingContext();
     RGBColor labelColor;
     ThemeDrawingState savedState = NULL;
     CGContextRef context = (CGContextRef)list->MacGetDrawingContext();
     RGBColor labelColor;

+    labelColor.red = 0;
+    labelColor.green = 0;
+    labelColor.blue = 0;
+
+    RGBColor backgroundColor;
+    backgroundColor.red = 255;
+    backgroundColor.green = 255;
+    backgroundColor.blue = 255;

 
     GetDataBrowserItemPartBounds(GetControlRef(), itemID, property, kDataBrowserPropertyEnclosingPart,
               &enclosingRect);
 
     GetDataBrowserItemPartBounds(GetControlRef(), itemID, property, kDataBrowserPropertyEnclosingPart,
               &enclosingRect);


@@ -2384,18 +2532,17 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
     }
     if (itemState == kDataBrowserItemIsSelected)
     {
     }
     if (itemState == kDataBrowserItemIsSelected)
     {

-        RGBColor foregroundColor;

 
         GetThemeDrawingState(&savedState);
 
 
         GetThemeDrawingState(&savedState);
 

-        GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &foregroundColor);
+        GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &backgroundColor);

         GetThemeTextColor(kThemeTextColorWhite, gdDepth, colorDevice, &labelColor);
 
         CGContextSaveGState(context);
 
         GetThemeTextColor(kThemeTextColorWhite, gdDepth, colorDevice, &labelColor);
 
         CGContextSaveGState(context);
 

-        CGContextSetRGBFillColor(context, (float)foregroundColor.red / (float)USHRT_MAX,
-                      (float)foregroundColor.green / (float)USHRT_MAX,
-                      (float)foregroundColor.blue / (float)USHRT_MAX, 1.0);
+        CGContextSetRGBFillColor(context, (float)backgroundColor.red / (float)USHRT_MAX,
+                      (float)backgroundColor.green / (float)USHRT_MAX,
+                      (float)backgroundColor.blue / (float)USHRT_MAX, 1.0);

         CGContextFillRect(context, enclosingCGRect);
 
         CGContextRestoreGState(context);
         CGContextFillRect(context, enclosingCGRect);
 
         CGContextRestoreGState(context);


@@ -2407,21 +2554,15 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
             labelColor = MAC_WXCOLORREF( color.GetPixel() );
         else if (list->GetTextColour().Ok())
             labelColor = MAC_WXCOLORREF( list->GetTextColour().GetPixel() );
             labelColor = MAC_WXCOLORREF( color.GetPixel() );
         else if (list->GetTextColour().Ok())
             labelColor = MAC_WXCOLORREF( list->GetTextColour().GetPixel() );

-        else
-        {
-            labelColor.red = 0;
-            labelColor.green = 0;
-            labelColor.blue = 0;
-        }

 
         if (bgColor.Ok())
         {
 
         if (bgColor.Ok())
         {

-            RGBColor foregroundColor = MAC_WXCOLORREF( bgColor.GetPixel() );
+            backgroundColor = MAC_WXCOLORREF( bgColor.GetPixel() );

             CGContextSaveGState(context);
 
             CGContextSaveGState(context);
 

-            CGContextSetRGBFillColor(context, (float)foregroundColor.red / (float)USHRT_MAX,
-                          (float)foregroundColor.green / (float)USHRT_MAX,
-                          (float)foregroundColor.blue / (float)USHRT_MAX, 1.0);
+            CGContextSetRGBFillColor(context, (float)backgroundColor.red / (float)USHRT_MAX,
+                          (float)backgroundColor.green / (float)USHRT_MAX,
+                          (float)backgroundColor.blue / (float)USHRT_MAX, 1.0);

             CGContextFillRect(context, enclosingCGRect);
 
             CGContextRestoreGState(context);
             CGContextFillRect(context, enclosingCGRect);
 
             CGContextRestoreGState(context);


@@ -2437,16 +2578,11 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
             wxBitmap bmp = imageList->GetBitmap(imgIndex);
             IconRef icon = bmp.GetBitmapData()->GetIconRef();
 
             wxBitmap bmp = imageList->GetBitmap(imgIndex);
             IconRef icon = bmp.GetBitmapData()->GetIconRef();
 

-            RGBColor iconLabel;
-            iconLabel.red = 0;
-            iconLabel.green = 0;
-            iconLabel.blue = 0;
-

             CGContextSaveGState(context);
             CGContextTranslateCTM(context, 0,iconCGRect.origin.y + CGRectGetMaxY(iconCGRect));
             CGContextScaleCTM(context,1.0f,-1.0f);
             PlotIconRefInContext(context, &iconCGRect, kAlignNone,
             CGContextSaveGState(context);
             CGContextTranslateCTM(context, 0,iconCGRect.origin.y + CGRectGetMaxY(iconCGRect));
             CGContextScaleCTM(context,1.0f,-1.0f);
             PlotIconRefInContext(context, &iconCGRect, kAlignNone,

-              active ? kTransformNone : kTransformDisabled, &iconLabel,
+              active ? kTransformNone : kTransformDisabled, NULL,

               kPlotIconRefNormalFlags, icon);
 
             CGContextRestoreGState(context);
               kPlotIconRefNormalFlags, icon);
 
             CGContextRestoreGState(context);


@@ -2644,7 +2780,7 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
         }
         else
         {
         }
         else
         {

-            event.m_itemIndex = (long)itemID;
+            event.m_itemIndex = (long)itemID-1;

         }
 
         switch (message)
         }
 
         switch (message)


@@ -2708,12 +2844,18 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
         {
             wxMacListCtrlItem* item = (wxMacListCtrlItem*)itemOneID;
             wxMacListCtrlItem* otherItem = (wxMacListCtrlItem*)itemTwoID;
         {
             wxMacListCtrlItem* item = (wxMacListCtrlItem*)itemOneID;
             wxMacListCtrlItem* otherItem = (wxMacListCtrlItem*)itemTwoID;

-            wxListCtrlCompare func = list->GetCompareFunc();
-            long item1 = GetLineFromItem(item);
-            long item2 = GetLineFromItem(otherItem);
-
-            if (func != NULL && item->HasColumnInfo(colId) && otherItem->HasColumnInfo(colId))
-                return func(item1, item2, list->GetCompareFuncData()) >= 0;
+            
+            // FIXME: This code causes a crash in wxPython for some reason
+            // and moreover, further testing shows that the column click event
+            // is only sent to the list ctrl after the native control has finished
+            // sorting items anyway. So just disable this for now.
+            
+            //wxListCtrlCompare func = list->GetCompareFunc();
+            //long item1 = GetLineFromItem(item);
+            //long item2 = GetLineFromItem(otherItem);
+            
+            //if (func != NULL && item->HasColumnInfo(colId) && otherItem->HasColumnInfo(colId))
+            //    return func(item1, item2, list->GetCompareFuncData()) >= 0;

 
             if (item->HasColumnInfo(colId))
                 itemText = item->GetColumnInfo(colId)->GetText();
 
             if (item->HasColumnInfo(colId))
                 itemText = item->GetColumnInfo(colId)->GetText();