rev 21667: Forgot this!

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21668 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 0fad5bc9c1740f6816d60cf6b31bd1a568cf9b5a..c954aba91c38fa6b314f739f50ab77ab9a0d04b2 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -234,7 +234,6 @@ LyXView & GuiApplication::createView(string const & geometry_arg)
        GuiView * view  = views_[id];
        theLyXFunc().setLyXView(view);
 
-       view->init();
        view->show();
        if (!geometry_arg.empty()) {
 #ifdef Q_WS_WIN

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 8eb4a016ebacd9b7bb6f84c2c240ad1d80e805b2..958160350dcea081259613b01afd8f807f010398 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -323,6 +323,8 @@ GuiView::GuiView(int id)
 
        // For Drag&Drop.
        setAcceptDrops(true);
+
+       init();
 }
 
 
@@ -1417,12 +1419,6 @@ Dialog * GuiView::build(string const & name)
 }
 
 
-/// Are the tooltips on or off?
-bool GuiView::tooltipsEnabled()
-{
-       return false;
-}
-
 } // namespace frontend
 } // namespace lyx
 

diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h
index 774a5543cdc9ae4d914ed95ff91d390ea07caecb..626a763db49da9c2fe1878014b09520ce2b52892 100644 (file)
--- a/src/frontends/qt4/GuiView.h
+++ b/src/frontends/qt4/GuiView.h
@@ -61,7 +61,13 @@ public:
 
        ~GuiView();
 
+       /**
+        * This is called after the concrete view has been created.
+        * We have to have the toolbar and the other stuff created
+        * before we can populate it with this call.
+        */
        virtual void init();
+       ///
        virtual void close();
        virtual void setFocus();
        virtual void setBusy(bool);
@@ -211,9 +217,6 @@ public:
         */
        void checkStatus();
 
-       /// Are the tooltips on or off?
-       bool tooltipsEnabled();
-
        /// Hide all visible dialogs
        void hideAll() const;
        /// Hide any dialogs that require a buffer for them to operate