removed wxFunction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -285,10 +285,6 @@ void wxMenuBase::Init(long style)
|
||||
m_style = style;
|
||||
m_clientData = (void *)NULL;
|
||||
m_eventHandler = this;
|
||||
|
||||
#if wxUSE_MENU_CALLBACK
|
||||
m_callback = (wxFunction) NULL;
|
||||
#endif // wxUSE_MENU_CALLBACK
|
||||
}
|
||||
|
||||
wxMenuBase::~wxMenuBase()
|
||||
@@ -584,15 +580,6 @@ bool wxMenuBase::SendEvent(int id, int checked)
|
||||
|
||||
bool processed = FALSE;
|
||||
|
||||
#if wxUSE_MENU_CALLBACK
|
||||
// Try a callback
|
||||
if (m_callback)
|
||||
{
|
||||
(void)(*(m_callback))(*this, event);
|
||||
processed = TRUE;
|
||||
}
|
||||
#endif // wxUSE_MENU_CALLBACK
|
||||
|
||||
// Try the menu's event handler
|
||||
if ( !processed )
|
||||
{
|
||||
|
Reference in New Issue
Block a user