Fix for non-CG mode

[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 3b4941dc087809425cf9cae5854a154079af9d28..5a1a1f0bc825a525b0c769d581c58b1e0bf74a09 100644 (file)
--- a/src/mac/carbon/listctrl_mac.cpp
+++ b/src/mac/carbon/listctrl_mac.cpp
@@ -220,7 +220,7 @@ public:
     virtual void MacGetColumnInfo( unsigned int row, unsigned int column, wxListItem& item );
     virtual void UpdateState(wxMacDataItem* dataItem, wxListItem* item);
     int GetFlags() { return m_flags; }
     virtual void MacGetColumnInfo( unsigned int row, unsigned int column, wxListItem& item );
     virtual void UpdateState(wxMacDataItem* dataItem, wxListItem* item);
     int GetFlags() { return m_flags; }

-    
+

 protected:
     // we need to override to provide specialized handling for virtual wxListCtrls
     virtual OSStatus GetSetItemData(DataBrowserItemID itemID,
 protected:
     // we need to override to provide specialized handling for virtual wxListCtrls
     virtual OSStatus GetSetItemData(DataBrowserItemID itemID,


@@ -640,7 +640,7 @@ void wxListCtrl::FireMouseEvent(wxEventType eventType, wxPoint position)
     le.SetEventObject(this);
     le.m_pointDrag = position;
     le.m_itemIndex = -1;
     le.SetEventObject(this);
     le.m_pointDrag = position;
     le.m_itemIndex = -1;

-    
+

     int flags;
     long item = HitTest(position, flags);
     if (flags & wxLIST_HITTEST_ONITEM)
     int flags;
     long item = HitTest(position, flags);
     if (flags & wxLIST_HITTEST_ONITEM)


@@ -654,6 +654,8 @@ void wxListCtrl::FireMouseEvent(wxEventType eventType, wxPoint position)
 
 void wxListCtrl::OnChar(wxKeyEvent& event)
 {
 
 void wxListCtrl::OnChar(wxKeyEvent& event)
 {

+
+    

     if (m_dbImpl)
     {
         wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetId() );
     if (m_dbImpl)
     {
         wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetId() );


@@ -661,6 +663,35 @@ void wxListCtrl::OnChar(wxKeyEvent& event)
         le.m_code = event.GetKeyCode();
         le.m_itemIndex = -1;
         
         le.m_code = event.GetKeyCode();
         le.m_itemIndex = -1;
         

+        if (m_current == -1)
+        {
+            // if m_current isn't set, check if there's been a selection
+            // made before continuing
+            m_current = GetNextItem(-1, wxLIST_NEXT_BELOW, wxLIST_STATE_SELECTED);
+        }
+        
+        // We need to determine m_current ourselves when navigation keys
+        // are used. Note that PAGEUP and PAGEDOWN do not alter the current
+        // item on native Mac ListCtrl, so we only handle up and down keys.
+        switch ( event.GetKeyCode() )
+        {
+            case WXK_UP:
+                if ( m_current > 0 )
+                    m_current -= 1;
+                else
+                    m_current = 0;
+                    
+                break;
+
+            case WXK_DOWN:
+                if ( m_current < GetItemCount() - 1 )
+                    m_current += 1;
+                else
+                    m_current = GetItemCount() - 1;
+                    
+                break;
+        }
+

         if (m_current != -1)
         {
             le.m_itemIndex = m_current;
         if (m_current != -1)
         {
             le.m_itemIndex = m_current;


@@ -1023,7 +1054,7 @@ bool wxListCtrl::SetColumnWidth(int col, int width)
         {
             wxListItem colInfo;
             GetColumn(col, colInfo);
         {
             wxListItem colInfo;
             GetColumn(col, colInfo);

-            
+

             colInfo.SetWidth(width);
             SetColumn(col, colInfo);
             m_dbImpl->SetColumnWidth(col, mywidth);
             colInfo.SetWidth(width);
             SetColumn(col, colInfo);
             m_dbImpl->SetColumnWidth(col, mywidth);


@@ -1174,7 +1205,7 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
     if (m_dbImpl)
     {
         DataBrowserSetOption option = kDataBrowserItemsAdd;
     if (m_dbImpl)
     {
         DataBrowserSetOption option = kDataBrowserItemsAdd;

-        if ( stateMask == wxLIST_STATE_SELECTED && state == 0 )
+        if ( (stateMask & wxLIST_STATE_SELECTED) && state == 0 )

             option = kDataBrowserItemsRemove;
 
         if (item == -1)
             option = kDataBrowserItemsRemove;
 
         if (item == -1)


@@ -1202,8 +1233,15 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
             if ( HasFlag(wxLC_VIRTUAL) )
             {
                 long itemID = item+1;
             if ( HasFlag(wxLC_VIRTUAL) )
             {
                 long itemID = item+1;

+                bool isSelected = IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), (DataBrowserItemID)itemID );
+                bool isSelectedState = (state == wxLIST_STATE_SELECTED);
+
+                // toggle the selection state if wxListInfo state and actual state don't match.
+                if ( (stateMask & wxLIST_STATE_SELECTED) && isSelected != isSelectedState )
+                {

                 SetDataBrowserSelectedItems(m_dbImpl->GetControlRef(), 1, (DataBrowserItemID*)&itemID, option);
             }
                 SetDataBrowserSelectedItems(m_dbImpl->GetControlRef(), 1, (DataBrowserItemID*)&itemID, option);
             }

+            }

             else
             {
                 wxListItem info;
             else
             {
                 wxListItem info;


@@ -1288,7 +1326,7 @@ long wxListCtrl::GetItemData(long item) const
 }
 
 // Sets the item data
 }
 
 // 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);
 {
     if (m_genericImpl)
         return m_genericImpl->SetItemData(item, data);


@@ -1570,30 +1608,30 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const
                 DataBrowserItemID id = line + 1;
                 if ( !IsVirtual() )
                     id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
                 DataBrowserItemID id = line + 1;
                 if ( !IsVirtual() )
                     id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);

-                
+

                 if ( (state == wxLIST_STATE_DONTCARE ) )
                     return line;
                 if ( (state == wxLIST_STATE_DONTCARE ) )
                     return line;

-                
+

                 if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) )
                     return line;
             }
         }
                 if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) )
                     return line;
             }
         }

-        
-        if ( geom == wxLIST_NEXT_ALL || geom == wxLIST_NEXT_ABOVE )
+
+        if ( geom == wxLIST_NEXT_ABOVE )

         {
             int item2 = item;
             if ( item2 == -1 )
                 item2 = m_dbImpl->MacGetCount();
         {
             int item2 = item;
             if ( item2 == -1 )
                 item2 = m_dbImpl->MacGetCount();

-                
+

             for ( long line = item2 - 1 ; line >= 0; line-- )
             {
             for ( long line = item2 - 1 ; line >= 0; line-- )
             {

-                DataBrowserItemID id = line + 1; 
+                DataBrowserItemID id = line + 1;

                 if ( !IsVirtual() )
                     id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
                 if ( !IsVirtual() )
                     id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);

-                
+

                 if ( (state == wxLIST_STATE_DONTCARE ) )
                     return line;
                 if ( (state == wxLIST_STATE_DONTCARE ) )
                     return line;

-                
+

                 if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) )
                     return line;
             }
                 if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) )
                     return line;
             }


