Merge remote-tracking branch 'remotes/origin/master' into dvb

This commit is contained in:
Matthias Koefferlein 2018-11-26 21:30:01 +01:00
commit f57e7c734e
2 changed files with 9 additions and 0 deletions

View File

@ -5652,6 +5652,14 @@ PluginRootToMainWindow::select_mode (int mode)
}
}
void
PluginRootToMainWindow::menu_activated (const std::string &symbol)
{
if (mp_main_window.get ()) {
mp_main_window->menu_activated (symbol);
}
}
// ------------------------------------------------------------
// Implementation of the "help about" dialog

View File

@ -994,6 +994,7 @@ public:
virtual void plugin_registered (lay::PluginDeclaration *cls);
virtual void plugin_removed (lay::PluginDeclaration *cls);
virtual void select_mode (int mode);
virtual void menu_activated (const std::string &symbol);
private:
PluginRootToMainWindow (const PluginRootToMainWindow &);