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

[lyx.git] / src / frontends / xforms / FormCharacter.C

diff --git a/src/frontends/xforms/FormCharacter.C b/src/frontends/xforms/FormCharacter.C
index 8862c4c0a35a06d4ed1e59bb1081d4f9ec9b899c..f9357d35d2c6559717b3e8efecab3802fcbfa2c5 100644 (file)
--- a/src/frontends/xforms/FormCharacter.C
+++ b/src/frontends/xforms/FormCharacter.C
@@ -24,14 +24,12 @@
 #include "helper_funcs.h"
 
 using std::vector;
-using std::back_inserter;
-using std::transform;
 using namespace character;
 
 typedef FormCB<ControlCharacter, FormDB<FD_form_character> > base_class;
 
 FormCharacter::FormCharacter(ControlCharacter & c)
-       : base_class(c, _("Character Layout"))
+       : base_class(c, _("Character Layout"), false)
 {}
 
 
@@ -87,7 +85,7 @@ void FormCharacter::build()
        // insert default language box manually
        fl_addto_form(dialog_->form);
                FL_OBJECT * ob = dialog_->choice_language;
-               fl_deactivate_object(dialog_->choice_language);
+               fl_hide_object(dialog_->choice_language);
 
                combo_language2_.reset(new Combox(FL_COMBOX_DROPLIST));
                combo_language2_->add(ob->x, ob->y, ob->w, ob->h, 250);
@@ -100,7 +98,7 @@ void FormCharacter::build()
             cit != language.end(); ++cit) {
                combo_language2_->addto(*cit);
        }
-       combo_language2_->select_text(*language.begin());
+       combo_language2_->select(*language.begin());
 
        // Manage the ok, apply and cancel/close buttons
        bc().setApply(dialog_->button_apply);
@@ -171,7 +169,7 @@ void FormCharacter::update()
        pos = int(findPos(color_, controller().getColor()));
        fl_set_choice(dialog_->choice_color, pos+1);
 
-       combo_language2_->select_text(controller().getLanguage());
+       combo_language2_->select(controller().getLanguage());
 
        fl_set_button(dialog_->check_toggle_all, controller().getToggleAll());
 }