compile fixes (move a c'tor out of line, add a virtual destuctor and

change an include path - don't know why the latter is necessary, but it
works now for me)

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

diff --git a/src/frontends/controllers/ButtonController.h b/src/frontends/controllers/ButtonController.h
index c5d1ffd251fb1257b621c76bda6c1cd8363dddcc..3489db4fb7e40e7f36ece41eef039daae7e1e2ad 100644 (file)
--- a/src/frontends/controllers/ButtonController.h
+++ b/src/frontends/controllers/ButtonController.h
@@ -73,6 +73,8 @@ public:
        ButtonController(string const & = _("Cancel"),
                         string const & = _("Close"));
        ///
+       ~ButtonController() {}
+       ///
        virtual ButtonPolicy & bp() { return bp_; }
 
 protected:

diff --git a/src/frontends/xforms/Dialogs.C b/src/frontends/xforms/Dialogs.C
index 34124a60d97347c51dbcf24207186ac7bca5a246..516e53743d065e61733b16c70c40c242159f56a2 100644 (file)
--- a/src/frontends/xforms/Dialogs.C
+++ b/src/frontends/xforms/Dialogs.C
@@ -168,6 +168,11 @@
 #include "FormVCLog.h"
 
 
+Dialogs::Impl::Impl(LyXView & lv, Dialogs & d)
+       : lv_(lv), d_(d)
+{}
+
+
 Dialogs::Dialogs(LyXView & lv)
        : pimpl_(new Impl(lv, *this))
 {

diff --git a/src/frontends/xforms/Dialogs_impl.h b/src/frontends/xforms/Dialogs_impl.h
index 2529dfa3d5c2ffe3966fcb2c5edb3b98bc667464..f81e43e3f4fda3451fe1716a236cd7183dd9dcd1 100644 (file)
--- a/src/frontends/xforms/Dialogs_impl.h
+++ b/src/frontends/xforms/Dialogs_impl.h
@@ -14,7 +14,7 @@
 #endif
 
 #include "Dialogs.h"
-#include "GUI.h"
+#include "controllers/GUI.h"
 
 #include <boost/scoped_ptr.hpp>
 
@@ -202,7 +202,7 @@ typedef GUI<ControlVCLog, FormVCLog, OkCancelPolicy, xformsBC>
 VCLogFileDialog;
 
 struct Dialogs::Impl {
-       Impl(LyXView & lv, Dialogs & d) : lv_(lv), d_(d) {}
+       Impl(LyXView & lv, Dialogs & d);
 
        template <typename T>
        T & dialog(boost::scoped_ptr<T> & var)