Fix HTML help on Mac.

[wxWidgets.git] / src / generic / listctrl.cpp

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 84a4fe9b12e8b2afca285d22eb12ee1d58e866d0..d2f3b996759c4935f5632e7168f236075751a7a0 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -41,6 +41,10 @@
             ... we have it ourselves ...
         else
             line->GetFoo();
             ... we have it ourselves ...
         else
             line->GetFoo();

+
+   => done
+
+   5. attributes support: we need OnGetItemAttr() as well!

  */
 
 // ============================================================================
  */
 
 // ============================================================================


@@ -54,7 +58,7 @@
 #ifdef __GNUG__
     #pragma implementation "listctrl.h"
     #pragma implementation "listctrlbase.h"
 #ifdef __GNUG__
     #pragma implementation "listctrl.h"
     #pragma implementation "listctrlbase.h"

-#endif                                                  
+#endif

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"


@@ -243,7 +247,8 @@ public:
 
     void GetItem( wxListItem &info ) const;
 
 
     void GetItem( wxListItem &info ) const;
 

-    wxListItemAttr *GetAttributes() const { return m_attr; }
+    void SetAttr(wxListItemAttr *attr) { m_attr = attr; }
+    wxListItemAttr *GetAttr() const { return m_attr; }

 
 public:
     // the item image or -1
 
 public:
     // the item image or -1


@@ -380,6 +385,9 @@ public:
     wxString GetText(int index) const;
     void SetText( int index, const wxString s );
 
     wxString GetText(int index) const;
     void SetText( int index, const wxString s );
 

+    wxListItemAttr *GetAttr() const;
+    void SetAttr(wxListItemAttr *attr);
+

     // return true if the highlighting really changed
     bool Highlight( bool on );
 
     // return true if the highlighting really changed
     bool Highlight( bool on );
 


@@ -1471,6 +1479,24 @@ int wxListLineData::GetImage( int index ) const
     return item->GetImage();
 }
 
     return item->GetImage();
 }
 

+wxListItemAttr *wxListLineData::GetAttr() const
+{
+    wxListItemDataList::Node *node = m_items.GetFirst();
+    wxCHECK_MSG( node, NULL, _T("invalid column index in GetAttr()") );
+
+    wxListItemData *item = node->GetData();
+    return item->GetAttr();
+}
+
+void wxListLineData::SetAttr(wxListItemAttr *attr)
+{
+    wxListItemDataList::Node *node = m_items.GetFirst();
+    wxCHECK_RET( node, _T("invalid column index in SetAttr()") );
+
+    wxListItemData *item = node->GetData();
+    item->SetAttr(attr);
+}
+

 void wxListLineData::SetAttributes(wxDC *dc,
                                    const wxListItemAttr *attr,
                                    const wxColour& colText,
 void wxListLineData::SetAttributes(wxDC *dc,
                                    const wxListItemAttr *attr,
                                    const wxColour& colText,


@@ -1543,11 +1569,10 @@ void wxListLineData::DrawInReportMode( wxDC *dc,
     // default font
     wxFont font = listctrl->GetFont();
 
     // default font
     wxFont font = listctrl->GetFont();
 

-    // VZ: currently we set the colours/fonts only once, but like this (i.e.
-    //     using SetAttributes() inside the loop), it will be trivial to
-    //     customize the subitems (in report mode) too.
-    wxListItemData *item = m_items.GetFirst()->GetData();
-    wxListItemAttr *attr = item->GetAttributes();
+    // TODO: later we should support setting different attributes for
+    //       different columns - to do it, just add "col" argument to
+    //       GetAttr() and move this code into the loop below
+    wxListItemAttr *attr = GetAttr();

     SetAttributes(dc, attr, colText, font, highlighted);
 
     bool hasBgCol = attr && attr->HasBackgroundColour();
     SetAttributes(dc, attr, colText, font, highlighted);
 
     bool hasBgCol = attr && attr->HasBackgroundColour();


@@ -2141,6 +2166,7 @@ void wxListMainWindow::CacheLineData(size_t line)
     }
 
     ld->SetImage(listctrl->OnGetItemImage(line));
     }
 
     ld->SetImage(listctrl->OnGetItemImage(line));

+    ld->SetAttr(listctrl->OnGetItemAttr(line));

 }
 
 wxListLineData *wxListMainWindow::GetDummyLine() const
 }
 
 wxListLineData *wxListMainWindow::GetDummyLine() const


@@ -2417,6 +2443,12 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         return;
     }
 
         return;
     }
 

+    if ( m_dirty )
+    {
+        // delay the repainting until we calculate all the items positions
+        return;
+    }
+

     PrepareDC( dc );
 
     int dev_x, dev_y;
     PrepareDC( dc );
 
     int dev_x, dev_y;


@@ -3355,19 +3387,21 @@ void wxListMainWindow::SetItem( wxListItem &item )
     wxCHECK_RET( id >= 0 && (size_t)id < GetItemCount(),
                  _T("invalid item index in SetItem") );
 
     wxCHECK_RET( id >= 0 && (size_t)id < GetItemCount(),
                  _T("invalid item index in SetItem") );
 

-    if ( IsVirtual() )
+    if ( !IsVirtual() )
+    {
+        wxListLineData *line = GetLine((size_t)id);
+        line->SetItem( item.m_col, item );
+    }
+
+    if ( InReportView() )

     {
         // just refresh the line to show the new value of the text/image
         RefreshLine((size_t)id);
     }
     {
         // just refresh the line to show the new value of the text/image
         RefreshLine((size_t)id);
     }

-    else // !virtual
+    else // !report

     {
     {

+        // refresh everything (resulting in horrible flicker - FIXME!)

         m_dirty = TRUE;
         m_dirty = TRUE;

-
-        wxListLineData *line = GetLine((size_t)id);
-        if ( HasFlag(wxLC_REPORT) )
-            item.m_width = GetColumnWidth( item.m_col );
-        line->SetItem( item.m_col, item );

     }
 }
 
     }
 }
 


@@ -4870,6 +4904,15 @@ int wxListCtrl::OnGetItemImage(long item) const
     return -1;
 }
 
     return -1;
 }
 

+wxListItemAttr *wxListCtrl::OnGetItemAttr(long item) const
+{
+    wxASSERT_MSG( item >= 0 && item < GetItemCount(),
+                  _T("invalid item index in OnGetItemAttr()") );
+
+    // no attributes by default
+    return NULL;
+}
+

 void wxListCtrl::SetItemCount(long count)
 {
     wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") );
 void wxListCtrl::SetItemCount(long count)
 {
     wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") );


@@ -4877,4 +4920,14 @@ void wxListCtrl::SetItemCount(long count)
     m_mainWin->SetItemCount(count);
 }
 
     m_mainWin->SetItemCount(count);
 }
 

+void wxListCtrl::RefreshItem(long item)
+{
+    m_mainWin->RefreshLine(item);
+}
+
+void wxListCtrl::RefreshItems(long itemFrom, long itemTo)
+{
+    m_mainWin->RefreshLines(itemFrom, itemTo);
+}
+

 #endif // wxUSE_LISTCTRL
 #endif // wxUSE_LISTCTRL