Replace LString.h with support/std_string.h,

[features.git] / src / frontends / xforms / FormAboutlyx.C

diff --git a/src/frontends/xforms/FormAboutlyx.C b/src/frontends/xforms/FormAboutlyx.C
index 947de9bd419000b1da0211a495f71569d6773dac..8ee877ff115825251ebe8a5846ee3f150a2cd0f9 100644 (file)
--- a/src/frontends/xforms/FormAboutlyx.C
+++ b/src/frontends/xforms/FormAboutlyx.C
@@ -7,7 +7,7 @@
  * \author Angus Leeming
  * \author Rob Lahaye
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
@@ -18,16 +18,26 @@
 #include "ControlAboutlyx.h"
 #include "forms/form_aboutlyx.h"
 #include "xforms_helpers.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "version.h"
 
-#include FORMS_H_LOCATION
+#include "lyx_forms.h"
+
+namespace {
+
+#if FL_VERSION == 0 || (FL_REVISION == 0 && FL_FIXLEVEL < 2)
+bool const scalableTabfolders = false;
+#else
+bool const scalableTabfolders = true;
+#endif
+
+} // namespace anon
 
 
 typedef FormController<ControlAboutlyx, FormView<FD_aboutlyx> > base_class;
 
 FormAboutlyx::FormAboutlyx(Dialog & parent)
-       : base_class(parent, _("About LyX"), false)
+       : base_class(parent, _("About LyX"), scalableTabfolders)
 {}
 
 
@@ -63,17 +73,18 @@ void FormAboutlyx::build()
 
        fl_add_browser_line(license_->browser_license, cs.str().c_str());
 
-       // stack tabs
-       fl_addto_tabfolder(dialog_->tabfolder, _("Version"),
+       // Enable the tabfolder to be rescaled correctly.
+       if (scalableTabfolders)
+               fl_set_tabfolder_autofit(dialog_->tabfolder, FL_FIT);
+
+       // Stack tabs
+       fl_addto_tabfolder(dialog_->tabfolder, _("Version").c_str(),
                           version_->form);
-       fl_addto_tabfolder(dialog_->tabfolder, _("Credits"),
+       fl_addto_tabfolder(dialog_->tabfolder, _("Credits").c_str(),
                           credits_->form);
-       fl_addto_tabfolder(dialog_->tabfolder, _("License"),
+       fl_addto_tabfolder(dialog_->tabfolder, _("License").c_str(),
                           license_->form);
 
-       // work-around xforms bug re update of folder->x, folder->y coords.
-       setPrehandler(dialog_->tabfolder);
-
        // Manage the cancel/close button
-       bc().setCancel(dialog_->button_close);
+       bcview().setCancel(dialog_->button_close);
 }