More fixes to insettabular/text (and some missing features added).

[lyx.git] / src / combox.h

diff --git a/src/combox.h b/src/combox.h
index e37f6cd4ae7fa3e08aa9c5afe3af136fb19fcb0a..c948c1895f84a423681b4a31c2383e97d47b41fa 100644 (file)
--- a/src/combox.h
+++ b/src/combox.h
@@ -59,9 +59,15 @@ public:
        ~Combox();
 
        /** To add this object to a form. Note that there are two heights
-        for normal (button) and expanded (browser) mode each.
+           for normal (button) and expanded (browser) mode each.
+           The optional tabfolder arguments are needed to overcome an
+           xforms bug when repositioning a combox in a tab folder.
+           tabfolder1_ is the folder holding the combox.
+           If using nested tabfolders, tabfolder2_ is the "base" folder
+           holding tabfolder1_.
        */
-       void add(int x, int y, int w, int hmin, int hmax);
+       void add(int x, int y, int w, int hmin, int hmax,
+                FL_OBJECT * tabfolder1_ = 0, FL_OBJECT * tabfolder2_ = 0);
        
        /// Add lines. Same as for fl_browser object
        void addline(string const &);
@@ -75,7 +81,7 @@ public:
        string const getline() const;
    
        ///  Select an arbitrary item
-       void select(size_t);
+       void select(int);
        ///
         bool select_text(string const &);
    
@@ -146,6 +152,10 @@ public:
        FL_OBJECT * label;
        ///
         FL_FORM* form;
+       ///
+       FL_OBJECT * tabfolder1;
+       ///
+       FL_OBJECT * tabfolder2;
 };