set the column width in wxListEvent itself too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1659,10 +1659,11 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
|||||||
// work around is to simply catch both versions and hope that it
|
// work around is to simply catch both versions and hope that it
|
||||||
// works (why should this message exist in ANSI and Unicode is
|
// works (why should this message exist in ANSI and Unicode is
|
||||||
// beyond me as it doesn't deal with strings at all...)
|
// beyond me as it doesn't deal with strings at all...)
|
||||||
|
//
|
||||||
// Tip from www.deja.com: can use CCM_SETUNICODE to set
|
// note that fr HDN_TRACK another possibility could be to use
|
||||||
// Unicode or ANSI mode. We might consider doing that for
|
// HDN_ITEMCHANGING but it is sent even after HDN_ENDTRACK and when
|
||||||
// consistency in ANSI mode.
|
// something other than the item width changes so we'd have to
|
||||||
|
// filter out the unwanted events then
|
||||||
case HDN_BEGINTRACKA:
|
case HDN_BEGINTRACKA:
|
||||||
case HDN_BEGINTRACKW:
|
case HDN_BEGINTRACKW:
|
||||||
eventType = wxEVT_COMMAND_LIST_COL_BEGIN_DRAG;
|
eventType = wxEVT_COMMAND_LIST_COL_BEGIN_DRAG;
|
||||||
@@ -1678,6 +1679,8 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
|||||||
case HDN_ENDTRACKW:
|
case HDN_ENDTRACKW:
|
||||||
if ( eventType == wxEVT_NULL )
|
if ( eventType == wxEVT_NULL )
|
||||||
eventType = wxEVT_COMMAND_LIST_COL_END_DRAG;
|
eventType = wxEVT_COMMAND_LIST_COL_END_DRAG;
|
||||||
|
|
||||||
|
event.m_item.m_width = nmHDR->pitem->cxy;
|
||||||
event.m_col = nmHDR->iItem;
|
event.m_col = nmHDR->iItem;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -1721,49 +1724,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
#if 0
|
|
||||||
case HDN_ITEMCHANGINGW:
|
|
||||||
{
|
|
||||||
return wxControl::MSWOnNotify(idCtrl, lParam, result);
|
|
||||||
}
|
|
||||||
case HDN_ITEMCHANGEDA:
|
|
||||||
{
|
|
||||||
return wxControl::MSWOnNotify(idCtrl, lParam, result);
|
|
||||||
}
|
|
||||||
case HDN_ITEMCHANGEDW:
|
|
||||||
{
|
|
||||||
return wxControl::MSWOnNotify(idCtrl, lParam, result);
|
|
||||||
}
|
|
||||||
case HDN_ITEMCLICKA:
|
|
||||||
{
|
|
||||||
return wxControl::MSWOnNotify(idCtrl, lParam, result);
|
|
||||||
}
|
|
||||||
case HDN_ITEMCLICKW:
|
|
||||||
{
|
|
||||||
return wxControl::MSWOnNotify(idCtrl, lParam, result);
|
|
||||||
}
|
|
||||||
case HDN_ITEMDBLCLICKA:
|
|
||||||
{
|
|
||||||
return wxControl::MSWOnNotify(idCtrl, lParam, result);
|
|
||||||
}
|
|
||||||
case HDN_ITEMDBLCLICKW:
|
|
||||||
{
|
|
||||||
return wxControl::MSWOnNotify(idCtrl, lParam, result);
|
|
||||||
}
|
|
||||||
case HDN_DIVIDERDBLCLICKA:
|
|
||||||
{
|
|
||||||
return wxControl::MSWOnNotify(idCtrl, lParam, result);
|
|
||||||
}
|
|
||||||
case HDN_DIVIDERDBLCLICKW:
|
|
||||||
{
|
|
||||||
return wxControl::MSWOnNotify(idCtrl, lParam, result);
|
|
||||||
}
|
|
||||||
case HDN_GETDISPINFOA:
|
|
||||||
{
|
|
||||||
return wxControl::MSWOnNotify(idCtrl, lParam, result);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
case HDN_GETDISPINFOW:
|
case HDN_GETDISPINFOW:
|
||||||
{
|
{
|
||||||
LPNMHDDISPINFOW info = (LPNMHDDISPINFOW) lParam;
|
LPNMHDDISPINFOW info = (LPNMHDDISPINFOW) lParam;
|
||||||
@@ -1777,9 +1738,9 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
|||||||
// of this strange message.
|
// of this strange message.
|
||||||
if (info->iItem > GetColumnCount())
|
if (info->iItem > GetColumnCount())
|
||||||
return TRUE;
|
return TRUE;
|
||||||
else
|
|
||||||
return wxControl::MSWOnNotify(idCtrl, lParam, result);
|
|
||||||
}
|
}
|
||||||
|
// fall through
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return wxControl::MSWOnNotify(idCtrl, lParam, result);
|
return wxControl::MSWOnNotify(idCtrl, lParam, result);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user