@@ -1979,7 +2017,7 @@ long wxListCtrl::InsertItem(wxListItem& info)
             info.m_itemId = count;
 
         m_dbImpl->MacInsertItem(info.m_itemId, &info );
             info.m_itemId = count;
 
         m_dbImpl->MacInsertItem(info.m_itemId, &info );

-        
+

         wxListEvent event( wxEVT_COMMAND_LIST_INSERT_ITEM, GetId() );
         event.SetEventObject( this );
         event.m_itemIndex = info.m_itemId;
         wxListEvent event( wxEVT_COMMAND_LIST_INSERT_ITEM, GetId() );
         event.SetEventObject( this );
         event.m_itemIndex = info.m_itemId;


@@ -2125,7 +2163,7 @@ bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
         m_compareFunc = fn;
         m_compareFuncData = data;
         SortDataBrowserContainer( m_dbImpl->GetControlRef(), kDataBrowserNoItem, true);
         m_compareFunc = fn;
         m_compareFuncData = data;
         SortDataBrowserContainer( m_dbImpl->GetControlRef(), kDataBrowserNoItem, true);

-        
+

         // we need to do this after each call, else we get a crash from wxPython when
         // SortItems is called the second time.
         m_compareFunc = NULL;
         // we need to do this after each call, else we get a crash from wxPython when
         // SortItems is called the second time.
         m_compareFunc = NULL;


