Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / LyXView.C

diff --git a/src/LyXView.C b/src/LyXView.C
index f99b062e505ce576521502629708124fb070fda7..6cd4ae26ccb6a2960ef5a0428bac10529d799a5d 100644 (file)
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -19,13 +19,12 @@
 
 #include "LyXView.h"
 #include "lyx_main.h"
-#if FL_REVISION < 89
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
 #include "lyxlookup.h"
 #endif
 #include "minibuffer.h"
 #include "lyxfunc.h"
 #include "debug.h"
-#include "layout_forms.h"
 #include "intl.h"
 #include "lyxrc.h"
 #include "support/filetools.h"        // OnlyFilename()
@@ -37,7 +36,7 @@
 #include "frontends/Menubar.h"
 #include "MenuBackend.h"
 #include "ToolbarDefaults.h"
-#include "lyx_gui_misc.h"      // [update,Close]AllBufferRelatedDialogs
+#include "lyx_gui_misc.h"      // [update,Close,Redraw]AllBufferRelatedDialogs
 #include "bufferview_funcs.h" // CurrentState()
 
 using std::endl;
@@ -51,10 +50,6 @@ BufferView * current_view;
 
 extern "C" int C_LyXView_atCloseMainFormCB(FL_FORM *, void *);
 
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Connection;
-using SigC::slot;
-#endif
 
 LyXView::LyXView(int width, int height)
 {
@@ -71,10 +66,11 @@ LyXView::LyXView(int width, int height)
        dialogs_ = new Dialogs(this);
        // temporary until all dialogs moved into Dialogs.
        dialogs_->updateBufferDependent
-               .connect(slot(&updateAllVisibleBufferRelatedDialogs));
+               .connect(SigC::slot(&updateAllVisibleBufferRelatedDialogs));
        dialogs_->hideBufferDependent
-               .connect(slot(&CloseAllBufferRelatedDialogs));
-       Dialogs::redrawGUI.connect(slot(this, &LyXView::redraw));
+               .connect(SigC::slot(&CloseAllBufferRelatedDialogs));
+       Dialogs::redrawGUI.connect(SigC::slot(this, &LyXView::redraw));
+       Dialogs::redrawGUI.connect(SigC::slot(&RedrawAllBufferRelatedDialogs));
 }
 
 
@@ -213,7 +209,7 @@ void LyXView::show(int place, int border, string const & title)
 {
        fl_show_form(form_, place, border, title.c_str());
        minibuffer->Init();
-#if FL_REVISION < 89
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
        InitLyXLookup(fl_get_display(), form_->window);
 #endif
 }
@@ -274,7 +270,7 @@ void LyXView::create_form_form_main(int width, int height)
        // TIMERS
        //
 
-       autosave_timeout.timeout.connect(slot(this, &LyXView::AutoSave));
+       autosave_timeout.timeout.connect(SigC::slot(this, &LyXView::AutoSave));
        
        //
        // Misc