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/trunk@19967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-04-03 18:39:20 +00:00
parent 91ce04cf9e
commit a01fe3d6d2
5 changed files with 106 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/framecmn.cpp
View File

@@ -199,7 +199,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

53
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,30 +701,38 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
if (!menu->IsEnabled(id)) if (!menu->IsEnabled(id))
return; return;
wxMenuItem* item = menu->FindChildItem( id ); if ( menu->IsAttached() ) // is this menu on a menubar?
wxCHECK_RET( item, wxT("error in menu item callback") );
if (item->IsCheckable())
{ {
bool isReallyChecked = item->IsChecked(), wxFrame* frame = menu->GetMenuBar()->GetFrame();
isInternallyChecked = item->wxMenuItemBase::IsChecked(); frame->ProcessCommand(id);
}
else
{
wxMenuItem* item = menu->FindChildItem( id );
wxCHECK_RET( item, wxT("error in menu item callback") );
// ensure that the internal state is always consistent with what is if (item->IsCheckable())
// shown on the screen
item->wxMenuItemBase::Check(isReallyChecked);
// we must not report the events for the radio button going up nor the
// events resulting from the calls to wxMenuItem::Check()
if ( (item->GetKind() == wxITEM_RADIO && !isReallyChecked) ||
(isInternallyChecked == isReallyChecked) )
{ {
return; bool isReallyChecked = item->IsChecked(),
isInternallyChecked = item->wxMenuItemBase::IsChecked();
// ensure that the internal state is always consistent with what is
// shown on the screen
item->wxMenuItemBase::Check(isReallyChecked);
// we must not report the events for the radio button going up nor the
// events resulting from the calls to wxMenuItem::Check()
if ( (item->GetKind() == wxITEM_RADIO && !isReallyChecked) ||
(isInternallyChecked == isReallyChecked) )
{
return;
}
// the user pressed on the menu item: report the event below
} }
// the user pressed on the menu item: report the event below menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
} }
menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -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();

53
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,30 +701,38 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
if (!menu->IsEnabled(id)) if (!menu->IsEnabled(id))
return; return;
wxMenuItem* item = menu->FindChildItem( id ); if ( menu->IsAttached() ) // is this menu on a menubar?
wxCHECK_RET( item, wxT("error in menu item callback") );
if (item->IsCheckable())
{ {
bool isReallyChecked = item->IsChecked(), wxFrame* frame = menu->GetMenuBar()->GetFrame();
isInternallyChecked = item->wxMenuItemBase::IsChecked(); frame->ProcessCommand(id);
}
else
{
wxMenuItem* item = menu->FindChildItem( id );
wxCHECK_RET( item, wxT("error in menu item callback") );
// ensure that the internal state is always consistent with what is if (item->IsCheckable())
// shown on the screen
item->wxMenuItemBase::Check(isReallyChecked);
// we must not report the events for the radio button going up nor the
// events resulting from the calls to wxMenuItem::Check()
if ( (item->GetKind() == wxITEM_RADIO && !isReallyChecked) ||
(isInternallyChecked == isReallyChecked) )
{ {
return; bool isReallyChecked = item->IsChecked(),
isInternallyChecked = item->wxMenuItemBase::IsChecked();
// ensure that the internal state is always consistent with what is
// shown on the screen
item->wxMenuItemBase::Check(isReallyChecked);
// we must not report the events for the radio button going up nor the
// events resulting from the calls to wxMenuItem::Check()
if ( (item->GetKind() == wxITEM_RADIO && !isReallyChecked) ||
(isInternallyChecked == isReallyChecked) )
{
return;
}
// the user pressed on the menu item: report the event below
} }
// the user pressed on the menu item: report the event below menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
} }
menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -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();

22
src/mac/app.cpp
View File

@@ -2348,21 +2348,13 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr )
void wxApp::MacHandleMenuCommand( wxUint32 id ) void wxApp::MacHandleMenuCommand( wxUint32 id )
{ {
wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
wxMenu* menu = NULL ; wxFrame* frame = mbar->GetFrame();
wxMenuItem* item = NULL ; wxCHECK_RET( mbar != NULL && frame != NULL, wxT("error in menu item callback") );
if ( mbar ) if ( frame )
{ {
item = mbar->FindItem( id , &menu ) ; frame->ProcessCommand(id);
} }
wxCHECK_RET( item != NULL && menu != NULL && mbar != NULL, wxT("error in menu item callback") );
if (item->IsCheckable())
{
item->Check( !item->IsChecked() ) ;
}
menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
} }
#if !TARGET_CARBON #if !TARGET_CARBON

22
src/mac/carbon/app.cpp
View File

@@ -2348,21 +2348,13 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr )
void wxApp::MacHandleMenuCommand( wxUint32 id ) void wxApp::MacHandleMenuCommand( wxUint32 id )
{ {
wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
wxMenu* menu = NULL ; wxFrame* frame = mbar->GetFrame();
wxMenuItem* item = NULL ; wxCHECK_RET( mbar != NULL && frame != NULL, wxT("error in menu item callback") );
if ( mbar ) if ( frame )
{ {
item = mbar->FindItem( id , &menu ) ; frame->ProcessCommand(id);
} }
wxCHECK_RET( item != NULL && menu != NULL && mbar != NULL, wxT("error in menu item callback") );
if (item->IsCheckable())
{
item->Check( !item->IsChecked() ) ;
}
menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
} }
#if !TARGET_CARBON #if !TARGET_CARBON