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

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

diff --git a/src/frontends/xforms/FormBaseDeprecated.C b/src/frontends/xforms/FormBaseDeprecated.C
index 847844c7cca692266e6104f079d1f10998d7ab6f..c020a59cb1e79f41919af04b64f00a8e677ded6a 100644 (file)
--- a/src/frontends/xforms/FormBaseDeprecated.C
+++ b/src/frontends/xforms/FormBaseDeprecated.C
@@ -26,35 +26,45 @@
 
 using SigC::slot;
 
-extern "C" int C_FormBaseDeprecatedWMHideCB(FL_FORM * ob, void * d)
-{
-       return FormBaseDeprecated::WMHideCB(ob, d);
-}
-extern "C" void C_FormBaseDeprecatedApplyCB(FL_OBJECT * ob, long d)
-{
-       FormBaseDeprecated::ApplyCB(ob, d);
-}
-extern "C" void C_FormBaseDeprecatedOKCB(FL_OBJECT * ob, long d)
-{
-       FormBaseDeprecated::OKCB(ob, d);
-}
-extern "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT * ob, long d)
-{
-       FormBaseDeprecated::CancelCB(ob, d);
-}
-extern "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT * ob, long d)
-{
-       FormBaseDeprecated::InputCB(ob, d);
-}
-extern "C" void C_FormBaseDeprecatedRestoreCB(FL_OBJECT * ob, long d)
-{
-       FormBaseDeprecated::RestoreCB(ob, d);
+extern "C" {
+       
+       static
+       int C_FormBaseDeprecatedWMHideCB(FL_FORM * ob, void * d)
+       {
+               return FormBaseDeprecated::WMHideCB(ob, d);
+       }
+
+       void C_FormBaseDeprecatedApplyCB(FL_OBJECT * ob, long d)
+       {
+               FormBaseDeprecated::ApplyCB(ob, d);
+       }
+
+       void C_FormBaseDeprecatedOKCB(FL_OBJECT * ob, long d)
+       {
+               FormBaseDeprecated::OKCB(ob, d);
+       }
+
+       void C_FormBaseDeprecatedCancelCB(FL_OBJECT * ob, long d)
+       {
+               FormBaseDeprecated::CancelCB(ob, d);
+       }
+
+       void C_FormBaseDeprecatedInputCB(FL_OBJECT * ob, long d)
+       {
+               FormBaseDeprecated::InputCB(ob, d);
+       }
+
+       void C_FormBaseDeprecatedRestoreCB(FL_OBJECT * ob, long d)
+       {
+               FormBaseDeprecated::RestoreCB(ob, d);
+       }
 }
 
 
 FormBaseDeprecated::FormBaseDeprecated(LyXView * lv, Dialogs * d,
-                                      string const & t)
-       : lv_(lv), d_(d), h_(0), r_(0), title_(t), minw_(0), minh_(0)
+                                      string const & t, bool allowResize)
+       : lv_(lv), d_(d), h_(0), r_(0), title_(t),
+         minw_(0), minh_(0), allow_resize_(allowResize)
 {
        lyx::Assert(lv && d);
 }
@@ -86,6 +96,8 @@ void FormBaseDeprecated::show()
        if (!form()) {
                build();
 
+               bc().refresh();
+ 
                // work around dumb xforms sizing bug
                minw_ = form()->w;
                minh_ = form()->h;
@@ -110,10 +122,14 @@ void FormBaseDeprecated::show()
                 */
                XMapWindow(fl_get_display(), form()->window);
        } else {
-               // calls to fl_set_form_minsize/maxsize apply only to the next
-               // fl_show_form(), so connect() comes first.
                connect();
 
+               // calls to fl_set_form_minsize/maxsize apply only to the next
+               // fl_show_form(), so this comes first.
+               fl_set_form_minsize(form(), minw_, minh_);
+               if (!allow_resize_)
+                       fl_set_form_maxsize(form(), minw_, minh_);
+
                fl_show_form(form(),
                        FL_PLACE_MOUSE | FL_FREE_SIZE,
                        (lyxrc.dialogs_iconify_with_main ? FL_TRANSIENT : 0),
@@ -186,6 +202,13 @@ void FormBaseDeprecated::InputCB(FL_OBJECT * ob, long data)
        FormBaseDeprecated * pre =
                static_cast<FormBaseDeprecated*>(ob->form->u_vdata);
        lyx::Assert(pre);
+
+       // It is possible to set the choice to 0 when using the
+       // keyboard shortcuts. This work-around deals with the problem.
+       if (ob && ob->objclass == FL_CHOICE && fl_get_choice(ob) < 1) {
+               fl_set_choice(ob, 1);
+       }
+
        pre->bc().valid(pre->input(ob, data));
 }
 
@@ -201,8 +224,9 @@ void FormBaseDeprecated::RestoreCB(FL_OBJECT * ob, long)
 }
 
 
-FormBaseBI::FormBaseBI(LyXView * lv, Dialogs * d, string const & t)
-       : FormBaseDeprecated(lv, d, t)
+FormBaseBI::FormBaseBI(LyXView * lv, Dialogs * d, string const & t,
+                      bool allowResize)
+       : FormBaseDeprecated(lv, d, t, allowResize)
 {}
 
 
@@ -213,8 +237,9 @@ void FormBaseBI::connect()
 }
 
 
-FormBaseBD::FormBaseBD(LyXView * lv, Dialogs * d, string const & t)
-       : FormBaseDeprecated(lv, d, t),
+FormBaseBD::FormBaseBD(LyXView * lv, Dialogs * d, string const & t,
+                      bool allowResize)
+       : FormBaseDeprecated(lv, d, t, allowResize),
          u_(0)
 {}