Fix the tab ordering of PanelStack and PrefsUi.

[lyx.git] / src / frontends / qt4 / GuiWorkArea.h

diff --git a/src/frontends/qt4/GuiWorkArea.h b/src/frontends/qt4/GuiWorkArea.h
index 9a0e2a2d22e72f44a8a51eb9fd67a60695df3c04..173d3e298749823787cae5a800b3642ed735c482 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.h
+++ b/src/frontends/qt4/GuiWorkArea.h
@@ -24,7 +24,6 @@
 #include <QAbstractScrollArea>
 #include <QMouseEvent>
 #include <QPixmap>
-#include <QResizeEvent>
 #include <QTabBar>
 #include <QTabWidget>
 #include <QTimer>
@@ -33,9 +32,10 @@ class QContextMenuEvent;
 class QDragEnterEvent;
 class QDropEvent;
 class QKeyEvent;
-class QWheelEvent;
 class QPaintEvent;
+class QResizeEvent;
 class QToolButton;
+class QWheelEvent;
 class QWidget;
 
 #ifdef CursorShape
@@ -85,10 +85,6 @@ public:
        FuncRequest cmd;
        Timeout timeout;
        bool restart_timeout;
-       int x_old;
-       int y_old;
-       int min_scrollbar_old;
-       int max_scrollbar_old;
 };
 
 
@@ -143,6 +139,11 @@ public:
        ///
        GuiCompleter & completer() { return *completer_; }
 
+       Qt::CursorShape cursorShape() const;
+       void setCursorShape(Qt::CursorShape shape);
+
+       /// Change the cursor when the mouse hovers over a clickable inset
+       void updateCursorShape();
 
        /// Return the GuiView this workArea belongs to
        GuiView const & view() const { return *lyx_view_; }
@@ -262,10 +263,11 @@ private:
        /// Special mode in which Esc and Enter (with or without Shift)
        /// are ignored
        bool dialog_mode_;
-       /// store the position of the rightclick when the mouse is
+       /// store the name of the context menu when the mouse is
        /// pressed. This is used to get the correct context menu 
-       /// when the menu is actually shown (after releasing on Windwos).
-       QPoint context_target_pos_;
+       /// when the menu is actually shown (after releasing on Windows)
+       /// and after the DEPM has done its job.
+       docstring context_menu_name_;
 }; // GuiWorkArea
 
 
@@ -313,6 +315,7 @@ public:
        bool removeWorkArea(GuiWorkArea *);
        GuiWorkArea * currentWorkArea();
        GuiWorkArea * workArea(Buffer & buffer);
+       GuiWorkArea * workArea(int index);
 
 Q_SIGNALS:
        ///