better selection and scrolling behaviour

[lyx.git] / src / frontends / qt2 / Menubar_pimpl.h

diff --git a/src/frontends/qt2/Menubar_pimpl.h b/src/frontends/qt2/Menubar_pimpl.h
index 4a8a331e78d8b7d62ef96343e4d00e6ec487c306..6937bc0612d1f6cbcecd258a9c044236aa1c3323 100644 (file)
--- a/src/frontends/qt2/Menubar_pimpl.h
+++ b/src/frontends/qt2/Menubar_pimpl.h
@@ -1,87 +1,58 @@
 // -*- C++ -*-
 /**
- * \file Menubar_pimpl.h
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * \file qt2/Menubar_pimpl.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes <larsbj@lyx.org>
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author Lars Gullik Bjønnes
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS
  */
 
- 
+
 #ifndef MENUBAR_PIMPL_H
 #define MENUBAR_PIMPL_H
 
-#include <vector>
-#include <map>
-
-#include <config.h>
- 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
-#include "LString.h"
 #include "frontends/Menubar.h"
-#include "commandtags.h"
+#include "LString.h"
+#include <map>
 
 class LyXView;
 class QtView;
-class QMenuData;
-class Menu;
-class MenuItem;
 class MenuBackend;
-
-/// stored state for menu items
-struct MenuItemInfo {
-       // I REALLY hate this stupid requirement of std::map
-       MenuItemInfo::MenuItemInfo()
-               : parent_(0), id_(0), item_(0) {};
- 
-       MenuItemInfo::MenuItemInfo(QMenuData * p, int id, MenuItem const * item)
-               : parent_(p), id_(id), item_(item) {};
- 
-       /// menu containing item
-       QMenuData * parent_;
- 
-       /// id in containing menu
-       int id_;
- 
-       /// LyX info for item
-       MenuItem const * item_;
-};
- 
+class QLPopupMenu;
 
 struct Menubar::Pimpl {
 public:
        Pimpl(LyXView *, MenuBackend const &);
- 
+
        /// opens a top-level submenu given its name
        void openByName(string const &);
 
-       /// update the state of the menuitems
-       void update();
+       /// update the state of the menuitems - not needed
+       void update() {}
 
-private:
-       /// create a menu
-       void makeMenu(QMenuData * parent, MenuItem const & menu);
- 
-       /// special handling updating a submenu label
-       void updateSubmenu(MenuItemInfo const & i);
- 
-       /// update an individual item, returns true if enabled
-       void updateItem(MenuItemInfo const & i);
+       /// return the owning view
+       QtView * view() { return owner_; }
 
+       /// return the menu controller
+       MenuBackend const & backend() { return menubackend_; }
+private:
        /// owning view
        QtView * owner_;
 
        /// menu controller
        MenuBackend const & menubackend_;
 
-       typedef std::map<string, MenuItemInfo> ItemMap;
+       typedef std::map<string, QLPopupMenu *> NameMap;
 
-       /// menu items
-       ItemMap items_;
+       /// name to menu for openByName
+       NameMap name_map_;
 };
- 
+
 #endif // MENUBAR_PIMPL_H