X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af498247c5ea024a781d0ef8d30cbbfb44749641..4115960d4b88375610bd0a8990a5a522c9fbe003:/src/msw/listctrl.cpp diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index 2ea528e817..ac1ebae472 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -17,11 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "listctrl.h" - #pragma implementation "listctrlbase.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -45,7 +40,7 @@ #include "wx/msw/private.h" -#if defined(__WXWINCE__) +#if defined(__WXWINCE__) && !defined(__HANDHELDPC__) #include #include #if _WIN32_WCE < 400 @@ -56,6 +51,16 @@ // include "properly" #include "wx/msw/wrapcctl.h" +// Currently gcc and watcom don't define NMLVFINDITEM, and DMC only defines +// it by its old name NM_FINDTIEM. +// +#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(NMLVFINDITEM) + #define HAVE_NMLVFINDITEM 1 +#elif defined(__DMC__) || defined(NM_FINDITEM) + #define HAVE_NMLVFINDITEM 1 + #define NMLVFINDITEM NM_FINDITEM +#endif + // ---------------------------------------------------------------------------- // private functions // ---------------------------------------------------------------------------- @@ -121,7 +126,7 @@ public: // memcpy() can't work if the struct sizes are different wxCOMPILE_TIME_ASSERT( sizeof(LV_ITEM_OTHER) == sizeof(LV_ITEM_NATIVE), - CodeCantWorkIfDiffSizes); + CodeCantWorkIfDiffSizes); memcpy(&m_item, &item, sizeof(LV_ITEM_NATIVE)); @@ -166,7 +171,7 @@ private: // // Solution: // Under MSW the only way to associate data with a List -// item independant of its position in the list is to +// item independent of its position in the list is to // store a pointer to it in its lParam attribute. However // user programs are already using this (via the // SetItemData() GetItemData() calls). @@ -221,8 +226,10 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT) DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_END_LABEL_EDIT) DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ITEM) DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS) +#if WXWIN_COMPATIBILITY_2_4 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_GET_INFO) DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_SET_INFO) +#endif DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_SELECTED) DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_DESELECTED) DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_KEY_DOWN) @@ -250,7 +257,7 @@ wxBEGIN_FLAGS( wxListCtrlStyle ) wxFLAGS_MEMBER(wxBORDER_RAISED) wxFLAGS_MEMBER(wxBORDER_STATIC) wxFLAGS_MEMBER(wxBORDER_NONE) - + // old style border flags wxFLAGS_MEMBER(wxSIMPLE_BORDER) wxFLAGS_MEMBER(wxSUNKEN_BORDER) @@ -289,7 +296,7 @@ wxEND_FLAGS( wxListCtrlStyle ) IMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxControl,"wx/listctrl.h") wxBEGIN_PROPERTIES_TABLE(wxListCtrl) - wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent ) + wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent ) wxPROPERTY_FLAGS( WindowStyle , wxListCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style wxEND_PROPERTIES_TABLE() @@ -297,7 +304,7 @@ wxEND_PROPERTIES_TABLE() wxBEGIN_HANDLERS_TABLE(wxListCtrl) wxEND_HANDLERS_TABLE() -wxCONSTRUCTOR_5( wxListCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) +wxCONSTRUCTOR_5( wxListCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) /* TODO : Expose more information of a list's layout etc. via appropriate objects (à la NotebookPageInfo) @@ -328,13 +335,13 @@ void wxListCtrl::Init() m_imageListNormal = NULL; m_imageListSmall = NULL; m_imageListState = NULL; - m_ownsImageListNormal = m_ownsImageListSmall = m_ownsImageListState = FALSE; + m_ownsImageListNormal = m_ownsImageListSmall = m_ownsImageListState = false; m_colCount = 0; m_count = 0; - m_ignoreChangeMessages = FALSE; + m_ignoreChangeMessages = false; m_textCtrl = NULL; - m_AnyInternalData = FALSE; - m_hasAnyAttr = FALSE; + m_AnyInternalData = false; + m_hasAnyAttr = false; } bool wxListCtrl::Create(wxWindow *parent, @@ -346,24 +353,24 @@ bool wxListCtrl::Create(wxWindow *parent, const wxString& name) { if ( !CreateControl(parent, id, pos, size, style, validator, name) ) - return FALSE; + return false; - if ( !MSWCreateControl(WC_LISTVIEW, _T(""), pos, size) ) - return FALSE; + if ( !MSWCreateControl(WC_LISTVIEW, wxEmptyString, pos, size) ) + return false; // explicitly say that we want to use Unicode because otherwise we get ANSI // versions of _some_ messages (notably LVN_GETDISPINFOA) in MSLU build wxSetCCUnicodeFormat(GetHwnd()); - // for comctl32.dll v 4.70+ we want to have this attribute because it's - // prettier (and also because wxGTK does it like this) - if ( InReportView() && wxTheApp->GetComCtl32Version() >= 470 ) + // for comctl32.dll v 4.70+ we want to have some non default extended + // styles because it's prettier (and also because wxGTK does it like this) + if ( InReportView() && wxApp::GetComCtl32Version() >= 470 ) { ::SendMessage(GetHwnd(), LVM_SETEXTENDEDLISTVIEWSTYLE, - 0, LVS_EX_FULLROWSELECT); + 0, LVS_EX_LABELTIP | LVS_EX_FULLROWSELECT); } - return TRUE; + return true; } WXDWORD wxListCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const @@ -426,7 +433,7 @@ WXDWORD wxListCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const #if !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) if ( style & wxLC_VIRTUAL ) { - int ver = wxTheApp->GetComCtl32Version(); + int ver = wxApp::GetComCtl32Version(); if ( ver < 470 ) { wxLogWarning(_("Please install a newer version of comctl32.dll\n(at least version 4.70 is required but you have %d.%02d)\nor this program won't operate correctly."), @@ -447,9 +454,17 @@ void wxListCtrl::UpdateStyle() // The new window view style DWORD dwStyleNew = MSWGetStyle(m_windowStyle, NULL); + // some styles are not returned by MSWGetStyle() + if ( IsShown() ) + dwStyleNew |= WS_VISIBLE; + // Get the current window style. DWORD dwStyleOld = ::GetWindowLong(GetHwnd(), GWL_STYLE); + // we don't have wxVSCROLL style, but the list control may have it, + // don't change it then + dwStyleNew |= dwStyleOld & (WS_HSCROLL | WS_VSCROLL); + // Only set the window style if the view bits have changed. if ( dwStyleOld != dwStyleNew ) { @@ -463,14 +478,13 @@ void wxListCtrl::FreeAllInternalData() if (m_AnyInternalData) { int n = GetItemCount(); - int i = 0; - m_ignoreChangeMessages = TRUE; - for (i = 0; i < n; i++) + m_ignoreChangeMessages = true; + for (int i = 0; i < n; i++) wxDeleteInternalData(this, i); - m_ignoreChangeMessages = FALSE; + m_ignoreChangeMessages = false; - m_AnyInternalData = FALSE; + m_AnyInternalData = false; } } @@ -486,9 +500,12 @@ wxListCtrl::~wxListCtrl() m_textCtrl = NULL; } - if (m_ownsImageListNormal) delete m_imageListNormal; - if (m_ownsImageListSmall) delete m_imageListSmall; - if (m_ownsImageListState) delete m_imageListState; + if (m_ownsImageListNormal) + delete m_imageListNormal; + if (m_ownsImageListSmall) + delete m_imageListSmall; + if (m_ownsImageListState) + delete m_imageListState; } // ---------------------------------------------------------------------------- @@ -511,30 +528,25 @@ void wxListCtrl::SetSingleStyle(long style, bool add) flag = flag & ~wxLC_MASK_SORT; } - if ( flag & style ) - { - if ( !add ) - flag -= style; - } + if ( add ) + flag |= style; else - { - if ( add ) - { - flag |= style; - } - } - - m_windowStyle = flag; + flag &= ~style; - UpdateStyle(); + SetWindowStyleFlag(flag); } // Set the whole window style void wxListCtrl::SetWindowStyleFlag(long flag) { - m_windowStyle = flag; + if ( flag != m_windowStyle ) + { + m_windowStyle = flag; - UpdateStyle(); + UpdateStyle(); + + Refresh(); + } } // ---------------------------------------------------------------------------- @@ -556,18 +568,18 @@ wxListCtrl::GetClassDefaultAttributes(wxWindowVariant variant) bool wxListCtrl::SetForegroundColour(const wxColour& col) { if ( !wxWindow::SetForegroundColour(col) ) - return FALSE; + return false; ListView_SetTextColor(GetHwnd(), wxColourToRGB(col)); - return TRUE; + return true; } // Sets the background colour bool wxListCtrl::SetBackgroundColour(const wxColour& col) { if ( !wxWindow::SetBackgroundColour(col) ) - return FALSE; + return false; // we set the same colour for both the "empty" background and the items // background @@ -575,7 +587,7 @@ bool wxListCtrl::SetBackgroundColour(const wxColour& col) ListView_SetBkColor(GetHwnd(), color); ListView_SetTextBkColor(GetHwnd(), color); - return TRUE; + return true; } // Gets information about this column @@ -664,17 +676,15 @@ int wxListCtrl::GetColumnWidth(int col) const // Sets the column width bool wxListCtrl::SetColumnWidth(int col, int width) { - int col2 = col; if ( m_windowStyle & wxLC_LIST ) - col2 = -1; + col = 0; - int width2 = width; - if ( width2 == wxLIST_AUTOSIZE) - width2 = LVSCW_AUTOSIZE; - else if ( width2 == wxLIST_AUTOSIZE_USEHEADER) - width2 = LVSCW_AUTOSIZE_USEHEADER; + if ( width == wxLIST_AUTOSIZE) + width = LVSCW_AUTOSIZE; + else if ( width == wxLIST_AUTOSIZE_USEHEADER) + width = LVSCW_AUTOSIZE_USEHEADER; - return ListView_SetColumnWidth(GetHwnd(), col2, width2) != 0; + return ListView_SetColumnWidth(GetHwnd(), col, width) != 0; } // Gets the number of items that can fit vertically in the @@ -721,8 +731,7 @@ bool wxListCtrl::GetItem(wxListItem& info) const if ( info.m_mask & wxLIST_MASK_STATE ) { lvItem.mask |= LVIF_STATE; - // the other bits are hardly interesting anyhow - lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED; + wxConvertToMSWFlags(0, info.m_stateMask, lvItem); } bool success = ListView_GetItem((HWND)GetHWND(), &lvItem) != 0; @@ -763,7 +772,7 @@ bool wxListCtrl::SetItem(wxListItem& info) if (! data) { // need to set it - m_AnyInternalData = TRUE; + m_AnyInternalData = true; data = new wxListItemInternalData(); item.lParam = (LPARAM) data; item.mask |= LVIF_PARAM; @@ -794,7 +803,7 @@ bool wxListCtrl::SetItem(wxListItem& info) { wxLogDebug(_T("ListView_SetItem() failed")); - return FALSE; + return false; } } @@ -804,10 +813,10 @@ bool wxListCtrl::SetItem(wxListItem& info) // check whether it has any custom attributes if ( info.HasAttributes() ) { - m_hasAnyAttr = TRUE; + m_hasAnyAttr = true; // if the colour has changed, we must redraw the item - updateNow = TRUE; + updateNow = true; } if ( updateNow ) @@ -816,7 +825,7 @@ bool wxListCtrl::SetItem(wxListItem& info) RefreshItem(item.iItem); } - return TRUE; + return true; } long wxListCtrl::SetItem(long index, int col, const wxString& label, int imageId) @@ -881,7 +890,7 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask) { wxLogLastError(_T("ListView_SetItemState")); - return FALSE; + return false; } if ( focusOld != -1 ) @@ -895,7 +904,7 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask) } } - return TRUE; + return true; } // Sets the item image @@ -936,7 +945,7 @@ void wxListCtrl::SetItemText(long item, const wxString& str) } // Gets the item data -long wxListCtrl::GetItemData(long item) const +wxUIntPtr wxListCtrl::GetItemData(long item) const { wxListItem info; @@ -1079,6 +1088,24 @@ wxColour wxListCtrl::GetItemBackgroundColour( long item ) const return col; } +void wxListCtrl::SetItemFont( long item, const wxFont &f ) +{ + wxListItem info; + info.m_itemId = item; + info.SetFont( f ); + SetItem( info ); +} + +wxFont wxListCtrl::GetItemFont( long item ) const +{ + wxFont f; + wxListItemInternalData *data = wxGetInternalData(this, item); + if ( data && data->attr ) + f = data->attr->GetFont(); + + return f; +} + // Gets the number of selected items in the list control int wxListCtrl::GetSelectedItemCount() const { @@ -1167,21 +1194,21 @@ void wxListCtrl::SetImageList(wxImageList *imageList, int which) flags = LVSIL_NORMAL; if (m_ownsImageListNormal) delete m_imageListNormal; m_imageListNormal = imageList; - m_ownsImageListNormal = FALSE; + m_ownsImageListNormal = false; } else if ( which == wxIMAGE_LIST_SMALL ) { flags = LVSIL_SMALL; if (m_ownsImageListSmall) delete m_imageListSmall; m_imageListSmall = imageList; - m_ownsImageListSmall = FALSE; + m_ownsImageListSmall = false; } else if ( which == wxIMAGE_LIST_STATE ) { flags = LVSIL_STATE; if (m_ownsImageListState) delete m_imageListState; m_imageListState = imageList; - m_ownsImageListState = FALSE; + m_ownsImageListState = false; } ListView_SetImageList(GetHwnd(), (HIMAGELIST) imageList ? imageList->GetHIMAGELIST() : 0, flags); } @@ -1190,11 +1217,11 @@ void wxListCtrl::AssignImageList(wxImageList *imageList, int which) { SetImageList(imageList, which); if ( which == wxIMAGE_LIST_NORMAL ) - m_ownsImageListNormal = TRUE; + m_ownsImageListNormal = true; else if ( which == wxIMAGE_LIST_SMALL ) - m_ownsImageListSmall = TRUE; + m_ownsImageListSmall = true; else if ( which == wxIMAGE_LIST_STATE ) - m_ownsImageListState = TRUE; + m_ownsImageListState = true; } // ---------------------------------------------------------------------------- @@ -1223,10 +1250,10 @@ bool wxListCtrl::DeleteItem(long item) if ( !ListView_DeleteItem(GetHwnd(), (int) item) ) { wxLogLastError(_T("ListView_DeleteItem")); - return FALSE; + return false; } - m_count -= 1; + m_count--; wxASSERT_MSG( m_count == ListView_GetItemCount(GetHwnd()), wxT("m_count should match ListView_GetItemCount")); @@ -1252,13 +1279,12 @@ bool wxListCtrl::DeleteItem(long item) RefreshRect(rectWin); } - return TRUE; + return true; } // Deletes all items bool wxListCtrl::DeleteAllItems() { - FreeAllInternalData(); return ListView_DeleteAllItems(GetHwnd()) != 0; } @@ -1271,7 +1297,7 @@ bool wxListCtrl::DeleteAllColumns() { wxLogLastError(wxT("ListView_DeleteColumn")); - return FALSE; + return false; } m_colCount--; @@ -1279,7 +1305,7 @@ bool wxListCtrl::DeleteAllColumns() wxASSERT_MSG( m_colCount == 0, wxT("no columns should be left") ); - return TRUE; + return true; } // Deletes a column @@ -1341,13 +1367,13 @@ bool wxListCtrl::EndEditLabel(bool WXUNUSED(cancel)) { wxFAIL_MSG( _T("not implemented") ); - return FALSE; + return false; } // Ensures this item is visible bool wxListCtrl::EnsureVisible(long item) { - return ListView_EnsureVisible(GetHwnd(), (int) item, FALSE) != 0; + return ListView_EnsureVisible(GetHwnd(), (int) item, FALSE) != FALSE; } // Find an item whose label matches this string, starting from the item after 'start' @@ -1374,7 +1400,7 @@ long wxListCtrl::FindItem(long start, const wxString& str, bool partial) // NOTE : Lindsay Mathieson - 14-July-2002 // No longer use ListView_FindItem as the data attribute is now stored // in a wxListItemInternalData structure refernced by the actual lParam -long wxListCtrl::FindItem(long start, long data) +long wxListCtrl::FindItem(long start, wxUIntPtr data) { long idx = start + 1; long count = GetItemCount(); @@ -1423,23 +1449,38 @@ long wxListCtrl::HitTest(const wxPoint& point, int& flags) ListView_HitTest(GetHwnd(), & hitTestInfo); flags = 0; + if ( hitTestInfo.flags & LVHT_ABOVE ) flags |= wxLIST_HITTEST_ABOVE; if ( hitTestInfo.flags & LVHT_BELOW ) flags |= wxLIST_HITTEST_BELOW; - if ( hitTestInfo.flags & LVHT_NOWHERE ) - flags |= wxLIST_HITTEST_NOWHERE; - if ( hitTestInfo.flags & LVHT_ONITEMICON ) - flags |= wxLIST_HITTEST_ONITEMICON; - if ( hitTestInfo.flags & LVHT_ONITEMLABEL ) - flags |= wxLIST_HITTEST_ONITEMLABEL; - if ( hitTestInfo.flags & LVHT_ONITEMSTATEICON ) - flags |= wxLIST_HITTEST_ONITEMSTATEICON; if ( hitTestInfo.flags & LVHT_TOLEFT ) flags |= wxLIST_HITTEST_TOLEFT; if ( hitTestInfo.flags & LVHT_TORIGHT ) flags |= wxLIST_HITTEST_TORIGHT; + if ( hitTestInfo.flags & LVHT_NOWHERE ) + flags |= wxLIST_HITTEST_NOWHERE; + + // note a bug or at least a very strange feature of comtl32.dll (tested + // with version 4.0 under Win95 and 6.0 under Win 2003): if you click to + // the right of the item label, ListView_HitTest() returns a combination of + // LVHT_ONITEMICON, LVHT_ONITEMLABEL and LVHT_ONITEMSTATEICON -- filter out + // the bits which don't make sense + if ( hitTestInfo.flags & LVHT_ONITEMLABEL ) + { + flags |= wxLIST_HITTEST_ONITEMLABEL; + + // do not translate LVHT_ONITEMICON here, as per above + } + else + { + if ( hitTestInfo.flags & LVHT_ONITEMICON ) + flags |= wxLIST_HITTEST_ONITEMICON; + if ( hitTestInfo.flags & LVHT_ONITEMSTATEICON ) + flags |= wxLIST_HITTEST_ONITEMSTATEICON; + } + return (long) hitTestInfo.iItem; } @@ -1457,7 +1498,7 @@ long wxListCtrl::InsertItem(wxListItem& info) bool needInternalData = ((info.m_mask & wxLIST_MASK_DATA) || info.HasAttributes()); if (needInternalData) { - m_AnyInternalData = TRUE; + m_AnyInternalData = true; item.mask |= LVIF_PARAM; // internal stucture that manages data @@ -1474,7 +1515,7 @@ long wxListCtrl::InsertItem(wxListItem& info) data->attr = new wxListItemAttr(*info.GetAttributes()); // and remember that we have some now... - m_hasAnyAttr = TRUE; + m_hasAnyAttr = true; } }; @@ -1571,10 +1612,10 @@ bool wxListCtrl::ScrollList(int dx, int dy) { wxLogDebug(_T("ListView_Scroll(%d, %d) failed"), dx, dy); - return FALSE; + return false; } - return TRUE; + return true; } // Sort items. @@ -1626,10 +1667,10 @@ bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data) { wxLogDebug(_T("ListView_SortItems() failed")); - return FALSE; + return false; } - return TRUE; + return true; } @@ -1645,17 +1686,17 @@ bool wxListCtrl::MSWCommand(WXUINT cmd, WXWORD id) wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, id); event.SetEventObject( this ); ProcessCommand(event); - return TRUE; + return true; } else if (cmd == EN_KILLFOCUS) { wxCommandEvent event(wxEVT_KILL_FOCUS, id); event.SetEventObject( this ); ProcessCommand(event); - return TRUE; + return true; } else - return FALSE; + return false; } bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) @@ -1720,7 +1761,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) event.m_col = nmHDR->iItem; break; -#if defined(__WXWINCE__) && _WIN32_WCE < 400 +#if defined(__WXWINCE__) && !defined(__HANDHELDPC__) && _WIN32_WCE < 400 case GN_CONTEXTMENU: #endif //__WXWINCE__ case NM_RCLICK: @@ -1734,17 +1775,17 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) // where did the click occur? POINT ptClick; -#if defined(__WXWINCE__) && _WIN32_WCE < 400 +#if defined(__WXWINCE__) && !defined(__HANDHELDPC__) && _WIN32_WCE < 400 if(nmhdr->code == GN_CONTEXTMENU) { ptClick = ((NMRGINFO*)nmhdr)->ptAction; - } else + } else #endif //__WXWINCE__ if ( !::GetCursorPos(&ptClick) ) { wxLogLastError(_T("GetCursorPos")); } - if ( !::ScreenToClient(hwndHdr, &ptClick) ) + if ( !::ScreenToClient(GetHwnd(), &ptClick) ) { wxLogLastError(_T("ScreenToClient(listctrl header)")); } @@ -1770,20 +1811,15 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) break; case HDN_GETDISPINFOW: - { - LPNMHDDISPINFOW info = (LPNMHDDISPINFOW) lParam; - // This is a fix for a strange bug under XP. - // Normally, info->iItem is a valid index, but - // sometimes this is a silly (large) number - // and when we return FALSE via wxControl::MSWOnNotify - // to indicate that it hasn't yet been processed, - // there's a GPF in Windows. - // By returning TRUE here, we avoid further processing - // of this strange message. - if ( info->iItem >= GetColumnCount() ) - return TRUE; - } - // fall through + // letting Windows XP handle this message results in mysterious + // crashes in comctl32.dll seemingly because of bad message + // parameters + // + // I have no idea what is the real cause of the bug (which is, + // just to make things interesting, is impossible to reproduce + // reliably) but ignoring all these messages does fix it and + // doesn't seem to have any negative consequences + return true; default: return wxControl::MSWOnNotify(idCtrl, lParam, result); @@ -1803,9 +1839,10 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) // ignored for efficiency. It is done here because the internal data is in the // process of being deleted so we don't want to try and access it below. if ( m_ignoreChangeMessages && - ( (nmLV->hdr.code == LVN_ITEMCHANGED) || (nmLV->hdr.code == LVN_ITEMCHANGING))) + ( (nmLV->hdr.code == LVN_ITEMCHANGED) || + (nmLV->hdr.code == LVN_ITEMCHANGING)) ) { - return TRUE; + return true; } @@ -1820,7 +1857,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) event.m_item.m_data = internaldata->lParam; } - + bool processed = true; switch ( nmhdr->code ) { case LVN_BEGINRDRAG: @@ -1904,16 +1941,17 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) break; case LVN_DELETEALLITEMS: - m_count = 0; eventType = wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS; event.m_itemIndex = -1; break; case LVN_DELETEITEM: - if (m_count == 0) - // this should be prevented by the post-processing code below, - // but "just in case" - return FALSE; + if ( m_count == 0 ) + { + // this should be prevented by the post-processing code + // below, but "just in case" + return false; + } eventType = wxEVT_COMMAND_LIST_DELETE_ITEM; event.m_itemIndex = iItem; @@ -1921,6 +1959,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxDeleteInternalData(this, iItem); break; +#if WXWIN_COMPATIBILITY_2_4 case LVN_SETDISPINFO: { eventType = wxEVT_COMMAND_LIST_SET_INFO; @@ -1928,6 +1967,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxConvertFromMSWListItem(GetHwnd(), event.m_item, info->item); } break; +#endif case LVN_INSERTITEM: eventType = wxEVT_COMMAND_LIST_INSERT_ITEM; @@ -1936,7 +1976,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) case LVN_ITEMCHANGED: // we translate this catch all message into more interesting - // (and more easy to process) wxWindows events + // (and more easy to process) wxWidgets events // first of all, we deal with the state change events only and // only for valid items (item == -1 for the virtual list @@ -1986,7 +2026,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) if ( eventType == wxEVT_NULL ) { // not an interesting event for us - return FALSE; + return false; } break; @@ -2037,7 +2077,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) // anything else if ( wxControl::MSWOnNotify(idCtrl, lParam, result) ) { - return TRUE; + return true; } // else translate it into wxEVT_COMMAND_LIST_ITEM_ACTIVATED event @@ -2045,7 +2085,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) if ( iItem == -1 ) { // not on item - return FALSE; + return false; } eventType = wxEVT_COMMAND_LIST_ITEM_ACTIVATED; @@ -2054,7 +2094,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) event.m_item.m_data = GetItemData(iItem); break; -#if defined(__WXWINCE__) && _WIN32_WCE < 400 +#if defined(__WXWINCE__) && !defined(__HANDHELDPC__) && _WIN32_WCE < 400 case GN_CONTEXTMENU: #endif //__WXWINCE__ case NM_RCLICK: @@ -2062,17 +2102,17 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) // don't do anything else if ( wxControl::MSWOnNotify(idCtrl, lParam, result) ) { - return TRUE; + return true; } // else translate it into wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK event LV_HITTESTINFO lvhti; wxZeroMemory(lvhti); -#if defined(__WXWINCE__) && _WIN32_WCE < 400 +#if defined(__WXWINCE__) && !defined(__HANDHELDPC__) && _WIN32_WCE < 400 if(nmhdr->code == GN_CONTEXTMENU) { lvhti.pt = ((NMRGINFO*)nmhdr)->ptAction; - } else + } else #endif //__WXWINCE__ ::GetCursorPos(&(lvhti.pt)); ::ScreenToClient(GetHwnd(),&(lvhti.pt)); @@ -2092,7 +2132,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) case NM_CUSTOMDRAW: *result = OnCustomDraw(lParam); - return TRUE; + return true; #endif // _WIN32_IE >= 0x300 case LVN_ODCACHEHINT: @@ -2106,7 +2146,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) // deleting an item, for items in invalid range -- filter // this garbage out if ( cacheHint->iFrom > cacheHint->iTo ) - return FALSE; + return false; event.m_oldItemIndex = cacheHint->iFrom; @@ -2116,6 +2156,78 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) } break; +#ifdef HAVE_NMLVFINDITEM + case LVN_ODFINDITEM: + // this message is only used with the virtual list control but + // even there we don't want to always use it: in a control with + // sufficiently big number of items (defined as > 1000 here), + // accidentally pressing a key could result in hanging an + // application waiting while it performs linear search + if ( IsVirtual() && GetItemCount() <= 1000 ) + { + NMLVFINDITEM* pFindInfo = (NMLVFINDITEM*)lParam; + + // no match by default + *result = -1; + + // we only handle string-based searches here + // + // TODO: what about LVFI_PARTIAL, should we handle this? + if ( !(pFindInfo->lvfi.flags & LVFI_STRING) ) + { + return false; + } + + const wxChar * const searchstr = pFindInfo->lvfi.psz; + const size_t len = wxStrlen(searchstr); + + // this is the first item we should examine, search from it + // wrapping if necessary + const int startPos = pFindInfo->iStart; + const int maxPos = GetItemCount(); + wxCHECK_MSG( startPos <= maxPos, false, + _T("bad starting position in LVN_ODFINDITEM") ); + + int currentPos = startPos; + do + { + // wrap to the beginning if necessary + if ( currentPos == maxPos ) + { + // somewhat surprizingly, LVFI_WRAP isn't set in + // flags but we still should wrap + currentPos = 0; + } + + // does this item begin with searchstr? + if ( wxStrnicmp(searchstr, + GetItemText(currentPos), len) == 0 ) + { + *result = currentPos; + break; + } + } + while ( ++currentPos != startPos ); + + if ( *result == -1 ) + { + // not found + return false; + } + + SetItemState(*result, + wxLIST_STATE_SELECTED | wxLIST_STATE_FOCUSED, + wxLIST_STATE_SELECTED | wxLIST_STATE_FOCUSED); + EnsureVisible(*result); + return true; + } + else + { + processed = false; + } + break; +#endif // HAVE_NMLVFINDITEM + case LVN_GETDISPINFO: if ( IsVirtual() ) { @@ -2143,18 +2255,21 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxASSERT_MSG( !(lvi.mask & LVIF_STATE), _T("we don't support state callbacks yet!") ); - return TRUE; + return true; } // fall through default: - return wxControl::MSWOnNotify(idCtrl, lParam, result); + processed = false; } + + if ( !processed ) + return wxControl::MSWOnNotify(idCtrl, lParam, result); } else { // where did this one come from? - return FALSE; + return false; } // process the event @@ -2169,15 +2284,23 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) switch ( nmhdr->code ) { case LVN_DELETEALLITEMS: - // always return TRUE to suppress all additional LVN_DELETEITEM + // always return true to suppress all additional LVN_DELETEITEM // notifications - this makes deleting all items from a list ctrl // much faster *result = TRUE; - return TRUE; + + // also, we may free all user data now (couldn't do it before as + // the user should have access to it in OnDeleteAllItems() handler) + FreeAllInternalData(); + + // the control is empty now, synchronize the cached number of items + // with the real one + m_count = 0; + return true; case LVN_ENDLABELEDITA: case LVN_ENDLABELEDITW: - // logic here is inversed compared to all the other messages + // logic here is inverted compared to all the other messages *result = event.IsAllowed(); // don't keep a stale wxTextCtrl around @@ -2191,7 +2314,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) m_textCtrl = NULL; } - return TRUE; + return true; } if ( processed ) @@ -2313,7 +2436,6 @@ void wxListCtrl::OnPaint(wxPaintEvent& event) wxSize clientSize = GetClientSize(); wxRect itemRect; - int cy=0; int itemCount = GetItemCount(); int i; @@ -2324,7 +2446,7 @@ void wxListCtrl::OnPaint(wxPaintEvent& event) { if (GetItemRect(i, itemRect)) { - cy = itemRect.GetTop(); + int cy = itemRect.GetTop(); if (i != 0) // Don't draw the first one { dc.DrawLine(0, cy, clientSize.x, cy); @@ -2358,6 +2480,21 @@ void wxListCtrl::OnPaint(wxPaintEvent& event) } } +WXLRESULT +wxListCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +{ +#ifdef WM_PRINT + if ( nMsg == WM_PRINT ) + { + // we should bypass our own WM_PRINT handling as we don't handle + // PRF_CHILDREN flag, so leave it to the native control itself + return MSWDefWindowProc(nMsg, wParam, lParam); + } +#endif // WM_PRINT + + return wxControl::MSWWindowProc(nMsg, wParam, lParam); +} + // ---------------------------------------------------------------------------- // virtual list controls // ---------------------------------------------------------------------------- @@ -2373,9 +2510,9 @@ wxString wxListCtrl::OnGetItemText(long WXUNUSED(item), long WXUNUSED(col)) cons int wxListCtrl::OnGetItemImage(long WXUNUSED(item)) const { - // same as above - wxFAIL_MSG( _T("wxListCtrl::OnGetItemImage not supposed to be called") ); - + wxCHECK_MSG(!GetImageList(wxIMAGE_LIST_SMALL), + -1, + wxT("List control has an image list, OnGetItemImage should be overridden.")); return -1; } @@ -2495,13 +2632,13 @@ static void wxConvertFromMSWListItem(HWND hwndListCtrl, long oldMask = lvItem.mask; - bool needText = FALSE; + bool needText = false; if (hwndListCtrl != 0) { if ( lvItem.mask & LVIF_TEXT ) - needText = FALSE; + needText = false; else - needText = TRUE; + needText = true; if ( needText ) { @@ -2683,7 +2820,8 @@ static void wxConvertToMSWListCol(int WXUNUSED(col), const wxListItem& item, // // we don't use LVCFMT_COL_HAS_IMAGES because it doesn't seem to // make any difference in my tests -- but maybe we should? - lvCol.fmt |= LVCFMT_BITMAP_ON_RIGHT | LVCFMT_IMAGE; + if ( item.m_image != -1 ) + lvCol.fmt |= LVCFMT_BITMAP_ON_RIGHT | LVCFMT_IMAGE; lvCol.iImage = item.m_image; }