added wxTreeCtrl::GetFocusedItem() (closes #10859)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 405fff83fec7d4b98210cbb8019425b7d51ef8d2..48baa8bd11aa33c6fc2313a38bc1aca1f61cae24 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -128,6 +128,10 @@ Changes in behaviour not resulting in compilation errors, please read this!
   changed. See the updated wxWindow::SetBackgroundStyle() description in the
   manual for more details.
 
   changed. See the updated wxWindow::SetBackgroundStyle() description in the
   manual for more details.
 

+- wxTreeCtrl::GetSelection now asserts if the tree has the wxTR_MULTIPLE style.
+  Instead use GetSelections() for multiple items; or if you want only the 
+  single item last touched, the new wxTreeCtrl::GetFocusedItem.
+

 
 Changes in behaviour which may result in compilation errors
 -----------------------------------------------------------
 
 Changes in behaviour which may result in compilation errors
 -----------------------------------------------------------

diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index 71dea9fc13a3c7bab2639f1e12046d853ddb1e49..98bc85666abd80cd24478d0f34590a2a39175cb3 100644 (file)
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -120,6 +120,7 @@ public:
         return m_current;
     }
     virtual size_t GetSelections(wxArrayTreeItemIds&) const;
         return m_current;
     }
     virtual size_t GetSelections(wxArrayTreeItemIds&) const;

+    virtual wxTreeItemId GetFocusedItem() const { return m_current; }

 
     virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const;
     virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item,
 
     virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const;
     virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item,

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index 81e24a8e8c43881ba8bfb392bac31b1e627749a3..ee13f4f4a4a5c350361f4fb56687a072e0752a08 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -210,6 +210,10 @@ public:
         //     control with a lot of items (~ O(number of items)).
     virtual size_t GetSelections(wxArrayTreeItemIds& selections) const = 0;
 
         //     control with a lot of items (~ O(number of items)).
     virtual size_t GetSelections(wxArrayTreeItemIds& selections) const = 0;
 

+        // get the last item to be clicked when the control has wxTR_MULTIPLE
+        // equivalent to GetSelection() if not wxTR_MULTIPLE
+    virtual wxTreeItemId GetFocusedItem() const = 0;
+

         // get the parent of this item (may return NULL if root)
     virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const = 0;
 
         // get the parent of this item (may return NULL if root)
     virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const = 0;
 

diff --git a/interface/wx/treectrl.h b/interface/wx/treectrl.h
index dff4440b32e1ed7c48ede901dca46e7a0153a9d7..6897303738d1e5fb885438b07174e3818cdef957 100644 (file)
--- a/interface/wx/treectrl.h
+++ b/interface/wx/treectrl.h
@@ -418,6 +418,15 @@ public:
     */
     virtual wxTreeItemId GetFirstVisibleItem() const;
 
     */
     virtual wxTreeItemId GetFirstVisibleItem() const;
 

+    /**
+        Returns the item last clicked or otherwise selected.
+        Unlike GetSelection(), it can be used whether or not
+        the control has the @c wxTR_MULTIPLE style.
+        
+        @since 2.9.1
+    */
+    virtual wxTreeItemId GetFocusedItem() const;
+

     /**
         Returns the normal image list.
     */
     /**
         Returns the normal image list.
     */


@@ -566,7 +575,8 @@ public:
     /**
         Returns the selection, or an invalid item if there is no selection. This
         function only works with the controls without @c wxTR_MULTIPLE style,
     /**
         Returns the selection, or an invalid item if there is no selection. This
         function only works with the controls without @c wxTR_MULTIPLE style,

-        use GetSelections() for the controls which do have this style.
+        use GetSelections() for the controls which do have this style 
+        or, if a single item is wanted, use GetFocusedItem().

     */
     virtual wxTreeItemId GetSelection() const;
 
     */
     virtual wxTreeItemId GetSelection() const;
 

diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index e422f27a553c941551dcac82b362d97147734540..edc685a3074fb6224a3e70baebae7568ca3a2111 100644 (file)
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -479,7 +479,7 @@ void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnRename(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnRename(wxCommandEvent& WXUNUSED(event))
 {

-    wxTreeItemId item = m_treeCtrl->GetSelection();
+    wxTreeItemId item = m_treeCtrl->GetFocusedItem();

 
     CHECK_ITEM( item );
 
 
     CHECK_ITEM( item );
 


@@ -500,7 +500,7 @@ void MyFrame::OnRename(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnCount(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnCount(wxCommandEvent& WXUNUSED(event))
 {

-    wxTreeItemId item = m_treeCtrl->GetSelection();
+    wxTreeItemId item = m_treeCtrl->GetFocusedItem();

 
     CHECK_ITEM( item );
 
 
     CHECK_ITEM( item );
 


@@ -511,7 +511,7 @@ void MyFrame::OnCount(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnCountRec(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnCountRec(wxCommandEvent& WXUNUSED(event))
 {

-    wxTreeItemId item = m_treeCtrl->GetSelection();
+    wxTreeItemId item = m_treeCtrl->GetFocusedItem();

 
     CHECK_ITEM( item );
 
 
     CHECK_ITEM( item );
 


@@ -522,7 +522,7 @@ void MyFrame::OnCountRec(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::DoSort(bool reverse)
 {
 
 void MyFrame::DoSort(bool reverse)
 {

-    wxTreeItemId item = m_treeCtrl->GetSelection();
+    wxTreeItemId item = m_treeCtrl->GetFocusedItem();

 
     CHECK_ITEM( item );
 
 
     CHECK_ITEM( item );
 


@@ -531,7 +531,7 @@ void MyFrame::DoSort(bool reverse)
 
 void MyFrame::OnHighlight(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnHighlight(wxCommandEvent& WXUNUSED(event))
 {

-    wxTreeItemId id = m_treeCtrl->GetSelection();
+    wxTreeItemId id = m_treeCtrl->GetFocusedItem();

 
     CHECK_ITEM( id );
 
 
     CHECK_ITEM( id );
 


@@ -551,7 +551,7 @@ void MyFrame::OnHighlight(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnDump(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnDump(wxCommandEvent& WXUNUSED(event))
 {

-    wxTreeItemId root = m_treeCtrl->GetSelection();
+    wxTreeItemId root = m_treeCtrl->GetFocusedItem();

 
     CHECK_ITEM( root );
 
 
     CHECK_ITEM( root );
 


@@ -580,7 +580,7 @@ void MyFrame::OnDumpSelected(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnSelect(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnSelect(wxCommandEvent& WXUNUSED(event))
 {

-    m_treeCtrl->SelectItem(m_treeCtrl->GetSelection());
+    m_treeCtrl->SelectItem(m_treeCtrl->GetFocusedItem());

 }
 
 void MyFrame::OnSelectRoot(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnSelectRoot(wxCommandEvent& WXUNUSED(event))


@@ -598,7 +598,7 @@ void MyFrame::OnUnselect(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::DoSetBold(bool bold)
 {
 
 void MyFrame::DoSetBold(bool bold)
 {

-    wxTreeItemId item = m_treeCtrl->GetSelection();
+    wxTreeItemId item = m_treeCtrl->GetFocusedItem();

 
     CHECK_ITEM( item );
 
 
     CHECK_ITEM( item );
 


@@ -607,7 +607,7 @@ void MyFrame::DoSetBold(bool bold)
 
 void MyFrame::OnDelete(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnDelete(wxCommandEvent& WXUNUSED(event))
 {

-    wxTreeItemId item = m_treeCtrl->GetSelection();
+    wxTreeItemId item = m_treeCtrl->GetFocusedItem();

 
     CHECK_ITEM( item );
 
 
     CHECK_ITEM( item );
 


@@ -616,7 +616,7 @@ void MyFrame::OnDelete(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnDeleteChildren(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnDeleteChildren(wxCommandEvent& WXUNUSED(event))
 {

-    wxTreeItemId item = m_treeCtrl->GetSelection();
+    wxTreeItemId item = m_treeCtrl->GetFocusedItem();

 
     CHECK_ITEM( item );
 
 
     CHECK_ITEM( item );
 


@@ -763,19 +763,25 @@ void MyFrame::OnIncSpacing(wxCommandEvent& WXUNUSED(event))
 {
     unsigned int indent = m_treeCtrl->GetSpacing();
     if (indent < 100)
 {
     unsigned int indent = m_treeCtrl->GetSpacing();
     if (indent < 100)

+    {

         m_treeCtrl->SetSpacing( indent+5 );
         m_treeCtrl->SetSpacing( indent+5 );

+        m_treeCtrl->Refresh();
+    }

 }
 
 void MyFrame::OnDecSpacing(wxCommandEvent& WXUNUSED(event))
 {
     unsigned int indent = m_treeCtrl->GetSpacing();
     if (indent > 10)
 }
 
 void MyFrame::OnDecSpacing(wxCommandEvent& WXUNUSED(event))
 {
     unsigned int indent = m_treeCtrl->GetSpacing();
     if (indent > 10)

+    {

         m_treeCtrl->SetSpacing( indent-5 );
         m_treeCtrl->SetSpacing( indent-5 );

+        m_treeCtrl->Refresh();
+    } 

 }
 
 void MyFrame::OnToggleIcon(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void MyFrame::OnToggleIcon(wxCommandEvent& WXUNUSED(event))
 {

-    wxTreeItemId item = m_treeCtrl->GetSelection();
+    wxTreeItemId item = m_treeCtrl->GetFocusedItem();

 
     CHECK_ITEM( item );
 
 
     CHECK_ITEM( item );
 


@@ -784,7 +790,7 @@ void MyFrame::OnToggleIcon(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnToggleState(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnToggleState(wxCommandEvent& WXUNUSED(event))
 {

-    wxTreeItemId item = m_treeCtrl->GetSelection();
+    wxTreeItemId item = m_treeCtrl->GetFocusedItem();

 
     CHECK_ITEM( item );
 
 
     CHECK_ITEM( item );
 


@@ -804,7 +810,7 @@ void MyFrame::DoShowFirstOrLast(TreeFunc0_t pfn, const wxString& label)
 
 void MyFrame::DoShowRelativeItem(TreeFunc1_t pfn, const wxString& label)
 {
 
 void MyFrame::DoShowRelativeItem(TreeFunc1_t pfn, const wxString& label)
 {

-    wxTreeItemId item = m_treeCtrl->GetSelection();
+    wxTreeItemId item = m_treeCtrl->GetFocusedItem();

 
     CHECK_ITEM( item );
 
 
     CHECK_ITEM( item );