Bugfixes: checkboxes to radiobuttons (from J�rgen S) and remove a little

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

diff --git a/src/frontends/xforms/FormPreferences.h b/src/frontends/xforms/FormPreferences.h
index 378276f787f0aaf48e6d20d802d8e49020d6799c..295292675870b3fd24f86d60024add6bd736044e 100644 (file)
--- a/src/frontends/xforms/FormPreferences.h
+++ b/src/frontends/xforms/FormPreferences.h
@@ -39,7 +39,7 @@ struct FD_form_inputs_misc;
 struct FD_form_interface;
 struct FD_form_language;
 struct FD_form_lnf_misc;
-struct FD_form_outer_tab;
+struct FD_form_inner_tab;
 struct FD_form_outputs_misc;
 struct FD_form_paths;
 struct FD_form_preferences;
@@ -62,10 +62,6 @@ public:
 private:
        /// Pointer to the actual instantiation of the ButtonController.
        virtual xformsBC & bc();
-       /// Connect signals etc. Set form's max size.
-       virtual void connect();
-       /// Disconnect signals. Also perform any necessary housekeeping.
-       virtual void disconnect();
        /** Redraw the form (on receipt of a Signal indicating, for example,
            that the xforms colours have been re-mapped). */
        virtual void redraw();
@@ -99,13 +95,13 @@ private:
         */
        void browse( FL_OBJECT * input,
                     string const & title, string const & pattern, 
-                    std::pair<string,string> const & dir1,
-                    std::pair<string,string> const & dir2 );
+                    std::pair<string,string> const & dir1= std::make_pair(string(),string()), 
+                    std::pair<string,string> const & dir2 = std::make_pair(string(),string()));
        
        /// Fdesign generated methods
        FD_form_preferences * build_preferences();
        ///
-       FD_form_outer_tab * build_outer_tab();
+       FD_form_inner_tab * build_inner_tab();
        ///
        FD_form_colors * build_colors();
        ///
@@ -134,15 +130,15 @@ private:
        /// Real GUI implementation.
        boost::scoped_ptr<FD_form_preferences> dialog_;
        /// Converters tabfolder
-       boost::scoped_ptr<FD_form_outer_tab> converters_tab_;
+       boost::scoped_ptr<FD_form_inner_tab> converters_tab_;
        /// reLyX and other import/input stuff
-       boost::scoped_ptr<FD_form_outer_tab> inputs_tab_;
+       boost::scoped_ptr<FD_form_inner_tab> inputs_tab_;
        /// HCI configuration
-       boost::scoped_ptr<FD_form_outer_tab> look_n_feel_tab_;
+       boost::scoped_ptr<FD_form_inner_tab> look_n_feel_tab_;
        /// Outputs tabfolder
-       boost::scoped_ptr<FD_form_outer_tab> outputs_tab_;
+       boost::scoped_ptr<FD_form_inner_tab> outputs_tab_;
        /// Spellchecker, language stuff, etc
-       boost::scoped_ptr<FD_form_outer_tab> lang_opts_tab_;
+       boost::scoped_ptr<FD_form_inner_tab> lang_opts_tab_;
 
        /** Flag whether a warning has been posted to the text window.
            If so, don't redraw the window when the mouse leaves an object. */