Add wxToolBar::GetToolByPos() method to access tools by their index.

This is a trivial accessor which somehow was never added before even though we
had GetToolsCount() and even DeleteToolByPos().

Closes #11120.

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 345b69cc82d851acaf0a19cd93d6c30fc9b1a821..ff8af7619897a559326195763f93325821639d9c 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -508,6 +508,7 @@ All (GUI):
 - Allow overriding print preview frame creation in docview (troelsk).
 - Added support for gradient stops in wxGraphicsContext (Kit Bishop).
 - Added wxTransparentColour.
 - Allow overriding print preview frame creation in docview (troelsk).
 - Added support for gradient stops in wxGraphicsContext (Kit Bishop).
 - Added wxTransparentColour.

+- Added wxToolBar::GetToolByPos().

 
 GTK:
 
 
 GTK:
 

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 451fb1a1e435415f16411458138b861189355df7..bbb74680efecb2151a22009eb32f347fd1b3c590 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -476,6 +476,10 @@ public:
     // return true if this is a vertical toolbar, otherwise false
     bool IsVertical() const;
 
     // return true if this is a vertical toolbar, otherwise false
     bool IsVertical() const;
 

+    // these methods allow to access tools by their index in the toolbar
+    size_t GetToolsCount() const { return m_tools.GetCount(); }
+    const wxToolBarToolBase *GetToolByPos(int pos) const { return m_tools[pos]; }
+

 #if WXWIN_COMPATIBILITY_2_8
     // the old versions of the various methods kept for compatibility
     // don't use in the new code!
 #if WXWIN_COMPATIBILITY_2_8
     // the old versions of the various methods kept for compatibility
     // don't use in the new code!


@@ -559,8 +563,6 @@ public:
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 

-    size_t GetToolsCount() const { return m_tools.GetCount(); }
-

     // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
     virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) ;
 
     // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
     virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) ;
 

diff --git a/interface/wx/toolbar.h b/interface/wx/toolbar.h
index 95b3dbf776484cc03bd074325a0a172e708326b9..5daf2418feacf59b66d31661c25296a7f498d7f8 100644 (file)
--- a/interface/wx/toolbar.h
+++ b/interface/wx/toolbar.h
@@ -438,6 +438,17 @@ public:
     */
     virtual wxSize GetToolBitmapSize() const;
 
     */
     virtual wxSize GetToolBitmapSize() const;
 

+    /**
+        Returns a pointer to the tool at ordinal position @a pos.
+
+        Don't confuse this with FindToolForPosition().
+
+        @since 2.9.1
+
+        @see GetToolsCount()
+    */
+    const wxToolBarToolBase *GetToolByPos(int pos) const;
+

     /**
         Get any client data associated with the tool.
 
     /**
         Get any client data associated with the tool.