Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / gtk / GToolbar.h

diff --git a/src/frontends/gtk/GToolbar.h b/src/frontends/gtk/GToolbar.h
index fd291d9a24b0fa0642542d0994f89d4256d1cfa5..414cd7a26ca2435b9636d5f7560b7d6d07466c0e 100644 (file)
--- a/src/frontends/gtk/GToolbar.h
+++ b/src/frontends/gtk/GToolbar.h
@@ -15,15 +15,26 @@
 
 #include "frontends/Toolbars.h"
 
-#include <boost/scoped_ptr.hpp>
-
 #include <gtkmm.h>
 
+#include <boost/scoped_ptr.hpp>
+
 namespace lyx {
 namespace frontend {
 
 class GView;
 
+class stringcolumns : public Gtk::TreeModel::ColumnRecord {
+public:
+       stringcolumns()
+       {
+               add(name);
+       }
+
+       Gtk::TreeModelColumn<Glib::ustring> name;
+};
+
+
 class GLayoutBox: public LayoutBox, public sigc::trackable {
 public:
        GLayoutBox(LyXView &, Gtk::Toolbar &, FuncRequest const &);
@@ -42,7 +53,10 @@ private:
        ///
        void selected();
 
-       Gtk::Combo combo_;
+       Gtk::ComboBox combo_;
+       Glib::RefPtr<Gtk::ListStore> model_;
+       stringcolumns cols_;
+
        LyXView & owner_;
        bool internal_;
 };
@@ -61,7 +75,6 @@ private:
 
        GView & owner_;
        Gtk::Toolbar toolbar_;
-       Gtk::Tooltips tooltips_;
        boost::scoped_ptr<GLayoutBox> layout_;
 };