Yet more dialog tweaking from Rob.

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

diff --git a/src/frontends/xforms/Menubar_pimpl.h b/src/frontends/xforms/Menubar_pimpl.h
index 611532d1015be5da6db5db49f10b66e59c3f9007..e1d43cec378a86d39d22d9753129b2f3ba64dea9 100644 (file)
--- a/src/frontends/xforms/Menubar_pimpl.h
+++ b/src/frontends/xforms/Menubar_pimpl.h
@@ -1,15 +1,15 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+/**
+ * \file Menubar_pimpl.h
+ * Copyright 1995 Matthias Ettrich
+ * Copyright 1996-2001 Lars Gullik Bjønnes
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           This file is Copyright 1996-2000
- *           Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS
+ */
 
 #ifndef MENUBAR_PIMPL_H
 #define MENUBAR_PIMPL_H
@@ -18,33 +18,42 @@
 #pragma interface
 #endif
 
-#include <vector>
-#include <map>
-#include <boost/smart_ptr.hpp>
 #include "LString.h"
 #include "frontends/Menubar.h"
-#include "commandtags.h"
-#include FORMS_H_LOCATION
+
+#include <boost/shared_ptr.hpp>
+
+#include "forms_fwd.h"
+#include <X11/X.h> // Window
+
+#include <vector>
+#include <map>
+
 class LyXView;
-class MenuBackend;
-class MenuItem;
+class XFormsView;
 class Menu;
+class MenuItem;
 
 /** The LyX GUI independent menubar class
-  The GUI interface is implemented in the corresponding Menubar_pimpl class. 
+  The GUI interface is implemented in the corresponding Menubar_pimpl class.
   */
 struct Menubar::Pimpl {
 public:
        ///
        Pimpl(LyXView *, MenuBackend const &);
        ///
-       void set(string const &);
+       ~Pimpl();
+
+       /// update the state of the menuitems
+       void update();
+
        /// Opens a top-level submenu given its name
        void openByName(string const &);
 
        ///
        static void MenuCallback(FL_OBJECT *, long);
 
+private:
        ///
        void add_toc(int menu, string const & extra_label,
                     std::vector<int> & smn, Window win);
@@ -52,27 +61,23 @@ public:
        void add_references(int menu, string const & extra_label,
                            std::vector<int> & smn, Window win);
        ///
-       int create_submenu(Window win, LyXView * view,
-                           string const & menuname,
-                           std::vector<int> & smn);
+       int create_submenu(Window win, XFormsView * view,
+                          Menu const & menu,
+                          std::vector<int> & smn, bool & all_disabled);
 
-        /// update the state of the menuitems
-        void update() {}
-private:
        //
-       void makeMenubar(Menu const &menu);
+       void makeMenubar(Menu const & menu);
 
-       /// 
-       LyXView * owner_;
+       ///
+       XFormsView * owner_;
        ///
        MenuBackend const * menubackend_;
        ///
        struct ItemInfo {
                ///
-               ItemInfo(Menubar::Pimpl * p, MenuItem const * i, 
-                        FL_OBJECT * o)
-               
-                       : pimpl_(p), obj_(o) { item_.reset(i); }
+               ItemInfo(Menubar::Pimpl * p, MenuItem const * i,
+                        FL_OBJECT * o);
+               ~ItemInfo();
                ///
                Menubar::Pimpl * pimpl_;
                ///
@@ -85,14 +90,5 @@ private:
        typedef std::vector<boost::shared_ptr<ItemInfo> > ButtonList;
        ///
        ButtonList buttonlist_;
-
-       ///
-       typedef std::map<string, FL_OBJECT *> MenubarMap;
-       ///
-       MenubarMap menubarmap_;
-       ///
-       string current_menu_name_;
-       ///
-       FL_OBJECT * current_group_;
 };
 #endif