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 dd6990c5178db8065084977b103b77561f4b2921..95ede005018579bd9b6a2f965413d482d674e6c3 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -674,6 +674,7 @@ wxListHeaderWindow::wxListHeaderWindow( wxWindow *win, wxWindowID id, wxListMain
 //  m_currentCursor = wxSTANDARD_CURSOR;
   m_currentCursor = (wxCursor *) NULL;
   m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );
+  m_isDraging = FALSE;
 }
 
 void wxListHeaderWindow::DoDrawRect( wxPaintDC *dc, int x, int y, int w, int h )
@@ -704,7 +705,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
   
   dc.BeginDrawing();
      
-  dc.SetFont( m_font );
+  dc.SetFont( *GetFont() );
 
   int w = 0;
   int h = 0;
@@ -1019,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) 
@@ -1814,7 +1815,7 @@ int wxListMainWindow::GetSelectedItemCount( void )
     if (line->IsHilighted()) ret++;
     node = node->Next();
   }
-  return 0;
+  return ret;
 }
 
 void wxListMainWindow::SetMode( long mode )
@@ -1844,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;