AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix state images after changing their style (see #9591)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2009-01-25 18:34:45 +00:00
parent ce43f9e115
commit df4a099cbe
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
samples/treectrl/treetest.cpp
View File

@ -680,6 +680,11 @@ void MyFrame::OnToggleAlternateStates(wxCommandEvent& WXUNUSED(event))
m_treeCtrl->SetAlternateStates(!alternateStates); m_treeCtrl->SetAlternateStates(!alternateStates);
m_treeCtrl->CreateStateImageList(); m_treeCtrl->CreateStateImageList();
// normal states < alternate states
// so we must reset broken states
if ( alternateStates )
m_treeCtrl->ResetBrokenStateImages();
} }
void MyFrame::OnToggleButtons(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnToggleButtons(wxCommandEvent& WXUNUSED(event))
@ -1152,6 +1157,29 @@ void MyTreeCtrl::DoToggleState(const wxTreeItemId& item)
} }
} }
void MyTreeCtrl::DoResetBrokenStateImages(const wxTreeItemId& idParent,
wxTreeItemIdValue cookie, int state)
{
wxTreeItemId id;
if ( !cookie )
id = GetFirstChild(idParent, cookie);
else
id = GetNextChild(idParent, cookie);
if ( !id.IsOk() )
return;
int curState = GetItemState(id);
if ( curState != wxTREE_ITEMSTATE_NONE && curState > state )
SetItemState(id, state);
if (ItemHasChildren(id))
DoResetBrokenStateImages(id, 0, state);
DoResetBrokenStateImages(idParent, cookie, state);
}
void MyTreeCtrl::LogEvent(const wxChar *name, const wxTreeEvent& event) void MyTreeCtrl::LogEvent(const wxChar *name, const wxTreeEvent& event)
{ {
wxTreeItemId item = event.GetItem(); wxTreeItemId item = event.GetItem();

10
samples/treectrl/treetest.h
View File

@ -123,6 +123,13 @@ public:
void SetAlternateStates(bool show) { m_alternateStates = show; } void SetAlternateStates(bool show) { m_alternateStates = show; }
bool AlternateStates() const { return m_alternateStates; } bool AlternateStates() const { return m_alternateStates; }
void ResetBrokenStateImages()
{
const size_t count = GetStateImageList()->GetImageCount();
int state = count > 0 ? count - 1 : wxTREE_ITEMSTATE_NONE;
DoResetBrokenStateImages(GetRootItem(), 0, state);
}
protected: protected:
virtual int OnCompareItems(const wxTreeItemId& i1, const wxTreeItemId& i2); virtual int OnCompareItems(const wxTreeItemId& i1, const wxTreeItemId& i2);
@ -139,6 +146,9 @@ private:
size_t depth, size_t depth,
size_t folder); size_t folder);
void DoResetBrokenStateImages(const wxTreeItemId& idParent,
wxTreeItemIdValue cookie, int state);
void LogEvent(const wxChar *name, const wxTreeEvent& event); void LogEvent(const wxChar *name, const wxTreeEvent& event);
int m_imageSize; // current size of images int m_imageSize; // current size of images