X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..3826db3ef5fc3ac97fb91aa11eb2381b2c96248d:/src/generic/listctrl.cpp diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 6a8bfd0d22..788670089a 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -740,13 +740,13 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) }; if (hit) { -// if (m_currentCursor == wxSTANDARD_CURSOR) SetCursor( m_resizeCursor ); -// m_currentCursor = m_resizeCursor; + if (m_currentCursor == wxSTANDARD_CURSOR) SetCursor( m_resizeCursor ); + m_currentCursor = m_resizeCursor; } else { -// if (m_currentCursor != wxSTANDARD_CURSOR) SetCursor( wxSTANDARD_CURSOR ); -// m_currentCursor = wxSTANDARD_CURSOR; + if (m_currentCursor != wxSTANDARD_CURSOR) SetCursor( wxSTANDARD_CURSOR ); + m_currentCursor = wxSTANDARD_CURSOR; }; }; }; @@ -1314,12 +1314,12 @@ void wxListMainWindow::DrawImage( int index, wxPaintDC *dc, int x, int y ) { if ((m_mode & wxLC_ICON) && (m_normal_image_list)) { - m_normal_image_list->Draw( index, *dc, x, y ); + m_normal_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT ); return; }; if ((m_mode & wxLC_SMALL_ICON) && (m_small_image_list)) { - m_small_image_list->Draw( index, *dc, x, y ); + m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT ); }; }; @@ -2212,6 +2212,11 @@ int wxListCtrl::GetItemCount(void) return m_mainWin->GetItemCount(); }; +void wxListCtrl::SetItemSpacing( int spacing, bool isSmall ) +{ + m_mainWin->SetItemSpacing( spacing, isSmall ); +}; + int wxListCtrl::GetItemSpacing( bool isSmall ) { return m_mainWin->GetItemSpacing( isSmall ); @@ -2433,6 +2438,7 @@ void wxListCtrl::OnIdle( wxIdleEvent &event ) m_mainWin->CalculatePositions(); m_mainWin->RealizeChanges(); + m_mainWin->m_dirty = FALSE; m_mainWin->Refresh(); };