@@ -2301,7 +2339,7 @@ void wxListCtrl::SetFocus()
                 m_genericImpl->SetFocus();
                 return;
         }
                 m_genericImpl->SetFocus();
                 return;
         }

-       
+

         wxWindow::SetFocus();
 }
 #endif
         wxWindow::SetFocus();
 }
 #endif


@@ -2446,9 +2484,9 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer
         SetSortProperty( kMinColumnId - 1 );
     else
         SetSortProperty( kMinColumnId );
         SetSortProperty( kMinColumnId - 1 );
     else
         SetSortProperty( kMinColumnId );

-    
+

     m_sortOrder = SortOrder_None;
     m_sortOrder = SortOrder_None;

-    
+

     if ( style & wxLC_SORT_DESCENDING )
     {
         SetSortOrder( kDataBrowserOrderDecreasing );
     if ( style & wxLC_SORT_DESCENDING )
     {
         SetSortOrder( kDataBrowserOrderDecreasing );


@@ -2657,7 +2695,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
     {
 
         GetThemeDrawingState(&savedState);
     {
 
         GetThemeDrawingState(&savedState);

-        
+

         if (active && hasFocus)
         {
             GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &backgroundColor);
         if (active && hasFocus)
         {
             GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &backgroundColor);


@@ -2684,7 +2722,7 @@ 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() );

-        
+

         if (bgColor.Ok())
         {
             backgroundColor = MAC_WXCOLORREF( bgColor.GetPixel() );
         if (bgColor.Ok())
         {
             backgroundColor = MAC_WXCOLORREF( bgColor.GetPixel() );


@@ -2817,19 +2855,13 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
                 if ( list && list->HasFlag( wxLC_EDIT_LABELS ) )
                 {
                     verify_noerr(SetDataBrowserItemDataBooleanValue( itemData, true ));
                 if ( list && list->HasFlag( wxLC_EDIT_LABELS ) )
                 {
                     verify_noerr(SetDataBrowserItemDataBooleanValue( itemData, true ));

-                    err = noErr ;

                 }
                 break ;
             default :
                 if ( property >= kMinColumnId )
                 {
                 }
                 break ;
             default :
                 if ( property >= kMinColumnId )
                 {

-                    wxMacCFStringHolder cfStr;
-
-                    if (text){
-                        cfStr.Assign( text, wxLocale::GetSystemEncoding() );
-                        err = ::SetDataBrowserItemDataText( itemData, cfStr );
-                        err = noErr;
-                    }
+                    wxMacCFStringHolder cfStr(text);
+                    verify_noerr( ::SetDataBrowserItemDataText( itemData, cfStr) );

 
 
 
 
 
 


@@ -2893,7 +2925,7 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
         // avoid asserts by getting out now
         return  ;
     }
         // avoid asserts by getting out now
         return  ;
     }

-    
+

     wxListCtrl *list = wxDynamicCast( GetPeer() , wxListCtrl );
     if ( list )
     {
     wxListCtrl *list = wxDynamicCast( GetPeer() , wxListCtrl );
     if ( list )
     {


@@ -2969,7 +3001,7 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
     wxString otherItemText;
     long itemOrder;
     long otherItemOrder;
     wxString otherItemText;
     long itemOrder;
     long otherItemOrder;

-    
+

     int colId = sortProperty - kMinColumnId;
 
     wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
     int colId = sortProperty - kMinColumnId;
 
     wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );


@@ -2986,7 +3018,7 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
 
             itemOrder = item->GetOrder();
             otherItemOrder = item->GetOrder();
 
             itemOrder = item->GetOrder();
             otherItemOrder = item->GetOrder();

-                            
+

             wxListCtrlCompare func = list->GetCompareFunc();
             if (func != NULL)
             {
             wxListCtrlCompare func = list->GetCompareFunc();
             if (func != NULL)
             {


@@ -2995,8 +3027,8 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
                 if (item && item->HasColumnInfo(0))
                     item1 = item->GetColumnInfo(0)->GetData();
                 if (otherItem && otherItem->HasColumnInfo(0))
                 if (item && item->HasColumnInfo(0))
                     item1 = item->GetColumnInfo(0)->GetData();
                 if (otherItem && otherItem->HasColumnInfo(0))

-                    item2 = otherItem->GetColumnInfo(0)->GetData(); 
-                
+                    item2 = otherItem->GetColumnInfo(0)->GetData();
+

                 if (item1 > -1 && item2 > -1)
                 {
                     int result = func(item1, item2, list->GetCompareFuncData());
                 if (item1 > -1 && item2 > -1)
                 {
                     int result = func(item1, item2, list->GetCompareFuncData());


@@ -3006,7 +3038,7 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
                         return result < 0;
                 }
             }
                         return result < 0;
                 }
             }

-            
+

             // we can't use the native control's sorting abilities, so just
             // sort by item id.
             return itemOrder < otherItemOrder;
             // we can't use the native control's sorting abilities, so just
             // sort by item id.
             return itemOrder < otherItemOrder;


@@ -3044,11 +3076,11 @@ void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsign
         listItem->SetColumnInfo( column, item );
         listItem->SetOrder(row);
         UpdateState(dataItem, item);
         listItem->SetColumnInfo( column, item );
         listItem->SetOrder(row);
         UpdateState(dataItem, item);

-        
+

         wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
         wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );

-        
+

         // NB: When this call was made before a control was completely shown, it would
         // NB: When this call was made before a control was completely shown, it would

-        // update the item prematurely (i.e. no text would be listed) and, on show, 
+        // update the item prematurely (i.e. no text would be listed) and, on show,

         // only the sorted column would be refreshed, meaning only first column text labels
         // would be shown. Making sure not to update items until the control is visible
         // seems to fix this issue.
         // only the sorted column would be refreshed, meaning only first column text labels
         // would be shown. Making sure not to update items until the control is visible
         // seems to fix this issue.


@@ -3170,7 +3202,7 @@ void wxMacListCtrlItem::SetColumnTextValue( unsigned int column, const wxString&
 wxListItem* wxMacListCtrlItem::GetColumnInfo( unsigned int column )
 {
     wxASSERT_MSG( HasColumnInfo(column), _T("invalid column index in wxMacListCtrlItem") );
 wxListItem* wxMacListCtrlItem::GetColumnInfo( unsigned int column )
 {
     wxASSERT_MSG( HasColumnInfo(column), _T("invalid column index in wxMacListCtrlItem") );

-    return m_rowItems[column]; 
+    return m_rowItems[column];

 }
 
 bool wxMacListCtrlItem::HasColumnInfo( unsigned int column )
 }
 
 bool wxMacListCtrlItem::HasColumnInfo( unsigned int column )