#include "Action.h"
-#include "debug.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
#include "GuiView.h"
#include "LyXFunc.h"
#include "qt_helpers.h"
+#include "support/debug.h"
#include "support/lstrings.h"
namespace lyx {
namespace frontend {
-Action::Action(GuiView & lyxView, QIcon const & icon,
+Action::Action(GuiView * lyxView, QIcon const & icon,
QString const & text, FuncRequest const & func,
- QString const & tooltip)
- : QAction(&lyxView), func_(func), lyxView_(lyxView)
+ QString const & tooltip, QObject * parent)
+ : QAction(parent), func_(func), lyxView_(lyxView)
{
-#if QT_VERSION >= 0x040200
// only Qt/Mac handles that
setMenuRole(NoRole);
-#endif
setIcon(icon);
setText(text);
setToolTip(tooltip);
void Action::action()
{
- // LYXERR(Debug::ACTION) << "calling LyXFunc::dispatch: func_: "
- // "\n";
- lyxView_.dispatch(func_);
+ //LYXERR(Debug::ACTION, "calling LyXFunc::dispatch: func_: ");
+
+ if (lyxView_)
+ theLyXFunc().setLyXView(lyxView_);
+
+ lyx::dispatch(func_);
triggered(this);
}