Clean-up of the button controller.

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

diff --git a/src/frontends/gnome/Menubar_pimpl.h b/src/frontends/gnome/Menubar_pimpl.h
index fdcdb665f52822b9fa7e19854abf289e7435742a..694ce50c5207bf7c3f8a29787cb125144f91957d 100644 (file)
--- a/src/frontends/gnome/Menubar_pimpl.h
+++ b/src/frontends/gnome/Menubar_pimpl.h
@@ -16,6 +16,7 @@
 #endif
 
 #include <vector>
+#include "gettext.h"
 #include "LString.h"
 #include <gnome--/app.h>
 #include "frontends/Menubar.h"
@@ -27,10 +28,6 @@ class MenuBackend;
 class MenuItem;
 class StrPool;
 
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Connection;
-#endif
-
 #include "debug.h"
 
 /*
@@ -71,6 +68,12 @@ protected:
   void callbackToc(Buffer::TocItem tg);
   /// compose Gnome::UI::Array object describing the menu
   void composeUIInfo(string const & menu_name, vector<Gnome::UI::Info> & Menus, string path);
+  /// compose Gnome::UI::Array object describing the TOClist
+  vector<Buffer::TocItem>::const_iterator
+  composeTocUIInfo(vector<Gnome::UI::Info> & menu,
+                  vector<Buffer::TocItem> const & toclist,
+                  vector<Buffer::TocItem>::const_iterator begin,
+                  int mylevel);
   /// populate wid_act_ vector with all widgets and corresponding actions
   void connectWidgetToAction(GnomeUIInfo * guinfo);
 
@@ -84,8 +87,6 @@ protected:
   };
   /// populate lists
   void updateList(vector<Buffer::TocItem> *, vector<ListsHolder> *);
-  /// Add to "Menus" the list of exportable/viewable formats
-  void add_formats(vector<Gnome::UI::Info> & Menus, kb_action action, bool viewable);
   
 private:
   /// 
@@ -102,7 +103,7 @@ private:
   vector<GtkWidgetToAction> wid_act_;
 
   /// toc
-  Connection utoc_;
+  SigC::Connection utoc_;
   vector<ListsHolder> toc_;
 };
 #endif