X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ca41e57f48db4c1a2de7ae67c7e4b655d9809af..a38b83c353cce75329b2c53c0eaa4ad0f500ccf1:/src/generic/listctrl.cpp

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 448f068c3f..95ede00501 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -705,7 +705,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
   
   dc.BeginDrawing();
      
-  dc.SetFont( m_font );
+  dc.SetFont( *GetFont() );
 
   int w = 0;
   int h = 0;
@@ -1020,7 +1020,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
   
   dc.BeginDrawing();
 
-  dc.SetFont( m_font );
+  dc.SetFont( *GetFont() );
 
   wxNode *node = m_lines.First();
   while (node) 
@@ -1815,7 +1815,7 @@ int wxListMainWindow::GetSelectedItemCount( void )
     if (line->IsHilighted()) ret++;
     node = node->Next();
   }
-  return 0;
+  return ret;
 }
 
 void wxListMainWindow::SetMode( long mode )
@@ -1845,7 +1845,7 @@ long wxListMainWindow::GetMode( void ) const
 void wxListMainWindow::CalculatePositions( void )
 {
   wxPaintDC dc( this );
-  dc.SetFont( m_font );
+  dc.SetFont( *GetFont() );
 
   int iconSpacing = 0;
   if (m_mode & wxLC_ICON) iconSpacing = m_normal_spacing;