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

send wxEVT_MENU_CLOSE from menubar deactivate handler, this ensures that the event is sent even when the menu is dismissed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-12-24 01:21:27 +00:00
parent cdf003d465
commit 13d3511257
2 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/gtk/menu.cpp
View File

@@ -126,11 +126,17 @@ static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu )
DoCommonMenuCallbackCode(menu, event); DoCommonMenuCallbackCode(menu, event);
} }
static void gtk_menu_close_callback( GtkWidget *widget, wxMenu *menu ) static void gtk_menu_close_callback( GtkWidget *widget, wxMenuBar *menubar )
{ {
wxMenuEvent event( wxEVT_MENU_CLOSE, -1, menu ); if ( !menubar->GetMenuCount() )
{
// if menubar is empty we can't call GetMenu(0) below
return;
}
DoCommonMenuCallbackCode(menu, event); wxMenuEvent event( wxEVT_MENU_CLOSE, -1, NULL );
DoCommonMenuCallbackCode(menubar->GetMenu(0), event);
} }
} }
@@ -177,6 +183,16 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st
for (size_t i = 0; i < n; ++i ) for (size_t i = 0; i < n; ++i )
Append(menus[i], titles[i]); Append(menus[i], titles[i]);
// VZ: for some reason connecting to menus "deactivate" doesn't work (we
// don't get it when the menu is dismissed by clicking outside the
// toolbar) so we connect to the global one, even if it means that we
// can't pass the menu which was closed in wxMenuEvent object
gtk_signal_connect( GTK_OBJECT(GTK_MENU_SHELL(m_menubar)),
"deactivate",
GTK_SIGNAL_FUNC(gtk_menu_close_callback),
(gpointer)this );
} }
wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style) wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style)
@@ -337,15 +353,6 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
GTK_SIGNAL_FUNC(gtk_menu_open_callback), GTK_SIGNAL_FUNC(gtk_menu_open_callback),
(gpointer)menu ); (gpointer)menu );
// TODO: this is not enough as we don't get the notification if the menu is
// dismissed without any selection (e.g. by clicking outside it), but
// I couldn't find any GTK+ signal which would be triggered by this:
// neither selection-done, nor deactivate, nor cancel are
GtkMenuShell *menu_shell = &(GTK_MENU(menu->m_menu)->menu_shell);
gtk_signal_connect( GTK_OBJECT(menu_shell), "selection-done",
GTK_SIGNAL_FUNC(gtk_menu_close_callback),
(gpointer)menu );
// m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
// addings menu later on. // addings menu later on.
if (m_invokingWindow) if (m_invokingWindow)

31
src/gtk1/menu.cpp
View File

@@ -126,11 +126,17 @@ static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu )
DoCommonMenuCallbackCode(menu, event); DoCommonMenuCallbackCode(menu, event);
} }
static void gtk_menu_close_callback( GtkWidget *widget, wxMenu *menu ) static void gtk_menu_close_callback( GtkWidget *widget, wxMenuBar *menubar )
{ {
wxMenuEvent event( wxEVT_MENU_CLOSE, -1, menu ); if ( !menubar->GetMenuCount() )
{
// if menubar is empty we can't call GetMenu(0) below
return;
}
DoCommonMenuCallbackCode(menu, event); wxMenuEvent event( wxEVT_MENU_CLOSE, -1, NULL );
DoCommonMenuCallbackCode(menubar->GetMenu(0), event);
} }
} }
@@ -177,6 +183,16 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st
for (size_t i = 0; i < n; ++i ) for (size_t i = 0; i < n; ++i )
Append(menus[i], titles[i]); Append(menus[i], titles[i]);
// VZ: for some reason connecting to menus "deactivate" doesn't work (we
// don't get it when the menu is dismissed by clicking outside the
// toolbar) so we connect to the global one, even if it means that we
// can't pass the menu which was closed in wxMenuEvent object
gtk_signal_connect( GTK_OBJECT(GTK_MENU_SHELL(m_menubar)),
"deactivate",
GTK_SIGNAL_FUNC(gtk_menu_close_callback),
(gpointer)this );
} }
wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style) wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style)
@@ -337,15 +353,6 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
GTK_SIGNAL_FUNC(gtk_menu_open_callback), GTK_SIGNAL_FUNC(gtk_menu_open_callback),
(gpointer)menu ); (gpointer)menu );
// TODO: this is not enough as we don't get the notification if the menu is
// dismissed without any selection (e.g. by clicking outside it), but
// I couldn't find any GTK+ signal which would be triggered by this:
// neither selection-done, nor deactivate, nor cancel are
GtkMenuShell *menu_shell = &(GTK_MENU(menu->m_menu)->menu_shell);
gtk_signal_connect( GTK_OBJECT(menu_shell), "selection-done",
GTK_SIGNAL_FUNC(gtk_menu_close_callback),
(gpointer)menu );
// m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
// addings menu later on. // addings menu later on.
if (m_invokingWindow) if (m_invokingWindow)