Simplify image creation with a new factory function: newImage().

[lyx.git] / src / frontends / qt4 / GuiApplication.cpp

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 6c05a87e40e8dc63131de262d1b20015cfc1cb7f..13475a28cb8b42f8215e59ae41d054733d15793b 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -693,10 +693,6 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
 
        connect(this, SIGNAL(lastWindowClosed()), this, SLOT(onLastWindowClosed()));
 
-       using namespace lyx::graphics;
-
-       Image::newImage = boost::bind(&GuiImage::newImage);
-
        // needs to be done before reading lyxrc
        QWidget w;
        lyxrc.dpi = (w.logicalDpiX() + w.logicalDpiY()) / 2;
@@ -896,6 +892,7 @@ void GuiApplication::resetGui()
                return;
 
 #ifdef Q_WS_MACX
+       d->global_menubar_->clear();
        delete d->global_menubar_;
        // Create the global default menubar which is shown for the dialogs
        // and if no GuiView is visible.