Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxMenu::callback stuff taken inside WXWIN_COMPATIBILITY_2 (everybody should

Browse Source 
be happy now)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-11-15 14:04:06 +00:00
parent c09f28798b
commit 9739d9ee80
6 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/menucmn.cpp
View File

@@ -125,7 +125,10 @@ 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()

2
src/gtk/menu.cpp
View File

@@ -469,11 +469,13 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
event.SetEventObject( menu );
event.SetInt(id );
#if wxUSE_MENU_CALLBACK
if (menu->GetCallback())
{
(void) (*(menu->GetCallback())) (*menu, event);
return;
}
#endif // wxUSE_MENU_CALLBACK
if (menu->GetEventHandler()->ProcessEvent(event))
return;

2
src/gtk1/menu.cpp
View File

@@ -469,11 +469,13 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
event.SetEventObject( menu );
event.SetInt(id );
#if wxUSE_MENU_CALLBACK
if (menu->GetCallback())
{
(void) (*(menu->GetCallback())) (*menu, event);
return;
}
#endif // wxUSE_MENU_CALLBACK
if (menu->GetEventHandler()->ProcessEvent(event))
return;

2
src/motif/menu.cpp
View File

@@ -162,12 +162,14 @@ bool wxMenu::ProcessCommand(wxCommandEvent & event)
{
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 && GetEventHandler())

2
src/msw/menu.cpp
View File

@@ -432,12 +432,14 @@ bool wxMenu::ProcessCommand(wxCommandEvent & event)
{
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 && GetEventHandler())