{
if (attr)
delete attr;
- };
+ }
DECLARE_NO_COPY_CLASS(wxListItemInternalData)
};
}
// Sets the item data
-bool wxListCtrl::SetItemData(long item, long data)
+bool wxListCtrl::SetItemPtrData(long item, wxUIntPtr data)
{
wxListItem info;
{
// m_textCtrl is not always ready, ie. in EVT_LIST_BEGIN_LABEL_EDIT
HWND hwnd = ListView_GetEditControl(GetHwnd());
- bool b = (hwnd != NULL);
- if (b)
- {
- if (cancel)
- ::SetWindowText(hwnd, wxEmptyString); // dubious but better than nothing
- if (m_textCtrl)
- {
- m_textCtrl->UnsubclassWin();
- m_textCtrl->SetHWND(0);
- delete m_textCtrl;
- m_textCtrl = NULL;
- }
- ::DestroyWindow(hwnd);
- }
- return b;
+ if ( !hwnd )
+ return false;
+
+ if ( cancel )
+ ::SetWindowText(hwnd, wxEmptyString); // dubious but better than nothing
+
+ // we shouldn't destroy the control ourselves according to MSDN, which
+ // proposes WM_CANCELMODE to do this, but it doesn't seem to work
+ //
+ // posting WM_CLOSE to it does seem to work without any side effects
+ ::PostMessage(hwnd, WM_CLOSE, 0, 0);
+
+ return true;
}
// Ensures this item is visible
{
if ( msg->wParam == VK_RETURN )
{
- // we need VK_RETURN to generate wxEVT_COMMAND_LIST_ITEM_ACTIVATED
+ // We need VK_RETURN to generate wxEVT_COMMAND_LIST_ITEM_ACTIVATED,
+ // but only if none of the modifiers is down. We'll let normal
+ // accelerators handle those.
+ if ( !wxIsCtrlDown() && !wxIsCtrlDown() &&
+ !((HIWORD(msg->lParam) & KF_ALTDOWN) == KF_ALTDOWN))
return false;
}
}
return false;
}
+// utility used by wxListCtrl::MSWOnNotify and by wxDataViewHeaderWindowMSW::MSWOnNotify
+int WXDLLIMPEXP_CORE wxMSWGetColumnClicked(NMHDR *nmhdr, POINT *ptClick)
+{
+ wxASSERT(nmhdr && ptClick);
+
+ // find the column clicked: we have to search for it
+ // ourselves as the notification message doesn't provide
+ // this info
+
+ // where did the click occur?
+#if defined(__WXWINCE__) && !defined(__HANDHELDPC__) && _WIN32_WCE < 400
+ if (nmhdr->code == GN_CONTEXTMENU)
+ {
+ *ptClick = ((NMRGINFO*)nmhdr)->ptAction;
+ }
+ else
+#endif //__WXWINCE__
+ if ( !::GetCursorPos(ptClick) )
+ {
+ wxLogLastError(_T("GetCursorPos"));
+ }
+
+ if ( !::ScreenToClient(nmhdr->hwndFrom, ptClick) )
+ {
+ wxLogLastError(_T("ScreenToClient(header)"));
+ }
+
+ int colCount = Header_GetItemCount(nmhdr->hwndFrom);
+
+ RECT rect;
+ for ( int col = 0; col < colCount; col++ )
+ {
+ if ( Header_GetItemRect(nmhdr->hwndFrom, col, &rect) )
+ {
+ if ( ::PtInRect(&rect, *ptClick) )
+ {
+ return col;
+ }
+ }
+ }
+
+ return wxNOT_FOUND;
+}
+
bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
{
#endif //__WXWINCE__
case NM_RCLICK:
{
- eventType = wxEVT_COMMAND_LIST_COL_RIGHT_CLICK;
- event.m_col = -1;
-
- // find the column clicked: we have to search for it
- // ourselves as the notification message doesn't provide
- // this info
-
- // where did the click occur?
POINT ptClick;
-#if defined(__WXWINCE__) && !defined(__HANDHELDPC__) && _WIN32_WCE < 400
- if(nmhdr->code == GN_CONTEXTMENU) {
- ptClick = ((NMRGINFO*)nmhdr)->ptAction;
- } else
-#endif //__WXWINCE__
- if ( !::GetCursorPos(&ptClick) )
- {
- wxLogLastError(_T("GetCursorPos"));
- }
-
- if ( !::ScreenToClient(GetHwnd(), &ptClick) )
- {
- wxLogLastError(_T("ScreenToClient(listctrl header)"));
- }
+ eventType = wxEVT_COMMAND_LIST_COL_RIGHT_CLICK;
+ event.m_col = wxMSWGetColumnClicked(nmhdr, &ptClick);
event.m_pointDrag.x = ptClick.x;
event.m_pointDrag.y = ptClick.y;
-
- int colCount = Header_GetItemCount(hwndHdr);
-
- RECT rect;
- for ( int col = 0; col < colCount; col++ )
- {
- if ( Header_GetItemRect(hwndHdr, col, &rect) )
- {
- if ( ::PtInRect(&rect, ptClick) )
- {
- event.m_col = col;
- break;
- }
- }
- }
}
break;
// parameters
//
// I have no idea what is the real cause of the bug (which is,
- // just to make things interesting, is impossible to reproduce
+ // just to make things interesting, impossible to reproduce
// reliably) but ignoring all these messages does fix it and
// doesn't seem to have any negative consequences
return true;
}
else
#endif // defined(HDN_BEGINTRACKA)
- if ( nmhdr->hwndFrom == GetHwnd() )
+ if ( nmhdr->hwndFrom == GetHwnd() )
{
// almost all messages use NM_LISTVIEW
NM_LISTVIEW *nmLV = (NM_LISTVIEW *)nmhdr;
wxDeleteInternalData(this, iItem);
break;
-#if WXWIN_COMPATIBILITY_2_4
- case LVN_SETDISPINFO:
- {
- eventType = wxEVT_COMMAND_LIST_SET_INFO;
- LV_DISPINFO *info = (LV_DISPINFO *)lParam;
- wxConvertFromMSWListItem(GetHwnd(), event.m_item, info->item);
- }
- break;
-#endif
-
case LVN_INSERTITEM:
eventType = wxEVT_COMMAND_LIST_INSERT_ITEM;
event.m_itemIndex = iItem;
}
#endif // NM_CUSTOMDRAW
- // a little dose of healthy paranoia: as we never use
- // LVM_SETCALLBACKMASK we're not supposed to get these ones
- wxASSERT_MSG( !(lvi.mask & LVIF_STATE),
- _T("we don't support state callbacks yet!") );
+ // even though we never use LVM_SETCALLBACKMASK, we still
+ // can get messages with LVIF_STATE in lvi.mask under Vista
+ if ( lvi.mask & LVIF_STATE )
+ {
+ // we don't have anything to return from here...
+ lvi.stateMask = 0;
+ }
return true;
}
return rc;
}
-static void HandleSubItemPrepaint(LPNMLVCUSTOMDRAW pLVCD, HFONT hfont)
+static bool HandleSubItemPrepaint(LPNMLVCUSTOMDRAW pLVCD, HFONT hfont)
{
NMCUSTOMDRAW& nmcd = pLVCD->nmcd;
HDC hdc = nmcd.hdc;
HWND hwndList = nmcd.hdr.hwndFrom;
+ const int col = pLVCD->iSubItem;
const DWORD item = nmcd.dwItemSpec;
-
// the font must be valid, otherwise we wouldn't be painting the item at all
SelectInHDC selFont(hdc, hfont);
// get the rectangle to paint
RECT rc;
- ListView_GetSubItemRect(hwndList, item, pLVCD->iSubItem, LVIR_BOUNDS, &rc);
- if ( !pLVCD->iSubItem )
+ ListView_GetSubItemRect(hwndList, item, col, LVIR_BOUNDS, &rc);
+ if ( !col )
{
// broken ListView_GetSubItemRect() returns the entire item rect for
// 0th subitem while we really need just the part for this column
wxZeroMemory(it);
it.mask = LVIF_TEXT | LVIF_IMAGE;
it.iItem = item;
- it.iSubItem = pLVCD->iSubItem;
+ it.iSubItem = col;
it.pszText = text;
it.cchTextMax = WXSIZEOF(text);
ListView_GetItem(hwndList, &it);
::SetBkMode(hdc, TRANSPARENT);
- // TODO: support for centred/right aligned columns
- ::DrawText(hdc, text, -1, &rc,
+ UINT fmt = DT_SINGLELINE |
#ifndef __WXWINCE__
DT_WORD_ELLIPSIS |
#endif // __WXWINCE__
- DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER);
+ DT_NOPREFIX |
+ DT_VCENTER;
+
+ LV_COLUMN lvCol;
+ wxZeroMemory(lvCol);
+ lvCol.mask = LVCF_FMT;
+ if ( ListView_GetColumn(hwndList, col, &lvCol) )
+ {
+ switch ( lvCol.fmt & LVCFMT_JUSTIFYMASK )
+ {
+ case LVCFMT_LEFT:
+ fmt |= DT_LEFT;
+ break;
+
+ case LVCFMT_CENTER:
+ fmt |= DT_CENTER;
+ break;
+
+ case LVCFMT_RIGHT:
+ fmt |= DT_RIGHT;
+ break;
+ }
+ }
+ //else: failed to get alignment, assume it's DT_LEFT (default)
+
+ DrawText(hdc, text, -1, &rc, fmt);
+
+ return true;
}
static void HandleItemPostpaint(NMCUSTOMDRAW nmcd)
else
{
// pszText is not const, hence the cast
- lvItem.pszText = (wxChar *)info.m_text.c_str();
+ lvItem.pszText = (wxChar *)info.m_text.wx_str();
if ( lvItem.pszText )
lvItem.cchTextMax = info.m_text.length();
else
if ( item.m_mask & wxLIST_MASK_TEXT )
{
lvCol.mask |= LVCF_TEXT;
- lvCol.pszText = (wxChar *)item.m_text.c_str(); // cast is safe
+ lvCol.pszText = (wxChar *)item.m_text.wx_str(); // cast is safe
}
if ( item.m_mask & wxLIST_MASK_FORMAT )
projects / wxWidgets.git / blobdiff