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
This commit is contained in:
@@ -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);
|
||||
|
||||
|
@@ -59,6 +59,8 @@ WX_DEFINE_LIST(wxToolBarToolsList);
|
||||
// wxToolBarToolBase
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxToolBarToolBase, wxObject)
|
||||
|
||||
bool wxToolBarToolBase::Enable(bool enable)
|
||||
{
|
||||
if ( m_enabled == enable )
|
||||
|
Reference in New Issue
Block a user