Fixing inactive state drawing, and removing warning.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/listctrl_mac.cpp b/src/mac/carbon/listctrl_mac.cpp
index 6d7f881fd51b41ec07af6c16b1d26dfe9fb4a14b..4054da540d9e4b7b39be627bfe1456a49a9902aa 100644 (file)
--- a/src/mac/carbon/listctrl_mac.cpp
+++ b/src/mac/carbon/listctrl_mac.cpp
@@ -1946,7 +1946,6 @@ long wxListCtrl::InsertItem(wxListItem& info)
             info.m_itemId = count;
 
         m_dbImpl->MacInsertItem(info.m_itemId, &info );
-        wxMacDataItem* dataItem = m_dbImpl->GetItemFromLine(info.m_itemId);
         
         wxListEvent event( wxEVT_COMMAND_LIST_INSERT_ITEM, GetId() );
         event.SetEventObject( this );
@@ -2622,10 +2621,17 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
     {
 
         GetThemeDrawingState(&savedState);
-
-        GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &backgroundColor);
-        GetThemeTextColor(kThemeTextColorWhite, gdDepth, colorDevice, &labelColor);
-
+        
+        if (active)
+        {
+            GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &backgroundColor);
+            GetThemeTextColor(kThemeTextColorWhite, gdDepth, colorDevice, &labelColor);
+        }
+        else
+        {
+            GetThemeBrushAsColor(kThemeBrushSecondaryHighlightColor, 32, true, &backgroundColor);
+            GetThemeTextColor(kThemeTextColorBlack, gdDepth, colorDevice, &labelColor);
+        }
         CGContextSaveGState(context);
 
         CGContextSetRGBFillColor(context, (float)backgroundColor.red / (float)USHRT_MAX,
@@ -2642,7 +2648,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
             labelColor = MAC_WXCOLORREF( color.GetPixel() );
         else if (list->GetTextColour().Ok())
             labelColor = MAC_WXCOLORREF( list->GetTextColour().GetPixel() );
-
+        
         if (bgColor.Ok())
         {
             backgroundColor = MAC_WXCOLORREF( bgColor.GetPixel() );
@@ -3175,3 +3181,4 @@ void wxMacListCtrlItem::SetColumnInfo( unsigned int column, wxListItem* item )
 }
 
 #endif // wxUSE_LISTCTRL
+