From d6071228a9c77a0353f3723f6a338aa449cedf9e Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 17 Dec 2003 21:12:36 +0000 Subject: [PATCH] wxPython needs wxRTTI info for wxToolBarToolBase in order to return objects of the right type. Also made FindById public. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/tbarbase.h | 8 ++++---- src/common/tbarbase.cpp | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h index 30396a4b07..16344e72f4 100644 --- a/include/wx/tbarbase.h +++ b/include/wx/tbarbase.h @@ -235,7 +235,7 @@ protected: wxString m_shortHelpString; wxString m_longHelpString; - DECLARE_NO_COPY_CLASS(wxToolBarToolBase) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxToolBarToolBase) }; // a list of toolbar tools @@ -427,6 +427,9 @@ public: virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const = 0; + // find the tool by id + wxToolBarToolBase *FindById(int toolid) const; + // return TRUE if this is a vertical toolbar, otherwise FALSE bool IsVertical() const { return HasFlag(wxTB_VERTICAL); } @@ -572,9 +575,6 @@ protected: // helper functions // ---------------- - // find the tool by id - wxToolBarToolBase *FindById(int toolid) const; - // un-toggle all buttons in the same radio group void UnToggleRadioGroup(wxToolBarToolBase *tool); diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp index 62ec150e49..f2310dc1a9 100644 --- a/src/common/tbarbase.cpp +++ b/src/common/tbarbase.cpp @@ -59,6 +59,8 @@ WX_DEFINE_LIST(wxToolBarToolsList); // wxToolBarToolBase // ---------------------------------------------------------------------------- +IMPLEMENT_DYNAMIC_CLASS(wxToolBarToolBase, wxObject) + bool wxToolBarToolBase::Enable(bool enable) { if ( m_enabled == enable ) -- 2.45.2