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

No changes, just some cleanup in wxGenericDirCtrl code.

Browse Source 
Use GetItemData() helper to only write a cast to wxDirItemData in this
function instead of repeating it many times.

See #14790.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-11-01 17:15:03 +00:00
parent efafcdca4a
commit 0d6f66f45c
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/generic/dirctrlg.h
View File

@@ -192,6 +192,7 @@ protected:
private: private:
void PopulateNode(wxTreeItemId node); void PopulateNode(wxTreeItemId node);
wxDirItemData* GetItemData(wxTreeItemId itemId);
bool m_showHidden; bool m_showHidden;
wxTreeItemId m_rootId; wxTreeItemId m_rootId;

17
src/generic/dirctrlg.cpp
View File

@@ -666,7 +666,7 @@ void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event)
} }
wxTreeItemId treeid = event.GetItem(); wxTreeItemId treeid = event.GetItem();
wxDirItemData *data = (wxDirItemData*)m_treeCtrl->GetItemData( treeid ); wxDirItemData *data = GetItemData( treeid );
wxASSERT( data ); wxASSERT( data );
wxString new_name( wxPathOnly( data->m_path ) ); wxString new_name( wxPathOnly( data->m_path ) );
@@ -716,7 +716,7 @@ void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId)
{ {
wxTreeItemId child; wxTreeItemId child;
wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(parentId); wxDirItemData *data = GetItemData(parentId);
if (!data->m_isExpanded) if (!data->m_isExpanded)
return; return;
@@ -731,7 +731,7 @@ void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId)
void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId) void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId)
{ {
wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(parentId); wxDirItemData *data = GetItemData(parentId);
if (data->m_isExpanded) if (data->m_isExpanded)
return; return;
@@ -922,7 +922,7 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie); wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie);
while (childId.IsOk()) while (childId.IsOk())
{ {
wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(childId); wxDirItemData* data = GetItemData(childId);
if (data && !data->m_path.empty()) if (data && !data->m_path.empty())
{ {
@@ -973,7 +973,7 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path)
if (!lastId.IsOk()) if (!lastId.IsOk())
return false; return false;
wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(lastId); wxDirItemData *data = GetItemData(lastId);
if (data->m_isDir) if (data->m_isDir)
{ {
m_treeCtrl->Expand(lastId); m_treeCtrl->Expand(lastId);
@@ -986,7 +986,7 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path)
bool selectedChild = false; bool selectedChild = false;
while (childId.IsOk()) while (childId.IsOk())
{ {
data = (wxDirItemData*) m_treeCtrl->GetItemData(childId); data = GetItemData(childId);
if (data && data->m_path != wxEmptyString && !data->m_isDir) if (data && data->m_path != wxEmptyString && !data->m_isDir)
{ {
@@ -1038,6 +1038,11 @@ bool wxGenericDirCtrl::CollapsePath(const wxString& path)
return true; return true;
} }
wxDirItemData* wxGenericDirCtrl::GetItemData(wxTreeItemId itemId)
{
return static_cast<wxDirItemData*>(m_treeCtrl->GetItemData(itemId));
}
wxString wxGenericDirCtrl::GetPath(wxTreeItemId itemId) const wxString wxGenericDirCtrl::GetPath(wxTreeItemId itemId) const
{ {
const wxDirItemData* const wxDirItemData*