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

Fixed menu event propogation to be consistent across platforms, and

Browse Source 
with the docs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-04-03 18:39:20 +00:00
parent b6f6e5a77e
commit 073233381b
3 changed files with 88 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/framecmn.cpp
View File

@@ -204,7 +204,8 @@ bool wxFrameBase::ProcessCommand(int id)
} }
} }
return GetEventHandler()->ProcessEvent(commandEvent); GetEventHandler()->ProcessEvent(commandEvent);
return TRUE;
#else // !wxUSE_MENUS #else // !wxUSE_MENUS
return FALSE; return FALSE;
#endif // wxUSE_MENUS/!wxUSE_MENUS #endif // wxUSE_MENUS/!wxUSE_MENUS

17
src/gtk/menu.cpp
View File

@@ -172,7 +172,8 @@ static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu )
wxMenuEvent event( wxEVT_MENU_OPEN, -1 ); wxMenuEvent event( wxEVT_MENU_OPEN, -1 );
event.SetEventObject( menu ); event.SetEventObject( menu );
if (menu->GetEventHandler()->ProcessEvent(event)) wxEvtHandler* handler = menu->GetEventHandler();
if (handler && handler->ProcessEvent(event))
return; return;
wxWindow *win = menu->GetInvokingWindow(); wxWindow *win = menu->GetInvokingWindow();
@@ -700,6 +701,13 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
if (!menu->IsEnabled(id)) if (!menu->IsEnabled(id))
return; return;
if ( menu->IsAttached() ) // is this menu on a menubar?
{
wxFrame* frame = menu->GetMenuBar()->GetFrame();
frame->ProcessCommand(id);
}
else
{
wxMenuItem* item = menu->FindChildItem( id ); wxMenuItem* item = menu->FindChildItem( id );
wxCHECK_RET( item, wxT("error in menu item callback") ); wxCHECK_RET( item, wxT("error in menu item callback") );
@@ -725,6 +733,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1); menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
} }
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "select" // "select"
@@ -744,7 +753,8 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id ); wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
event.SetEventObject( menu ); event.SetEventObject( menu );
if (menu->GetEventHandler()->ProcessEvent(event)) wxEvtHandler* handler = menu->GetEventHandler();
if (handler && handler->ProcessEvent(event))
return; return;
wxWindow *win = menu->GetInvokingWindow(); wxWindow *win = menu->GetInvokingWindow();
@@ -769,7 +779,8 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 ); wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 );
event.SetEventObject( menu ); event.SetEventObject( menu );
if (menu->GetEventHandler()->ProcessEvent(event)) wxEvtHandler* handler = menu->GetEventHandler();
if (handler && handler->ProcessEvent(event))
return; return;
wxWindow *win = menu->GetInvokingWindow(); wxWindow *win = menu->GetInvokingWindow();

17
src/gtk1/menu.cpp
View File

@@ -172,7 +172,8 @@ static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu )
wxMenuEvent event( wxEVT_MENU_OPEN, -1 ); wxMenuEvent event( wxEVT_MENU_OPEN, -1 );
event.SetEventObject( menu ); event.SetEventObject( menu );
if (menu->GetEventHandler()->ProcessEvent(event)) wxEvtHandler* handler = menu->GetEventHandler();
if (handler && handler->ProcessEvent(event))
return; return;
wxWindow *win = menu->GetInvokingWindow(); wxWindow *win = menu->GetInvokingWindow();
@@ -700,6 +701,13 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
if (!menu->IsEnabled(id)) if (!menu->IsEnabled(id))
return; return;
if ( menu->IsAttached() ) // is this menu on a menubar?
{
wxFrame* frame = menu->GetMenuBar()->GetFrame();
frame->ProcessCommand(id);
}
else
{
wxMenuItem* item = menu->FindChildItem( id ); wxMenuItem* item = menu->FindChildItem( id );
wxCHECK_RET( item, wxT("error in menu item callback") ); wxCHECK_RET( item, wxT("error in menu item callback") );
@@ -725,6 +733,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1); menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
} }
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "select" // "select"
@@ -744,7 +753,8 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id ); wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
event.SetEventObject( menu ); event.SetEventObject( menu );
if (menu->GetEventHandler()->ProcessEvent(event)) wxEvtHandler* handler = menu->GetEventHandler();
if (handler && handler->ProcessEvent(event))
return; return;
wxWindow *win = menu->GetInvokingWindow(); wxWindow *win = menu->GetInvokingWindow();
@@ -769,7 +779,8 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 ); wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 );
event.SetEventObject( menu ); event.SetEventObject( menu );
if (menu->GetEventHandler()->ProcessEvent(event)) wxEvtHandler* handler = menu->GetEventHandler();
if (handler && handler->ProcessEvent(event))
return; return;
wxWindow *win = menu->GetInvokingWindow(); wxWindow *win = menu->GetInvokingWindow();