fixed the vsprintf() problem once and for all

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 448f068c3fb29d2a678154120e79a40cece94ac4..95ede005018579bd9b6a2f965413d482d674e6c3 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -705,7 +705,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
   
   dc.BeginDrawing();
      
   
   dc.BeginDrawing();
      

-  dc.SetFont( m_font );
+  dc.SetFont( *GetFont() );

 
   int w = 0;
   int h = 0;
 
   int w = 0;
   int h = 0;


@@ -1020,7 +1020,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
   
   dc.BeginDrawing();
 
   
   dc.BeginDrawing();
 

-  dc.SetFont( m_font );
+  dc.SetFont( *GetFont() );

 
   wxNode *node = m_lines.First();
   while (node) 
 
   wxNode *node = m_lines.First();
   while (node) 


@@ -1815,7 +1815,7 @@ int wxListMainWindow::GetSelectedItemCount( void )
     if (line->IsHilighted()) ret++;
     node = node->Next();
   }
     if (line->IsHilighted()) ret++;
     node = node->Next();
   }

-  return 0;
+  return ret;

 }
 
 void wxListMainWindow::SetMode( long mode )
 }
 
 void wxListMainWindow::SetMode( long mode )


@@ -1845,7 +1845,7 @@ long wxListMainWindow::GetMode( void ) const
 void wxListMainWindow::CalculatePositions( void )
 {
   wxPaintDC dc( this );
 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;
 
   int iconSpacing = 0;
   if (m_mode & wxLC_ICON) iconSpacing = m_normal_spacing;