No changes, just some cleanup in wxGenericDirCtrl code.

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

diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index e0810e9a644b039b8754d33fd997e9a48316b4be..450c8624d76192d84832474f069b807777052c60 100644 (file)
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -192,6 +192,7 @@ protected:
 
 private:
     void PopulateNode(wxTreeItemId node);
 
 private:
     void PopulateNode(wxTreeItemId node);

+    wxDirItemData* GetItemData(wxTreeItemId itemId);

 
     bool            m_showHidden;
     wxTreeItemId    m_rootId;
 
     bool            m_showHidden;
     wxTreeItemId    m_rootId;

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index fab9f5c9c1445926a8571ee16d1c9399d776c8ff..4b25f874a2a330526b373cd93510a401d049da0c 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -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 );
 
     wxString new_name( wxPathOnly( data->m_path ) );
     wxASSERT( data );
 
     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)
         return;
 
     if (!data->m_isExpanded)
         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)
         return;
 
     if (data->m_isExpanded)
         return;


@@ -922,7 +922,7 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
     wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie);
     while (childId.IsOk())
     {
     wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie);
     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())
         return false;
 
     if (!lastId.IsOk())
         return false;
 

-    wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(lastId);
+    wxDirItemData *data = GetItemData(lastId);

     if (data->m_isDir)
     {
         m_treeCtrl->Expand(lastId);
     if (data->m_isDir)
     {
         m_treeCtrl->Expand(lastId);


@@ -986,7 +986,7 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path)
         bool selectedChild = false;
         while (childId.IsOk())
         {
         bool selectedChild = false;
         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
 {
     const wxDirItemData*
 wxString wxGenericDirCtrl::GetPath(wxTreeItemId itemId) const
 {
     const wxDirItemData*