Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added wxTreeCtrl::UnselectItem() and ToggleItemSelection() (includes patch 832281)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-02-10 18:58:27 +00:00
parent 6bba111cc6
commit 3e9af289ed
3 changed files with 121 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/msw/treectrl.cpp
View File

@@ -97,7 +97,7 @@ static bool IsItemSelected(HWND hwndTV, HTREEITEM hItem)
return (tvi.state & TVIS_SELECTED) != 0;
}
static void SelectItem(HWND hwndTV, HTREEITEM hItem, bool select = true)
static bool SelectItem(HWND hwndTV, HTREEITEM hItem, bool select = true)
{
TV_ITEM tvi;
tvi.mask = TVIF_STATE | TVIF_HANDLE;
@@ -108,7 +108,10 @@ static void SelectItem(HWND hwndTV, HTREEITEM hItem, bool select = true)
if ( TreeView_SetItem(hwndTV, &tvi) == -1 )
{
wxLogLastError(wxT("TreeView_SetItem"));
return false;
}
return true;
}
static inline void UnselectItem(HWND hwndTV, HTREEITEM htItem)
@@ -1864,19 +1867,22 @@ void wxTreeCtrl::UnselectAll()
}
}
void wxTreeCtrl::SelectItem(const wxTreeItemId& item)
void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
{
if ( m_windowStyle & wxTR_MULTIPLE )
{
#if wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
// selecting the item means checking it
SetItemCheck(item);
SetItemCheck(item, select);
#else // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
::SelectItem(GetHwnd(), HITEM(item));
::SelectItem(GetHwnd(), HITEM(item), select);
#endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE/!wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
}
else
{
wxASSERT_MSG( select,
_T("SelectItem(false) works only for multiselect") );
// inspite of the docs (MSDN Jan 99 edition), we don't seem to receive
// the notification from the control (i.e. TVN_SELCHANG{ED|ING}), so
// send them ourselves
@@ -1888,11 +1894,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item)
event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGING);
if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
{
if ( !TreeView_SelectItem(GetHwnd(), HITEM(item)) )
{
wxLogLastError(wxT("TreeView_SelectItem"));
}
else
if ( ::SelectItem(GetHwnd(), HITEM(item), select) )
{
event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
(void)GetEventHandler()->ProcessEvent(event);
@@ -1902,6 +1904,16 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item)
}
}
void wxTreeCtrl::UnselectItem(const wxTreeItemId& item)
{
SelectItem(item, false);
}
void wxTreeCtrl::ToggleItemSelection(const wxTreeItemId& item)
{
SelectItem(item, !IsSelected(item));
}
void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
{
// no error return
@@ -2162,7 +2174,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
SetFocus();
// toggle selected state
ToggleItemSelection(GetHwnd(), htItem);
::ToggleItemSelection(GetHwnd(), htItem);
::SetFocus(GetHwnd(), htItem);
@@ -2325,7 +2337,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{
if ( bCtrl )
{
ToggleItemSelection(GetHwnd(), htSel);
::ToggleItemSelection(GetHwnd(), htSel);
}
else
{