More ascii-export fixes and when making copy of single tabular cells now the

[lyx.git] / src / LyXView.C

diff --git a/src/LyXView.C b/src/LyXView.C
index 03550c4a1f5c92b48a8b5383f2902d294153a574..97ab981e68bd215e78dda7eddb8353f351587a80 100644 (file)
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -15,20 +15,13 @@
 #pragma implementation
 #endif
 
-#include <sys/time.h>
-#include <unistd.h>
-
 #include "LyXView.h"
 #include "minibuffer.h"
 #include "debug.h"
 #include "intl.h"
 #include "lyxrc.h"
-#include "support/filetools.h"        // OnlyFilename()
 #include "lyxtext.h"
 #include "buffer.h"
-#include "frontends/Dialogs.h"
-#include "frontends/Toolbar.h"
-#include "frontends/Menubar.h"
 #include "MenuBackend.h"
 #include "lyx_gui_misc.h"      // [update,Close,Redraw]AllBufferRelatedDialogs
 #include "bufferview_funcs.h" // CurrentState()
@@ -36,12 +29,22 @@
 #include "lyxfunc.h"
 #include "BufferView.h"
 
+#include "frontends/Dialogs.h"
+#include "frontends/Toolbar.h"
+#include "frontends/Menubar.h"
+
+#include "support/filetools.h"        // OnlyFilename()
+
+#include <sys/time.h>
+#include <unistd.h>
+
 using std::endl;
+using lyx::layout_type;
 
 extern void AutoSave(BufferView *);
 extern void QuitLyX();
 
-LyXTextClass::size_type current_layout = 0;
+layout_type current_layout = 0;
 
 
 LyXView::LyXView()
@@ -99,7 +102,7 @@ Toolbar * LyXView::getToolbar() const
 }
 
 
-void LyXView::setLayout(LyXTextClass::size_type layout)
+void LyXView::setLayout(layout_type layout)
 {
        toolbar->setLayout(layout);
 }
@@ -201,15 +204,13 @@ void LyXView::updateLayoutChoice()
                toolbar->updateLayoutList(true);
                last_textclass = int(buffer()->params.textclass);
                current_layout = 0;
-       } else
+       } else {
                toolbar->updateLayoutList(false);
-
+       }
        
+       layout_type layout = bufferview->getLyXText()->cursor.par()->getLayout();
 
-       LyXTextClass::size_type layout =
-               bufferview->text->cursor.par()->getLayout();
-
-       if (layout != current_layout){
+       if (layout != current_layout) {
                toolbar->setLayout(layout);
                current_layout = layout;
        }
@@ -234,13 +235,15 @@ void LyXView::updateWindowTitle()
        }
        if (title != last_title) {
                setWindowTitle(title);
+               last_title = title;
        }
+       last_title = title;
 }
 
 
 void LyXView::showState()
 {
-       message(CurrentState(view()));
+       message(currentState(view()));
        getToolbar()->update();
        menubar->update();
 }